From 9706ad355f3584ec9a6615246c6b3fa596c79b2a Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Tue, 16 Aug 2011 22:21:04 +0000 Subject: Added generation of Universal binary. Fixed up index.sgml to be shorter and more expressive. --- Makefile | 22 ++++++++---- index.sgml | 115 ++++++++++++++++++++++++++++++++----------------------------- 2 files changed, 77 insertions(+), 60 deletions(-) diff --git a/Makefile b/Makefile index 64caf056..55bf5753 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/index.sgml b/index.sgml index 67b7dbbf..e76afd46 100644 --- a/index.sgml +++ b/index.sgml @@ -7,7 +7,8 @@

- mdocml – mdoc macro compiler + mdocml – mdoc macro compiler, + current version @VERSION@ (@VDATE@)

Description @@ -39,59 +40,84 @@ Sources

- mdocml is in plain-old ANSI C and should build and run on any modern system (mandocdb requires Berkeley Database, installed by - default on all BSD UNIX operating systems). + mdocml is in plain-old ANSI C and should build and run on any modern system. + To build and install into /usr/local/, just run make install. + Be aware: if you have an existing groff installation, this may overwrite its preconv binary. + The mandocdb utility is not yet linked to the build; please contact + us if you plan to use it.

- To compile mdocml, run make, then make install to install into - /usr/local. Be aware: if you have an existing groff installation, this may overwrite its preconv binary. The mandocdb utility is not yet linked to the build: you must run make mandocdb to - build it (it does not install). -

- The most current version of mdocml is @VERSION@, dated @VDATE@. -

- Current -

- + + + + + - + + +

Source archive	Current	+ /snapshots/mdocml.tar.gz (md5) +
Archives	- /snapshots/mdocml.tar.gz - (md5) + /snapshots/
Online source	Online Repository	cvsweb

+ Binaries +

+ 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 MingW for the 32-bit (i686) and + 64-bit (x86_64) architectures. +

+ + + + + + + + + + + + - + - +

Windows 32-bit	+ /binaries/mdocml-win32.zip +
Windows 64-bit	+ /binaries/mdocml-win64.zip +
Win32 (i686) binary archive	Mac OS X Universal Binary	- /binaries/mdocml-win32.zip + /binaries/mdocml-macosx.zip
Win64 (x86_64) binary archive	Archives	- /binaries/mdocml-win64.zip + /binaries/

+

Downstream -

+ +

+ Several systems come bundled with mdocml utilities. + If your system does not appear below, the maintainers have not contacted me and it should not be considered + official. + Please contact us if you plan on maintaining a downstream version! +

@@ -126,32 +152,12 @@

- Historical -

- - - - - - - - - - - - - -

Source archive	- /snapshots/ -
Binary archive	- /binaries/ -

Documentation

- 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 mdocml system.

@@ -335,8 +341,9 @@

Handling of tr macro in roff implemented. This makes Perl documentation much more readable. Hyphenation is also now enabled in man format documents. Many other general - improvements have been implemented, and a 64-bit Windows binary is now available at /binaries/mdocml-win64.zip. + improvements have been implemented. Furthermore, a 64-bit Windows binary is now available at mdocml-win64.zip and a Mac OS X universal binary is available at mdocml-macosx.zip.

-- cgit v1.2.3-56-ge451