Changeset 5a0eabd in git


Ignore:
Timestamp:
04/06/10 15:07:52 (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:
b7d232e
Parents:
ebcdad9
Message:

Makefile.am,xvfb-run: We no longer need an X display to run ISCC
under Wine, so just run wine directly and removed version of
Debian's xvfb-run script.
make_release.in: Pass variables to configure on the command line
rather than in the enviornment. Running "make distcheck" no longer
fails extend.tst, so remove comment about that. Use case rather
than expr to check what we've been asked to build. Update to use
unicode wx-config script for wxmsw. The wxmsw build spews warnings
about aliasing issues, so turn on -fno-strict-aliasing to avoid any
potential bugs from that. Enable -Werror for the wxmsw build.
Makefile.am: Update list of wxstd.mo files we package for wxmsw
(add pt and sk) and where we copy them from. Copy the unofficial
InnoSetup? i18n files (.isl) from lib.

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

Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rebcdad9 r5a0eabd  
     1Fri Jun 04 14:00:58 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * Makefile.am,xvfb-run: We no longer need an X display to run ISCC
     4          under Wine, so just run wine directly and removed version of
     5          Debian's xvfb-run script.
     6        * make_release.in: Pass variables to configure on the command line
     7          rather than in the enviornment.  Running "make distcheck" no longer
     8          fails extend.tst, so remove comment about that.  Use case rather
     9          than expr to check what we've been asked to build.  Update to use
     10          unicode wx-config script for wxmsw.  The wxmsw build spews warnings
     11          about aliasing issues, so turn on -fno-strict-aliasing to avoid any
     12          potential bugs from that.  Enable -Werror for the wxmsw build.
     13        * Makefile.am: Update list of wxstd.mo files we package for wxmsw
     14          (add pt and sk) and where we copy them from.  Copy the unofficial
     15          InnoSetup i18n files (.isl) from lib.
     16
    117Fri Jun 04 13:40:35 GMT 2010  Olly Betts <olly@survex.com>
    218
  • Makefile.am

    rebcdad9 r5a0eabd  
    7676        cp $(extra_bin) iss_tmp
    7777        : # NB check for updates for each new wx version
    78         : # also currently available are:
    79         : # af da el eu fi hi hu id ja lv nb nl pl ru sl sv tr uk zh_CN zh_TW
    80         for a in ca cs de es fr it pt_BR ; do\
     78        for a in ca cs de es fr it pt pt_BR sk ; do\
    8179         mkdir iss_tmp/$$a;\
    82          cp /usr/i586-mingw32msvc/share/locale/$$a/LC_MESSAGES/wxstd.mo iss_tmp/$$a;\
     80         cp /usr/share/locale/$$a/LC_MESSAGES/wxstd.mo iss_tmp/$$a;\
    8381         echo 'Source: "'"$$a"'\wxstd.mo"; DestDir: "{app}\'"$$a"'"' >> iss_tmp/i18nfiles.iss;\
    8482        done
     83        cp lib/*.isl iss_tmp
    8584        : # Also need to reduce colour depth it appears:
    8685        : # src/png2bmp lib/icons/aven_about.png iss_tmp/logo.bmp
    87         echo 'wine "c:/Program Files/Inno Setup 5/ISCC.exe" iss_tmp/survex.iss' > iss_tmp/runissinwine
    88         chmod 755 iss_tmp/runissinwine
    89         ./xvfb-run -a --server-args="-screen 0 64x32x8" iss_tmp/runissinwine
     86        DISPLAY= wine "c:/Program Files/Inno Setup 5/ISCC.exe" iss_tmp/survex.iss
    9087        mv iss_tmp/Output/*.exe .
    9188        $(RM) -rf iss_tmp
  • make_release.in

    rebcdad9 r5a0eabd  
    3030fi
    3131autoreconf --force -i
    32 export CC
    33 export CXX
    34 CC=gcc
    35 CXX=g++
    36 if ! ./configure ; then
     32if ! ./configure CC=gcc CXX=g++ ; then
    3733   echo configure failed
    3834   exit 1
     
    4642   CFLAGS="-Wp,-std=c89"
    4743   CXXFLAGS=
    48    if ! make distcheck ; then # distcheck fails extend.tst for some reason!
     44   if ! make distcheck ; then
    4945      echo make distcheck failed
    5046      exit 1
     
    5854   fi
    5955fi
    60 if test x"$rel" = xyes && expr "$mk" : '.*\<rpm\>' || test x"$mk" = xrpm ; then
    61    if rpmbuild --version > /dev/null 2> /dev/null ; then
     56if test x"$rel" = xyes ; then
     57  case $mk in
     58  *rpm*)
     59    if rpmbuild --version > /dev/null 2> /dev/null ; then
    6260      if ! make rpm ; then
    63          echo make rpm failed
    64          exit 1
    65        fi
    66    else
    67        echo rpmbuild not installed - skipping rpm generation
    68    fi
    69 fi
    70 if test x"$rel" = xyes && expr "$mk" : '.*\<doc\>' || test x"$mk" = xdoc ; then
    71    if ! make dos_doc_exe ; then
     61        echo make rpm failed
     62        exit 1
     63      fi
     64    else
     65      echo rpmbuild not installed - skipping rpm generation
     66    fi
     67    ;;
     68  esac
     69  case $mk in
     70  *doc*)
     71    if ! make dos_doc_exe ; then
    7272      echo make dos_doc_exe failed
    7373      exit 1
    74    fi
     74    fi
     75    ;;
     76  esac
    7577fi
    7678if ! make distclean ; then
     
    7880   exit 1
    7981fi
    80 unset CC
    81 unset CXX
    82 if expr "$mk" : '.*\<mingw\>'; then
    83    test -n "$build_platform" || build_platform=`sh config.guess`
    84    SAVE_PATH="$PATH"
    85    if test -d /usr/i586-mingw32msvc/bin ; then
     82case $mk in
     83  *mingw*)
     84    test -n "$build_platform" || build_platform=`sh config.guess`
     85    SAVE_PATH="$PATH"
     86    if test -d /usr/i586-mingw32msvc/bin ; then
    8687      # debian mingw32 package
    8788      PATH=/usr/i586-mingw32msvc/bin:$PATH
    8889      CC=/usr/bin/i586-mingw32msvc-gcc
    89       export CC
    9090      CXX=/usr/bin/i586-mingw32msvc-g++
    91       export CXX
    92    else
     91    else
    9392      # variant of debian mingw32 package?
    9493      PATH=/usr/i386-mingw32msvc/bin:$PATH
    9594      CC=/usr/bin/i386-mingw32msvc-gcc
    96       export CC
    9795      CXX=/usr/bin/i386-mingw32msvc-g++
    98       export CXX
    99    fi
    100    wxc=/usr/lib/wx/config/i586-mingw32msvc-msw-ansi-release-static-2.8
    101    LDFLAGS=
    102    CPPFLAGS=
    103    # CFLAGS=-Werror CXXFLAGS=-Werror
    104    if ! ./configure --host=mingw32 --build="$build_platform" WX_CONFIG="$wxc" LDFLAGS="-s $LDFLAGS" CPPFLAGS="$CPPFLAGS" ; then
     96    fi
     97    wxc=/usr/lib/wx/config/i586-mingw32msvc-msw-unicode-release-static-2.8
     98    # -Werror here causes AC_CHECK_FUNCS to fail.
     99    CFLAGS=
     100    CXXFLAGS='-fno-strict-aliasing -Werror'
     101    if ! ./configure --host=mingw32 --build="$build_platform" CC="$CC" CXX="$CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" WX_CONFIG="$wxc" LDFLAGS=-s ; then
    105102      echo mingw configure failed
    106103      exit 1
    107    fi
    108    if ! make ; then
     104    fi
     105    if ! make CFLAGS=-Werror ; then
    109106      echo mingw make failed
    110107      exit 1
    111    fi
    112    if ! make mingw_iss ; then
     108    fi
     109    if ! make mingw_iss ; then
    113110      echo mingw make mingw_iss failed
    114111      exit 1
    115    fi
    116    if ! make distclean ; then
     112    fi
     113    if ! make distclean ; then
    117114      echo make distclean failed
    118115      exit 1
    119    fi
    120    PATH="$SAVE_PATH"
    121    CC=
    122    CXX=
    123 fi
     116    fi
     117    PATH="$SAVE_PATH"
     118    ;;
     119esac
Note: See TracChangeset for help on using the changeset viewer.