diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-08-16 22:21:04 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-08-16 22:21:04 +0000 |
| commit | 9706ad355f3584ec9a6615246c6b3fa596c79b2a (patch) | |
| tree | 23e958f332bf5978b7dea9a7feedf47437242adf | |
| parent | c083d800c976811d519b2b6299ee04d88a93f180 (diff) | |
| download | mandoc-9706ad355f3584ec9a6615246c6b3fa596c79b2a.tar.gz mandoc-9706ad355f3584ec9a6615246c6b3fa596c79b2a.tar.zst mandoc-9706ad355f3584ec9a6615246c6b3fa596c79b2a.zip | |
Added generation of Universal binary. Fixed up index.sgml to be shorter
and more expressive.
| -rw-r--r-- | Makefile | 22 | ||||
| -rw-r--r-- | index.sgml | 115 |
2 files changed, 77 insertions, 60 deletions
@@ -332,7 +332,7 @@ clean: rm -f mandoc $(MANDOC_OBJS) rm -f llib-lmandoc.ln $(MANDOC_LNS) rm -f config.h config.log $(COMPAT_OBJS) $(COMPAT_LNS) - rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip + rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip mdocml-macosx.zip rm -f index.html $(INDEX_OBJS) rm -rf test-strlcpy.DSYM rm -rf test-strlcat.DSYM @@ -375,19 +375,19 @@ llib-llibmandoc.ln: $(COMPAT_LNS) $(LIBMANDOC_LNS) $(LINT) $(LINTFLAGS) -Clibmandoc $(COMPAT_LNS) $(LIBMANDOC_LNS) mandoc: $(MANDOC_OBJS) libmandoc.a - $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a + $(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a llib-lmandoc.ln: $(MANDOC_LNS) $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS) mandocdb: $(MANDOCDB_OBJS) libmandoc.a - $(CC) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB) + $(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB) llib-lmandocdb.ln: $(MANDOCDB_LNS) $(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS) preconv: $(PRECONV_OBJS) - $(CC) -o $@ $(PRECONV_OBJS) + $(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS) llib-lpreconv.ln: $(PRECONV_LNS) $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS) @@ -406,7 +406,8 @@ mdocml-win32.zip: $(SRCS) $(INSTALL_SOURCE) $(SRCS) .win32 cp .win32/Makefile .win32/Makefile.old grep -v DUSE_WCHAR .win32/Makefile.old >.win32/Makefile - ( cd .win32; CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \ + ( cd .win32; \ + CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \ make install PREFIX=mdocml-$(VERSION) ; \ zip -r ../$@ mdocml-$(VERSION) ) rm -rf .win32 @@ -416,11 +417,20 @@ mdocml-win64.zip: $(SRCS) $(INSTALL_SOURCE) $(SRCS) .win64 cp .win64/Makefile .win64/Makefile.old grep -v DUSE_WCHAR .win64/Makefile.old >.win64/Makefile - ( cd .win64; CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \ + ( cd .win64; \ + CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \ make install PREFIX=mdocml-$(VERSION) ; \ zip -r ../$@ mdocml-$(VERSION) ) rm -rf .win64 +mdocml-macosx.zip: $(SRCS) + mkdir -p .macosx/mdocml-$(VERSION)/ + $(INSTALL_SOURCE) $(SRCS) .macosx + ( cd .macosx; \ + CFLAGS="-arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" make; \ + make install PREFIX=mdocml-$(VERSION) ; \ + zip -r ../$@ mdocml-$(VERSION) ) + rm -rf .macosx index.html: $(INDEX_OBJS) @@ -7,7 +7,8 @@ </HEAD> <BODY> <P CLASS="head"> - <B>mdocml</B> – mdoc macro compiler + <B>mdocml</B> – mdoc macro compiler, + current version <SPAN CLASS="attn">@VERSION@</SPAN> (<SPAN class="attn">@VDATE@</SPAN>) </P> <H1> <A NAME="description">Description</A> @@ -39,59 +40,84 @@ <A NAME="sources">Sources</A> </H1> <P> - <SPAN CLASS="nm">mdocml</SPAN> is in plain-old ANSI C and should build and run on any modern system (<A - HREF="mandocdb.8.html">mandocdb</A> requires <A CLASS="external" - HREF="http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html">Berkeley Database</A>, installed by - default on all BSD UNIX operating systems). + <SPAN CLASS="nm">mdocml</SPAN> is in plain-old ANSI C and should build and run on any modern system. + To build and install into <I>/usr/local/</I>, just run <CODE>make install</CODE>. + Be aware: if you have an existing groff installation, this may overwrite its <B>preconv</B> binary. + The <A HREF="mandocdb.8.html">mandocdb</A> utility is not yet linked to the build; please <A HREF="#contact">contact + us</A> if you plan to use it. </P> - <P> - To compile <SPAN CLASS="nm">mdocml</SPAN>, run <CODE>make</CODE>, then <CODE>make install</CODE> to install into - <I>/usr/local</I>. Be aware: if you have an existing <A HREF="http://www.gnu.org/software/groff/" - CLASS="external">groff</A> installation, this may overwrite its <B>preconv</B> binary. The <A - HREF="mandocdb.8.html">mandocdb</A> utility is not yet linked to the build: you must run <CODE>make mandocdb</CODE> to - build it (it does not install). - </P> - <P> - The most current version of <SPAN CLASS="nm">mdocml</SPAN> is <SPAN CLASS="attn">@VERSION@</SPAN>, dated <SPAN - class="attn">@VDATE@</SPAN>. - </P> - <H2> - Current - </H2> <TABLE WIDTH="100%" SUMMARY="Current Sources"> <COL WIDTH="200"> <COL> <TBODY> <TR> - <TD>Source archive</TD> + <TD>Current</TD> + <TD> + <A HREF="/snapshots/mdocml.tar.gz">/snapshots/mdocml.tar.gz</A> (<A HREF="/snapshots/mdocml.md5">md5</A>) + </TD> + </TR> + <TR> + <TD>Archives</TD> <TD> - <A HREF="/snapshots/mdocml.tar.gz">/snapshots/mdocml.tar.gz</A> - <SMALL>(<A HREF="/snapshots/mdocml.md5">md5</A>)</SMALL> + <A HREF="/snapshots/">/snapshots/</A> </TD> </TR> <TR> - <TD>Online source</TD> + <TD>Online Repository</TD> <TD> <A HREF="http://mdocml.bsd.lv/cgi-bin/cvsweb/?cvsroot=mdocml">cvsweb</A> </TD> </TR> + </TBODY> + </TABLE> + <H1> + <A NAME="binaries">Binaries</A> + </H1> + <P> + Binary archives consist of pre-compiled binaries, manuals, and other necessary files. + Universal (Mac OS X) binaries are compiled for the PCC, i386, and x86_64 architectures. + Windows binaries are compiled with <A CLASS="external" HREF="http://www.mingw.org">MingW</A> for the 32-bit (i686) and + 64-bit (x86_64) architectures. + </P> + <TABLE WIDTH="100%" SUMMARY="Current Binaries"> + <COL WIDTH="200"> + <COL> + <TBODY> + <TR> + <TD>Windows 32-bit</TD> + <TD> + <A HREF="/binaries/mdocml-win32.zip">/binaries/mdocml-win32.zip</A> + </TD> + </TR> + <TR> + <TD>Windows 64-bit</TD> + <TD> + <A HREF="/binaries/mdocml-win64.zip">/binaries/mdocml-win64.zip</A> + </TD> + </TR> <TR> - <TD>Win32 (i686) binary archive</TD> + <TD>Mac OS X Universal Binary</TD> <TD> - <A HREF="/binaries/mdocml-win32.zip">/binaries/mdocml-win32.zip</A> + <A HREF="/binaries/mdocml-macosx.zip">/binaries/mdocml-macosx.zip</A> </TD> </TR> <TR> - <TD>Win64 (x86_64) binary archive</TD> + <TD>Archives</TD> <TD> - <A HREF="/binaries/mdocml-win64.zip">/binaries/mdocml-win64.zip</A> + <A HREF="/binaries/">/binaries/</A> </TD> </TR> </TBODY> </TABLE> - <H2> + <H1> Downstream - </H2> + </H1> + <P> + Several systems come bundled with <SPAN CLASS="nm">mdocml</SPAN> utilities. + If your system does not appear below, the maintainers have not contacted me and it should not be considered + <Q>official</Q>. + Please <A HREF="#contact">contact us</A> if you plan on maintaining a downstream version! + </P> <TABLE WIDTH="100%" SUMMARY="Downstream Sources"> <COL WIDTH="200"> <COL> @@ -126,32 +152,12 @@ </TR> </TBODY> </TABLE> - <H2> - Historical - </H2> - <TABLE WIDTH="100%" SUMMARY="Archived Sources"> - <COL WIDTH="200"> - <COL> - <TBODY> - <TR> - <TD>Source archive</TD> - <TD> - <A HREF="/snapshots/">/snapshots/</A> - </TD> - </TR> - <TR> - <TD>Binary archive</TD> - <TD> - <A HREF="/binaries/">/binaries/</A> - </TD> - </TR> - </TBODY> - </TABLE> <H1> <A NAME="documentation">Documentation</A> </H1> <P> - These manuals are generated automatically and refer to the current snapshot. + These manuals are generated automatically and refer to the current release. + They are the authoritative documentation for the <SPAN CLASS="nm">mdocml</SPAN> system. </P> <TABLE WIDTH="100%" SUMMARY="Documentation"> @@ -335,8 +341,9 @@ <P> Handling of <B>tr</B> macro in <A HREF="roff.7.html">roff</A> implemented. This makes Perl documentation much more readable. Hyphenation is also now enabled in <A HREF="man.7.html">man</A> format documents. Many other general - improvements have been implemented, and a 64-bit Windows binary is now available at <A - HREF="/binaries/mdocml-win64.zip">/binaries/mdocml-win64.zip</A>. + improvements have been implemented. Furthermore, a 64-bit Windows binary is now available at <A + HREF="/binaries/mdocml-win64.zip">mdocml-win64.zip</A> and a Mac OS X universal binary is available at <A + HREF="/binaries/mdocml-macosx.zip">mdocml-macosx.zip</A>. </P> <P CLASS="news"> 24-07-2011: version 1.11.5 @@ -369,7 +376,7 @@ <SMALL> Copyright © 2008–2011 <A CLASS="external" HREF="http://kristaps.bsd.lv">Kristaps Dzonsons</A>, - $Date: 2011/08/16 12:13:27 $ + $Date: 2011/08/16 22:21:04 $ </SMALL> </P> </BODY> |