Changeset 9fe15ea in git


Ignore:
Timestamp:
03/06/10 13:16:08 (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:
47105bc
Parents:
d750f41
Message:

make_release.in: Remove ancient workaround for getting wine to work.
Remove .deb building machinery. Reenable distcheck to see if the
problem with extend.tst has gone away. Update mingw cross-building
machinery.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rd750f41 r9fe15ea  
     1Thu Jun 03 12:14:16 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * make_release.in: Remove ancient workaround for getting wine to work.
     4          Remove .deb building machinery.  Reenable distcheck to see if the
     5          problem with extend.tst has gone away.  Update mingw cross-building
     6          machinery.
     7
    18Wed Jun 02 13:30:28 GMT 2010  Olly Betts <olly@survex.com>
    29
  • make_release.in

    rd750f41 r9fe15ea  
    11#! /bin/sh
    2 
    3 # Needed for wine to run on roadkill:
    4 LD_ASSUME_KERNEL=2.4.1
    5 export LD_ASSUME_KERNEL
    62
    73VERSION="@VERSION@"
     
    1511   shift
    1612fi
    17 mk=${@-src rpm deb doc mingw}
     13mk=${@-src rpm doc mingw}
    1814if test x"$rel" = xyes ; then
    19    # Update debian changelog entry if necessary
    20    # If it does get updated, then the next check will fail...
    21    dch -v"$VERSION-1" "New upstream release." || true
    2215   # Check everything is checked into SVN.
    2316   if svn st | grep -v '^?' | grep . > /dev/null 2> /dev/null ; then
     
    5346   CFLAGS="-Wp,-std=c89"
    5447   CXXFLAGS=
    55    if ! make dist ; then # distcheck fails extend.tst for some reason!
     48   if ! make distcheck ; then # distcheck fails extend.tst for some reason!
    5649      echo make distcheck failed
    5750      exit 1
     
    7568   fi
    7669fi
    77 if test x"$rel" = xyes && expr "$mk" : '.*\<deb\>' || test x"$mk" = xdeb ; then
    78    if ! make debian ; then
    79       echo make debian failed
    80       exit 1
    81    fi
    82 fi
    8370if test x"$rel" = xyes && expr "$mk" : '.*\<doc\>' || test x"$mk" = xdoc ; then
    8471   if ! make dos_doc_exe ; then
     
    9683   test -n "$build_platform" || build_platform=`sh config.guess`
    9784   SAVE_PATH="$PATH"
    98    if test -d /usr/local/cross-tools/i386-mingw32msvc/bin ; then
    99       # binaries from http://www.devolution.com/~slouken/SDL/Xmingw32/
    100       PATH=/usr/local/cross-tools/bin:/usr/local/cross-tools/i386-mingw32msvc/bin:$PATH
     85   if test -d /usr/i586-mingw32msvc/bin ; then
     86      # debian mingw32 package
     87      PATH=/usr/i586-mingw32msvc/bin:$PATH
     88      CC=/usr/bin/i586-mingw32msvc-gcc
     89      export CC
     90      CXX=/usr/bin/i586-mingw32msvc-g++
     91      export CXX
    10192   else
    102       if test -d /usr/i586-mingw32msvc/bin ; then
    103          # debian mingw32 package
    104          PATH=/usr/i586-mingw32msvc/bin:$PATH
    105          CC=/usr/bin/i586-mingw32msvc-gcc
    106          export CC
    107          CXX=/usr/bin/i586-mingw32msvc-g++
    108          export CXX
    109       else
    110          # variant of debian mingw32 package?
    111          PATH=/usr/i386-mingw32msvc/bin:$PATH
    112          CC=/usr/bin/i386-mingw32msvc-gcc
    113          export CC
    114          CXX=/usr/bin/i386-mingw32msvc-g++
    115          export CXX
    116       fi
     93      # variant of debian mingw32 package?
     94      PATH=/usr/i386-mingw32msvc/bin:$PATH
     95      CC=/usr/bin/i386-mingw32msvc-gcc
     96      export CC
     97      CXX=/usr/bin/i386-mingw32msvc-g++
     98      export CXX
    11799   fi
    118    wxc=wxmsw-2.5-config
    119    for a in /usr/i586-mingw32msvc/bin/wx-config ; do
    120       test -x "$a" && wxc="$a"
    121    done
     100   wxc=/usr/lib/wx/config/i586-mingw32msvc-msw-ansi-release-static-2.8
    122101   LDFLAGS=
    123102   CPPFLAGS=
    124 #if ! ./configure --host=mingw32 --build="$build_platform" WXCONFIG="$wxc" LDFLAGS="-s $LDFLAGS" CPPFLAGS="$CPPFLAGS" CFLAGS=-Werror CXXFLAGS=-Werror ; then
    125    if ! ./configure --host=mingw32 --build="$build_platform" WXCONFIG="$wxc" LDFLAGS="-s $LDFLAGS" CPPFLAGS="$CPPFLAGS" ; then
     103   # CFLAGS=-Werror CXXFLAGS=-Werror
     104   if ! ./configure --host=mingw32 --build="$build_platform" WX_CONFIG="$wxc" LDFLAGS="-s $LDFLAGS" CPPFLAGS="$CPPFLAGS" ; then
    126105      echo mingw configure failed
    127106      exit 1
Note: See TracChangeset for help on using the changeset viewer.