Changeset 8401f84 in git


Ignore:
Timestamp:
20/09/11 07:26:30 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
svn/1.0, svn/tags/1.0.40
Children:
b8bf5bc
Parents:
dd7b08a
Message:

Backport changes from 1.2.1:
make_release: Sync useful changes from trunk.

git-svn-id: file:///home/survex-svn/survex/branches/1.0@3675 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rdd7b08a r8401f84  
     1Tue Sep 20 06:25:46 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * Backport changes from 1.2.1:
     4        * make_release: Sync useful changes from trunk.
     5
    16Tue Sep 20 06:12:45 GMT 2011  Olly Betts <olly@survex.com>
    27
  • make_release

    rdd7b08a r8401f84  
    33set -e
    44
    5 # flags to consider:
    6 # CFLAGS="-O2 -fomit-frame-pointer"
    7 # CXXFLAGS="-O2 -fno-rtti -fomit-frame-pointer"
    85rel=yes
    96if test x"$1" = x-t ; then
     
    1310
    1411if test x"$rel" = xyes ; then
    15    # Check everything is checked into SVN.
    16    if svn st | grep -v '^?' | grep . > /dev/null 2> /dev/null ; then
    17       echo There are changes not checked into SVN - please rectify
    18       exit 1
    19    fi
     12  # Check everything is checked into SVN.
     13  if svn st | grep -v '^?' | grep . > /dev/null 2> /dev/null ; then
     14    echo 'There are changes not checked into SVN - please rectify'
     15    echo 'If you just want to test, run with option -t'
     16    exit 1
     17  fi
     18
     19  test ! -f Makefile || make distclean
     20  cp -u /usr/share/misc/config.guess .
     21  cp -u /usr/share/misc/config.sub .
     22  autoreconf --force -i
     23  ./configure CC=gcc CXX=g++
     24  make distcheck
     25  # FIXME: setting c89 doesn't define unix and suppresses getc_unlocked().
     26  # Tell the preprocessor to be C89 - this makes it reject // comments
     27  # FIXME -Werror makes configure explode CFLAGS="-Werror -Wp,-std=c89"
     28  # FIXME   CXXFLAGS="-Werror"
     29else
     30  make dist
    2031fi
    2132
    22 test ! -f Makefile || make distclean
    23 
    24 if test yes = "$rel" ; then
    25    cp -u /usr/share/misc/config.guess .
    26    cp -u /usr/share/misc/config.sub .
    27 fi
    28 
    29 autoreconf --force -i
    30 ./configure CC=gcc CXX=g++
    31 if test yes = "$rel" ; then
    32    export CFLAGS
    33    export CXXFLAGS
    34    # tell the preproceesor to be C89 - this makes it reject // comments
    35 # FIXME -Werror makes configure explode CFLAGS="-Werror -Wp,-std=c89"
    36 # FIXME   CXXFLAGS="-Werror"
    37    CFLAGS="-Wp,-std=c89"
    38    CXXFLAGS=
    39    make distcheck
    40    CFLAGS=
    41    CXXFLAGS=
    42 else
    43    make dist
    44 fi
    45 
    46 make distclean
     33# Perform mingw build on a clean unpacked source tree from the release tarball
     34# so that (a) we don't need to "make distclean" on the source tree and (b) we
     35# ensure that any files required to build the mingw version and installer
     36# package are actually shipped in the source tarball.
     37tarball=`ls -1t survex-*.tar.gz`
     38tardir=`basename "$tarball" .tar.gz`
     39rm -rf "$tardir"
     40tar xf "$tarball"
     41cd "$tardir"
    4742
    4843test -n "$build_platform" || build_platform=`sh config.guess`
     
    6055fi
    6156wxc=/usr/lib/wx/config/i586-mingw32msvc-msw-ansi-release-static-2.8
    62 # -Werror here causes AC_CHECK_FUNCS to fail.
    63 CFLAGS=
    64 CXXFLAGS='-fno-strict-aliasing -Werror'
    65 ./configure --host=mingw32 --build="$build_platform" CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" WX_CONFIG="$wxc" LDFLAGS=-s
     57# Passing -Werror to configure causes AC_CHECK_FUNCS to fail, so pass it to
     58# make instead.
     59./configure --host=mingw32 --build="$build_platform" --with-x=no CAVEROT= CC="$CC" CXX="$CXX" CXXFLAGS="-fno-strict-aliasing -Werror" WX_CONFIG="$wxc" LDFLAGS=-s
    6660make CFLAGS=-Werror
    6761make mingw_iss
    6862PATH=$SAVE_PATH
    6963
    70 make distclean
     64mv survex-win32-*.exe ..
     65cd ..
     66
     67if test x"$rel" = xyes ; then
     68  rm -rf "$tardir"
     69fi
     70
     71VERSION=`sed 's/^VERSION *= *//p;d' Makefile`
     72URL=`svn info|sed 's/^URL: //p;d'`
     73REPO_ROOT=`svn info|sed 's/^Repository Root: //p;d'`
     74echo "To tag this release, run:"
     75echo svn cp -m"'Tagging $VERSION'" "$URL" "$REPO_ROOT/tags/$VERSION"
Note: See TracChangeset for help on using the changeset viewer.