diff options
Diffstat (limited to 'download')
| -rwxr-xr-x | download | 52 |
1 files changed, 27 insertions, 25 deletions
@@ -28,7 +28,7 @@ # environment setup yet? if [ -z "$TARFILE_LOCATION" ]; then - . ./*[Ee]nv.[Ss]et.sh + . ./Env.Host.sh fi # we want to clone if we are in the bootstrap git repo and clone does not exist yet @@ -78,7 +78,7 @@ fi # check for wget and md5sum wget= md5sum= -curl= +curl=`which curl 2>/dev/null` for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/wget /opt/local/bin/wget; do eval "$i --version" > /dev/null 2>&1 @@ -89,19 +89,6 @@ for i in wget /usr/bin/wget /usr/local/bin/wget /usr/sfw/bin/wget /opt/sfw/bin/w fi done -if [ -z "$wget" ]; then - for i in curl /usr/bin/curl /usr/local/bin/curl /usr/sfw/bin/curl /opt/sfw/bin/curl /opt/local/bin/curl; do - # mac curl returns "2" on --version - # eval "$i --version" > /dev/null 2>&1 - # ret=$? - # if [ $ret -eq 0 ]; then - if [ -x $i ]; then - curl=$i - break - fi - done -fi - if [ -z "$wget" -a -z "$curl" ]; then echo "ERROR: neither wget nor curl found!" exit 1 @@ -142,7 +129,7 @@ downloaditem() if [ ! -f "../$2" ]; then echo $2 if [ ! -z "$wget" ]; then - $wget -nv -N $1/$2 2>&1 | tee -a $logfile + $wget --progress=dot:mega -N $1/$2 2>&1 | tee -a $logfile else echo fetching $2 $curl $file_date_check -O $1/$2 2>&1 | tee -a $logfile @@ -186,7 +173,7 @@ for i in $filelist ; do fi done -if [ "$GUI" = "WNT" ]; then +if [ "$COM" = "MSC" ]; then downloaditem "http://download.microsoft.com/download/platformsdk/Redist/5.0.2195.1/W9XNT4/EN-US/" "dbghinst.EXE" "096f1d53d9ba09cde27d6f7c2ea6cc47" downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd" @@ -194,7 +181,7 @@ if [ "$GUI" = "WNT" ]; then case "$msvcver" in 9.0) downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x86.exe" "fd30acc7a696c32f661b33668e73bf7b" - downloaditem "http://download.microsoft.com/download/d/2/4/d242c3fb-da5a-4542-ad66-f9661d0a8d19/" "vcredist_x64.exe" "a31dc1a74f1dee5caf63aec8ebb5fe20" + downloaditem "http://download.microsoft.com/download/9/7/7/977B481A-7BA6-4E30-AC40-ED51EB2028F2/" "vcredist_x64.exe" "3abb5efe9ad4d9728406a1a90a47575f" ;; *) ;; @@ -228,7 +215,8 @@ if [ ! -z "$failed" ]; then exit 1 fi -if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then +if [ "$COM" = "MSC" -a -n "$md5sum" ]; then + # This can be run only on Windows itself (Cygwin) TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp` chmod a+w $TARFILE_LOCATION/tmp if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbghinst.EXE ]; then @@ -237,7 +225,7 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then fi $TARFILE_LOCATION/dbghinst.EXE /T:$TMPUNPACK /C sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/dbghelp.exe | sed "s/ .*//"` - if [ "$sum" == "cd3086a91e37965dd761ef5fd5df5b15" ]; then + if [ "$sum" = "cd3086a91e37965dd761ef5fd5df5b15" ]; then unzip -LL -j -o -d ./external/dbghelp $TARFILE_LOCATION/tmp/dbghelp.exe fi fi @@ -264,7 +252,7 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then echo "Extraction succeeded" sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"` - if [ "$sum" == "4721ab485e0c29cd1617a5f296b9cc47" ]; then + if [ "$sum" = "4721ab485e0c29cd1617a5f296b9cc47" ]; then cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll else echo "But unexpected checksum of $gdiplus_dll_path" @@ -282,15 +270,13 @@ if [ "$GUI" = "WNT" -a -n "$md5sum" ]; then fi # OxygenOffice extras -echo "Unpacking OxygenOffice extras ..." for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do check_file $TARFILE_LOCATION/$pack - echo "Unpacking $pack ..." + echo "Unpacking OxygenOffice extra '$pack' ..." unzip -o -q $TARFILE_LOCATION/$pack -d $SRC_ROOT/extras/source done # Extensions copy -echo "Copy extensions to their location ..." for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $OOOBLOGGER_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do check_file $TARFILE_LOCATION/$pack packfilename=`echo "$pack" | cut -f 2- -s -d - | cut -f 1 -d _` @@ -301,5 +287,21 @@ done [ -x "post_download" ] || { echo "'post_download' script not found, run ./autogen.sh." ; exit 1 ; } -./post_download || exit 1 +# Save the config.log from the main configure script +# and restore it after running post_download. +mv config.log config.log.save + +./post_download --build=$BUILD_PLATFORM --host=$HOST_PLATFORM +post_download_status=$? + +test -f config.log && mv config.log post_download.log +mv config.log.save config.log + +exit $post_download_status + +# Local Variables: +# tab-width: 4 +# indent-tabs-mode: nil +# End: + # vim:set shiftwidth=4 softtabstop=4 expandtab: |