Changeset 0fd6750 in git


Ignore:
Timestamp:
15/06/10 15:09:47 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/survex-1_1, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/tags/v1_1_13, svn/trunk, travis-osx
Children:
e4bfd2f
Parents:
018db6f
Message:

Makefile.am,configure.in,doc/Makefile.am,make_release: Scrap the
"alternative manual formats" zip file - people will generally just
want one of them, so downloading several together isn't very useful.
Replace PostScript? version of manual with a PDF version (more
compact and more people will have software to read PDF). Don't
generate RTF format by default as PDF is more useful if you want
a formatted version to print.

git-svn-id: file:///home/survex-svn/survex/branches/survex-1_1@3429 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r018db6f r0fd6750  
     1Tue Jun 15 14:09:29 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * Makefile.am,configure.in,doc/Makefile.am,make_release: Scrap the
     4          "alternative manual formats" zip file - people will generally just
     5          want one of them, so downloading several together isn't very useful.
     6          Replace PostScript version of manual with a PDF version (more
     7          compact and more people will have software to read PDF).  Don't
     8          generate RTF format by default as PDF is more useful if you want
     9          a formatted version to print.
     10
    111Tue Jun 15 13:36:30 GMT 2010  Olly Betts <olly@survex.com>
    212
  • Makefile.am

    r018db6f r0fd6750  
    7272        $(RM) -rf iss_tmp
    7373
    74 doc_zip_name = svxdoc-@VERSION@.zip
    75 
    76 doc_zip :
    77         $(RM) $(doc_zip_name)
    78         : # -l means convert LF to CR+LF
    79         cd doc && zip -9 -l ../$(doc_zip_name) $(DOCS_OTHER)
    80 
    81 .PHONY: mingw mingw_iss doc_zip
     74.PHONY: mingw mingw_iss
  • configure.in

    r018db6f r0fd6750  
    359359esac])
    360360
    361 DOCS_OTHER="manual.rtf manual.txt manual.ps"
    362 AC_SUBST(DOCS_OTHER)
    363 
    364361HTMLFILES="AUTHORS.htm HACKING.htm NEWS.htm OLDNEWS.htm TODO.htm index.htm 3dformat.htm"
    365362AC_SUBST(HTMLFILES)
  • doc/Makefile.am

    r018db6f r0fd6750  
    1414# won't be able to "make dist", which is arguably a good thing - we don't
    1515# want tarballs accidentally lacking the documentation.
    16 EXTRA_DIST = manual $(HTMLFILES) $(DOCS_OTHER) survex.1.in index.htm.in\
     16EXTRA_DIST = manual $(HTMLFILES)\
     17 manual.txt manual.pdf\
     18 survex.1.in index.htm.in\
    1719 custom.dsl survex.ent\
    1820 caution.png note.png\
     
    8991        cp caution.png note.png manual
    9092
    91 # this rule is not used by the build system - it's for "manual" use (ho ho)
     93manual.txt: $(manual_sources) survex.ent ../configure.in
     94        $(SGMLTOOLS) --backend=txt manual.sgml
     95
     96manual.pdf: $(manual_sources) survex.ent ../configure.in
     97        $(SGMLTOOLS) --backend=ps manual.sgml
     98        ps2pdf manual.ps manual.pdf
     99        rm manual.ps
     100
     101# The rules below aren't used by the build system - they're for "manual" use
     102# (ho ho)
     103
    92104manual.html: $(manual_sources) custom.dsl survex.ent ../configure.in
    93105        $(SGMLTOOLS) --backend=onehtml \
     
    97109        $(SGMLTOOLS) --backend=rtf manual.sgml
    98110
    99 manual.txt: $(manual_sources) survex.ent ../configure.in
    100         $(SGMLTOOLS) --backend=txt manual.sgml
    101 
    102111manual.ps: $(manual_sources) survex.ent ../configure.in
    103112        $(SGMLTOOLS) --backend=ps manual.sgml
  • make_release

    r018db6f r0fd6750  
    1111   shift
    1212fi
    13 mk=${*:-"src doc mingw"}
    1413
    1514if test x"$rel" = xyes ; then
     
    2019   fi
    2120fi
    22 if test -f Makefile ; then
    23    if ! make distclean ; then
    24       echo make distclean failed
    25       exit 1
    26    fi
    27 fi
     21
     22test ! -f Makefile || make distclean
    2823
    2924if test yes = "$rel" ; then
     
    4944fi
    5045
    51 case $mk in
    52   *doc*)
    53     make doc_zip ;;
    54 esac
     46make distclean
     47
     48test -n "$build_platform" || build_platform=`sh config.guess`
     49SAVE_PATH=$PATH
     50if test -d /usr/i586-mingw32msvc/bin ; then
     51  # debian mingw32 package
     52  PATH=/usr/i586-mingw32msvc/bin:$PATH
     53  CC=/usr/bin/i586-mingw32msvc-gcc
     54  CXX=/usr/bin/i586-mingw32msvc-g++
     55else
     56  # variant of debian mingw32 package?
     57  PATH=/usr/i386-mingw32msvc/bin:$PATH
     58  CC=/usr/bin/i386-mingw32msvc-gcc
     59  CXX=/usr/bin/i386-mingw32msvc-g++
     60fi
     61wxc=/usr/lib/wx/config/i586-mingw32msvc-msw-unicode-release-static-2.8
     62# -Werror here causes AC_CHECK_FUNCS to fail.
     63CFLAGS=
     64CXXFLAGS='-fno-strict-aliasing -Werror'
     65./configure --host=mingw32 --build="$build_platform" CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" WX_CONFIG="$wxc" LDFLAGS=-s
     66make CFLAGS=-Werror
     67make mingw_iss
     68PATH=$SAVE_PATH
    5569
    5670make distclean
    57 
    58 case $mk in
    59   *mingw*)
    60     test -n "$build_platform" || build_platform=`sh config.guess`
    61     SAVE_PATH=$PATH
    62     if test -d /usr/i586-mingw32msvc/bin ; then
    63       # debian mingw32 package
    64       PATH=/usr/i586-mingw32msvc/bin:$PATH
    65       CC=/usr/bin/i586-mingw32msvc-gcc
    66       CXX=/usr/bin/i586-mingw32msvc-g++
    67     else
    68       # variant of debian mingw32 package?
    69       PATH=/usr/i386-mingw32msvc/bin:$PATH
    70       CC=/usr/bin/i386-mingw32msvc-gcc
    71       CXX=/usr/bin/i386-mingw32msvc-g++
    72     fi
    73     wxc=/usr/lib/wx/config/i586-mingw32msvc-msw-unicode-release-static-2.8
    74     # -Werror here causes AC_CHECK_FUNCS to fail.
    75     CFLAGS=
    76     CXXFLAGS='-fno-strict-aliasing -Werror'
    77     ./configure --host=mingw32 --build="$build_platform" CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" WX_CONFIG="$wxc" LDFLAGS=-s
    78     make CFLAGS=-Werror
    79     make mingw_iss
    80     make distclean
    81     PATH=$SAVE_PATH
    82     ;;
    83 esac
Note: See TracChangeset for help on using the changeset viewer.