Changeset f04ae51 in git


Ignore:
Timestamp:
19/09/11 23:00:42 (8 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, 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/trunk, travis-osx
Children:
9062bef
Parents:
cc83ec9
Message:

buildmacosx.sh: Revert CPP=cpp change - it's not required. Revert to
using wx 2.8.11 and 2.8.12 seems to fail to build. Output of hdid
can contain spaces as well as tabs (man page only documents tabs) so
update regexps to take this into account.

git-svn-id: file:///home/survex-svn/survex/trunk@3660 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rcc83ec9 rf04ae51  
     1Mon Sep 19 21:58:50 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * buildmacosx.sh: Revert CPP=cpp change - it's not required.  Revert to
     4          using wx 2.8.11 and 2.8.12 seems to fail to build.  Output of hdid
     5          can contain spaces as well as tabs (man page only documents tabs) so
     6          update regexps to take this into account.
     7
    18Mon Sep 19 11:52:50 GMT 2011  Olly Betts <olly@survex.com>
    29
  • buildmacosx.sh

    rcc83ec9 rf04ae51  
    3737set -e
    3838
    39 WXVERSION=2.8.12
     39# 2.8.12 doesn't work:
     40# /bin/sh: line 0: cd: ../build/bakefiles/wxpresets/presets: No such file or directory
     41# cp: wx.bkl: No such file or directory
     42# [...]
     43WXVERSION=2.8.11
    4044
    4145# Sadly, you can only specify one arch via -arch at a time (a restriction of
     
    6165    test -d "wxWidgets-$WXVERSION/build" || "mkdir wxWidgets-$WXVERSION/build"
    6266    cd "wxWidgets-$WXVERSION/build"
    63     ../configure --disable-shared --prefix="$prefix" --with-opengl --enable-unicode CC="gcc $arch_flags" CXX="g++ $arch_flags" CPP=cpp
     67    ../configure --disable-shared --prefix="$prefix" --with-opengl --enable-unicode CC="gcc $arch_flags" CXX="g++ $arch_flags"
    6468    make -s
    6569    make -s install
     
    117121# of the /dev node, a tab, a content hint (if applicable), another tab, and a
    118122# mount point (if any filesystems were mounted)."
     123#
     124# In reality, it seems there are also some spaces before each tab character.
    119125hdid_output=`hdid survex-macosx.dmg|tail -1`
    120126echo "Last line of hdid output was: $hdid_output"
    121 dev=`echo "$hdid_output"|sed 's!/dev/\([^       ]*\).*!\1!'`
    122 mount_point=`echo "$hdid_output"|sed 's!.*      !!'`
     127dev=`echo "$hdid_output"|sed 's!/dev/\([^        ]*\).*!\1!'`
     128mount_point=`echo "$hdid_output"|sed 's!.*[      ]!!'`
    123129
    124130echo "Device $dev mounted on $mount_point, copying files into image."
Note: See TracChangeset for help on using the changeset viewer.