From: <hug...@li...> - 2010-06-24 17:35:22
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/347aa1e2b72e changeset: 4094:347aa1e2b72e user: harryvanderwolf <hv...@gm...> date: Thu Jun 24 19:34:18 2010 +0200 description: [OSX]correct panotools script; build basic error checking in all build scripts diffstat: mac/ExternalPrograms/scripts/boost.sh | 8 +++++++ mac/ExternalPrograms/scripts/enblend.sh | 14 ++++++++++-- mac/ExternalPrograms/scripts/gettext.sh | 16 ++++++++++---- mac/ExternalPrograms/scripts/gnumake.sh | 14 ++++++++++-- mac/ExternalPrograms/scripts/ilmbase.sh | 14 ++++++++++-- mac/ExternalPrograms/scripts/lcms.sh | 15 +++++++++++-- mac/ExternalPrograms/scripts/libexiv2.sh | 16 ++++++++++---- mac/ExternalPrograms/scripts/libexpat.sh | 14 ++++++++++-- mac/ExternalPrograms/scripts/libglew.sh | 11 +++++++++- mac/ExternalPrograms/scripts/libiconv.sh | 17 +++++++++++---- mac/ExternalPrograms/scripts/libjpeg.sh | 16 +++++++++++--- mac/ExternalPrograms/scripts/libpng.sh | 16 ++++++++++++-- mac/ExternalPrograms/scripts/libtiff.sh | 13 +++++++++-- mac/ExternalPrograms/scripts/libxmi.sh | 15 +++++++++++-- mac/ExternalPrograms/scripts/openexr16.sh | 14 ++++++++++-- mac/ExternalPrograms/scripts/pano13.sh | 32 +++++++++++++++++++++++++++--- mac/ExternalPrograms/scripts/wxmac28.sh | 15 +++++++++++-- mac/Hugin.xcodeproj/project.pbxproj | 6 ++-- mac/complete-bundle.sh | 1 + mac/copyTools.sh | 2 +- 20 files changed, 211 insertions(+), 58 deletions(-) diffs (truncated from 746 to 500 lines): diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/boost.sh --- a/mac/ExternalPrograms/scripts/boost.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/boost.sh Thu Jun 24 19:34:18 2010 +0200 @@ -22,8 +22,16 @@ # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100121.0 sg Script updated for 1_41 # 20100121.1 sg Script reverted to 1_40 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + BOOST_VER="1_40" # install headers diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/enblend.sh --- a/mac/ExternalPrograms/scripts/enblend.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/enblend.sh Thu Jun 24 19:34:18 2010 +0200 @@ -23,10 +23,18 @@ # 20091210.0 hvdw Removed code that downgraded optimization from -O3 to -O2 # 20091223.0 sg Added argument to configure to locate missing TTF # Building enblend documentation requires tex. Check if possible. +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + # Fancy doc builds on Enblend 3.2 are doomed to failure, so don't even try... AC_INIT=$(grep AC_INIT Configure.in) TEX=$(which tex) @@ -126,7 +134,7 @@ PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking --enable-image-cache=yes \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH --with-apple-opengl-framework \ - --with-glew $extraConfig ; + --with-glew $extraConfig || fail "configure step for $ARCH"; # hack; AC_FUNC_MALLOC sucks!! @@ -144,8 +152,8 @@ sed -e "s/-O[0-9]/-O3/g" "src/Makefile.bak" > src/Makefile make clean; - make all $extraBuild ; - make install $extraInstall ; + make all $extraBuild || fail "failed at make step of $ARCH"; + make install $extraInstall || fail "make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/gettext.sh --- a/mac/ExternalPrograms/scripts/gettext.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/gettext.sh Thu Jun 24 19:34:18 2010 +0200 @@ -21,10 +21,18 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100116.0 HvdW Correct script for libintl install_name in libgettext*.dylib +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + let NUMARCH="0" for i in $ARCHS @@ -106,13 +114,11 @@ --enable-shared --enable-static --disable-csharp --disable-java \ --with-included-gettext --with-included-glib \ --with-included-libxml --without-examples --with-libexpat-prefix=$REPOSITORYDIR \ - --with-included-libcroco --without-emacs --with-libiconf-prefix=$REPOSITORYDIR ; + --with-included-libcroco --without-emacs --with-libiconf-prefix=$REPOSITORYDIR || fail "configure step for $ARCH" ; -# read input; make clean; - make; -# read input; - make install; + make || fail "failed at make step of $ARCH"; + make install || fail "make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/gnumake.sh --- a/mac/ExternalPrograms/scripts/gnumake.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/gnumake.sh Thu Jun 24 19:34:18 2010 +0200 @@ -19,10 +19,18 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + let NUMARCH="0" mkdir -p "$REPOSITORYDIR/bin"; @@ -88,11 +96,11 @@ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --with-libiconv-prefix=$REPOSITORYDIR --with-libintl-prefix=$REPOSITORYDIR \ - --program-transform-name='s/^make$/gnumake/'; + --program-transform-name='s/^make$/gnumake/' || fail "configure step for $ARCH"; make clean; - make; - make install; + make || fail "failed at make step of $ARCH"; + make install || fail "make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/ilmbase.sh --- a/mac/ExternalPrograms/scripts/ilmbase.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/ilmbase.sh Thu Jun 24 19:34:18 2010 +0200 @@ -19,10 +19,17 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + let NUMARCH="0" for i in $ARCHS @@ -98,7 +105,8 @@ PKG_CONFIG_PATH="$REPOSITORYDIR/lib/pkgconfig" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared --enable-static --cache-file=./$ARCHcache; + --enable-shared --enable-static --cache-file=./$ARCHcache \ + || fail "configure step for $ARCH"; [ -f "libtool-bk" ] || mv "libtool" "libtool-bk"; # just move it once, fix it many times sed -e "s#-dynamiclib#-dynamiclib -arch $ARCH -isysroot $MACSDKDIR#g" libtool-bk > libtool; @@ -114,8 +122,8 @@ fi make clean; - make $OTHERMAKEARGs all; - make install; + make $OTHERMAKEARGs all || fail "failed at make step of $ARCH"; + make install || fail "make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/lcms.sh --- a/mac/ExternalPrograms/scripts/lcms.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/lcms.sh Thu Jun 24 19:34:18 2010 +0200 @@ -22,10 +22,18 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100121.0 sg Script updated for 1.19 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + LCMSVER_M="1" LCMSVER_FULL="$LCMSVER_M.0.19" @@ -95,11 +103,12 @@ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-static --enable-shared --with-zlib=$MACSDKDIR/usr/lib ; + --enable-static --enable-shared --with-zlib=$MACSDKDIR/usr/lib \ + || fail "configure step for $ARCH"; make clean - make - make $OTHERMAKEARGs install + make || fail "failed at make step of $ARCH"; + make $OTHERMAKEARGs install || fail "make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libexiv2.sh --- a/mac/ExternalPrograms/scripts/libexiv2.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libexiv2.sh Thu Jun 24 19:34:18 2010 +0200 @@ -21,10 +21,18 @@ # 20091206.0 sg Script NOT tested but uses std boilerplate # 20100111.0 sg Script tested for building dylib # 20100121.0 sg Script updated for 0.19 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + EXIV2VER_M="6" EXIV2VER_FULL="$EXIV2VER_M.3.1" @@ -91,7 +99,7 @@ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --enable-shared --with-libiconv-prefix=$REPOSITORYDIR --with-libintl-prefix=$REPOSITORYDIR \ - --enable-static ; + --enable-static || fail "configure step for $ARCH"; [ -f "libtool-bk" ] && rm libtool-bk; mv "libtool" "libtool-bk"; @@ -106,10 +114,8 @@ cd ../../; cd src; -# make $OTHERMAKEARGs lib; -# make install-lib; - make $OTHERMAKEARGs; - make install + make $OTHERMAKEARGs || fail "failed at make step of $ARCH"; + make install || fail "make install step of $ARCH"; cd ../; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libexpat.sh --- a/mac/ExternalPrograms/scripts/libexpat.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libexpat.sh Thu Jun 24 19:34:18 2010 +0200 @@ -20,8 +20,16 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + uname_release=$(uname -r) uname_arch=$(uname -p) [ $uname_arch = powerpc ] && uname_arch="ppc" @@ -126,12 +134,12 @@ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared; + --enable-shared || fail "configure step for $ARCH"; [ -f $REPOSITORYDIR/$crt1obj ] && rm $REPOSITORYDIR/$crt1obj; make clean; - make $OTHERMAKEARGs buildlib; - make installlib; + make $OTHERMAKEARGs buildlib || fail "failed at make step of $ARCH"; + make installlib || fail "failed at make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libglew.sh --- a/mac/ExternalPrograms/scripts/libglew.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libglew.sh Thu Jun 24 19:34:18 2010 +0200 @@ -20,12 +20,20 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100110.0 sg Script enhanced to copy dynamic lib also +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- GLEW_MAJOR=1 GLEW_MINOR=5 GLEW_REV=2 +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + # init uname_release=$(uname -r) uname_arch=$(uname -p) @@ -113,7 +121,8 @@ make install \ GLEW_DEST="$REPOSITORYDIR/arch/$ARCH" \ CC="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3 -dead_strip" \ - LD="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3"; + LD="$CC -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -O3" \ + || fail "failed at make step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libiconv.sh --- a/mac/ExternalPrograms/scripts/libiconv.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libiconv.sh Thu Jun 24 19:34:18 2010 +0200 @@ -21,10 +21,18 @@ # ------------------------------- # 20100117.0 HvdW Script tested +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + let NUMARCH="0" for i in $ARCHS @@ -95,14 +103,13 @@ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --disable-nls --enable-extra-encodings \ --without-libiconv-prefix --without-libintl-prefix \ - --disable-nls --enable-extra-encodings \ - --enable-static --enable-shared ; + --enable-static --enable-shared || fail "configure step of $ARCH"; make clean - make - make $OTHERMAKEARGs install - + make || fail "failed at make step of $ARCH" + make $OTHERMAKEARGs install || fail "make install step of $ARCH" done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libjpeg.sh --- a/mac/ExternalPrograms/scripts/libjpeg.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libjpeg.sh Thu Jun 24 19:34:18 2010 +0200 @@ -20,9 +20,17 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100121.0 sg Script updated for version 8 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- -JPEGLIBVER="7" +JPEGLIBVER="8" + +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + # init @@ -121,11 +129,11 @@ NEXT_ROOT="$MACSDKDIR" \ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ - --enable-shared --enable-static; + --enable-shared --enable-static || fail "configure step for $ARCH"; make clean; - make; - make install; + make || fail "failed at make step of $ARCH"; + make install || fail "make install step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libpng.sh --- a/mac/ExternalPrograms/scripts/libpng.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libpng.sh Thu Jun 24 19:34:18 2010 +0200 @@ -21,6 +21,8 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100121.0 sg Script updated for 1.2.40 +# 201005xx.0 hvdw Adapted for 1.2.43 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- #libraries created: @@ -28,11 +30,18 @@ # libpng12.12.1.2.42 <- (libpng12.12, libpng12) # libpng12.a <- libpng.a PNGVER_M="12" -PNGVER="1.2.42" -PNGVER_FULL="$PNGVER_M.1.2.42" +PNGVER="1.2.43" +PNGVER_FULL="$PNGVER_M.1.2.43" # init +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + + let NUMARCH="0" for i in $ARCHS ; do NUMARCH=$(($NUMARCH + 1)) @@ -132,7 +141,8 @@ NEXT_ROOT="$MACSDKDIR" \ LIBPATH="$REPOSITORYDIR/arch/$ARCH/lib" \ BINPATH="$REPOSITORYDIR/arch/$ARCH/bin" \ - GCCLDFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs"; + GCCLDFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs" \ + || fail "failed at make step of $ARCH"; done diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libtiff.sh --- a/mac/ExternalPrograms/scripts/libtiff.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libtiff.sh Thu Jun 24 19:34:18 2010 +0200 @@ -21,8 +21,15 @@ # ------------------------------- # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100121.0 sg Script updated for 3.9.2 +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- +fail() +{ + echo "** Failed at $1 **" + exit 1 +} + uname_release=$(uname -r) uname_arch=$(uname -p) [ $uname_arch = powerpc ] && uname_arch="ppc" @@ -123,12 +130,12 @@ ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ --enable-static --enable-shared --with-apple-opengl-framework --without-x \ - ; + || fail "configure step for $ARCH" ; [ -f $REPOSITORYDIR/$crt1obj ] && rm $REPOSITORYDIR/$crt1obj; make clean; - cd ./port; make $OTHERMAKEARGs; - cd ../libtiff; make $OTHERMAKEARGs install; + cd ./port; make $OTHERMAKEARGs || fail "failed at make step of $ARCH"; + cd ../libtiff; make $OTHERMAKEARGs install || fail "make install step of $ARCH"; cd ../; rm $REPOSITORYDIR/include/tiffconf.h; diff -r bc6fc8081244 -r 347aa1e2b72e mac/ExternalPrograms/scripts/libxmi.sh --- a/mac/ExternalPrograms/scripts/libxmi.sh Sun Jun 20 20:04:25 2010 +0200 +++ b/mac/ExternalPrograms/scripts/libxmi.sh Thu Jun 24 19:34:18 2010 +0200 @@ -21,9 +21,18 @@ # 20091206.0 sg Script tested and used to build 2009.4.0-RC3 # 20100111.0 sg Script enhanced to build dynamic library # 20100419.0 hvdw Changes to fix 64bit build +# 20100624.0 hvdw More robust error checking on compilation # ------------------------------- # init + |