Changeset 098acb1 in git


Ignore:
Timestamp:
15/06/10 12:00:21 (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:
98fbcf6
Parents:
dd7674d
Message:

make_release: Use "set -e" rather than checking the exit codes of
commands. -t no longer disables targets - set mk to do that.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rdd7674d r098acb1  
     1Tue Jun 15 10:59:12 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * make_release: Use "set -e" rather than checking the exit codes of
     4          commands.  -t no longer disables targets - set mk to do that.
     5
    16Tue Jun 15 09:41:11 GMT 2010  Olly Betts <olly@survex.com>
    27
  • make_release

    rdd7674d r098acb1  
    11#! /bin/sh
     2
     3set -e
    24
    35# flags to consider:
     
    2426   fi
    2527fi
     28
    2629if test yes = "$rel" ; then
    2730   cp -u /usr/share/misc/config.guess .
    2831   cp -u /usr/share/misc/config.sub .
    2932fi
     33
    3034autoreconf --force -i
    31 if ! ./configure CC=gcc CXX=g++ ; then
    32    echo configure failed
    33    exit 1
    34 fi
     35./configure CC=gcc CXX=g++
    3536if test yes = "$rel" ; then
    3637   export CFLAGS
     
    4142   CFLAGS="-Wp,-std=c89"
    4243   CXXFLAGS=
    43    if ! make distcheck ; then
    44       echo make distcheck failed
    45       exit 1
    46    fi
     44   make distcheck
    4745   CFLAGS=
    4846   CXXFLAGS=
    4947else
    50    if ! make dist ; then
    51       echo make dist failed
    52       exit 1
    53    fi
     48   make dist
    5449fi
    55 if test x"$rel" = xyes ; then
    56   case $mk in
     50
     51case $mk in
    5752  *rpm*)
    5853    if rpmbuild --version > /dev/null 2> /dev/null ; then
    59       if ! make rpm ; then
    60         echo make rpm failed
    61         exit 1
    62       fi
     54      make rpm
    6355    else
    6456      echo rpmbuild not installed - skipping rpm generation
    6557    fi
    6658    ;;
    67   esac
    68   case $mk in
     59esac
     60
     61case $mk in
    6962  *doc*)
    70     if ! make dos_doc_exe ; then
    71       echo make dos_doc_exe failed
    72       exit 1
    73     fi
    74     ;;
    75   esac
    76 fi
    77 if ! make distclean ; then
    78    echo make distclean failed
    79    exit 1
    80 fi
     63    make dos_doc_exe ;;
     64esac
     65
     66make distclean
     67
    8168case $mk in
    8269  *mingw*)
    8370    test -n "$build_platform" || build_platform=`sh config.guess`
    84     SAVE_PATH="$PATH"
     71    SAVE_PATH=$PATH
    8572    if test -d /usr/i586-mingw32msvc/bin ; then
    8673      # debian mingw32 package
     
    9885    CFLAGS=
    9986    CXXFLAGS='-fno-strict-aliasing -Werror'
    100     if ! ./configure --host=mingw32 --build="$build_platform" CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" WX_CONFIG="$wxc" LDFLAGS=-s ; then
    101       echo mingw configure failed
    102       exit 1
    103     fi
    104     if ! make CFLAGS=-Werror ; then
    105       echo mingw make failed
    106       exit 1
    107     fi
    108     if ! make mingw_iss ; then
    109       echo mingw make mingw_iss failed
    110       exit 1
    111     fi
    112     if ! make distclean ; then
    113       echo make distclean failed
    114       exit 1
    115     fi
    116     PATH="$SAVE_PATH"
     87    ./configure --host=mingw32 --build="$build_platform" CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" WX_CONFIG="$wxc" LDFLAGS=-s
     88    make CFLAGS=-Werror
     89    make mingw_iss
     90    make distclean
     91    PATH=$SAVE_PATH
    11792    ;;
    11893esac
Note: See TracChangeset for help on using the changeset viewer.