Changeset 56980d4 in git


Ignore:
Timestamp:
16/05/11 23:19:49 (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:
ec8fd0d
Parents:
fca2036
Message:

buildmacosx.sh: Extract tarball quietly, and just say we're doing
it. Add missing quoting to variable expansions.

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

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rfca2036 r56980d4  
     1Mon May 16 22:18:53 GMT 2011  Olly Betts <olly@survex.com>
     2
     3        * buildmacosx.sh: Extract tarball quietly, and just say we're doing
     4          it.  Add missing quoting to variable expansions.
     5
    16Mon May 16 05:59:32 GMT 2011  Olly Betts <olly@survex.com>
    27
  • buildmacosx.sh

    rfca2036 r56980d4  
    4444  else
    4545    prefix=`pwd`/WXINSTALL
    46     test -f wxWidgets-$WXVERSION.tar.bz2 || \
    47       curl -O ftp://ftp.wxwidgets.org/pub/$WXVERSION/wxWidgets-$WXVERSION.tar.bz2
    48     test -d wxWidgets-$WXVERSION || tar jxvf wxWidgets-$WXVERSION.tar.bz2
    49     test -d wxWidgets-$WXVERSION/build || mkdir wxWidgets-$WXVERSION/build
    50     cd wxWidgets-$WXVERSION/build
     46    wxtarball=wxWidgets$WXVERSION.tar.bz2
     47    test -f "$wxtarball" || \
     48      curl -O "ftp://ftp.wxwidgets.org/pub/$WXVERSION/$wxtarball"
     49    echo "+++ Extracting $wxtarball"
     50    test -d "wxWidgets-$WXVERSION" || tar jxf "$wxtarball"
     51    test -d "wxWidgets-$WXVERSION/build" || "mkdir wxWidgets-$WXVERSION/build"
     52    cd "wxWidgets-$WXVERSION/build"
    5153    ../configure --disable-shared --prefix="$prefix" --with-opengl --enable-unicode CC="gcc $arch_flags" CXX="g++ $arch_flags"
    5254    make -s
     
    7981cp lib/Info.plist Survex/Aven.app/Contents
    8082printf APPLAVEN > Survex/Aven.app/Contents/PkgInfo
    81 cp -r $D/share/survex/* Survex/Aven.app/Contents/Resources/
     83cp -r "$D"/share/survex/* Survex/Aven.app/Contents/Resources/
    8284# FIXME: Generate Survex/Aven.app/Resources/Aven.icns
    8385mv Survex/aven Survex/Aven.app/Contents/MacOS/
     
    8789size=`du -s Survex|sed 's/[^0-9].*//'`
    8890# Allow 1000 extra sectors for various overheads (500 wasn't enough).
    89 sectors=`expr 1000 + $size`
     91sectors=`expr 1000 + "$size"`
    9092# Partition needs to be at least 4M and sectors are 512 bytes.
    91 if test $sectors -lt 8192 ; then
     93if test "$sectors" -lt 8192 ; then
    9294  sectors=8192
    9395fi
    9496echo "Creating new blank image survex-macosx.dmg of $sectors sectors"
    9597# This creates the diskimage file and initialises it as an HFS+ volume.
    96 hdiutil create -sectors $sectors survex-macosx -layout NONE -fs HFS+ -volname Survex
     98hdiutil create -sectors "$sectors" survex-macosx -layout NONE -fs HFS+ -volname Survex
    9799
    98100echo "Presenting image to the filesystems for mounting."
     
    104106ditto lib/INSTALL.OSX /Volumes/Survex/INSTALL
    105107echo "Detaching image."
    106 hdiutil detach $dev
     108hdiutil detach "$dev"
    107109
    108110version=`sed 's/.*AM_INIT_AUTOMAKE([^,]*, *\([0-9.]*\).*/\1/p;d' configure.in`
    109 file=survex-macosx-`echo $version`.dmg
     111file=survex-macosx-$version.dmg
    110112echo "Compressing image file survex-macosx.dmg to $file"
    111113# This needs MacOS X 10.1 or above for unpacking - change UDZO to UDCO to allow
Note: See TracChangeset for help on using the changeset viewer.