diff options
Diffstat (limited to 'bin/make-win32-iso')
| -rwxr-xr-x | bin/make-win32-iso | 68 |
1 files changed, 37 insertions, 31 deletions
diff --git a/bin/make-win32-iso b/bin/make-win32-iso index 1459c3c39..87e62e821 100755 --- a/bin/make-win32-iso +++ b/bin/make-win32-iso @@ -58,40 +58,43 @@ cd instsetoo_native ZIPNAMEPREFIX=OOo-$OOO_PACKAGEVERSION-$COUNTER -# Edit the relevant target line in instsetoo_native/util/makefile.mk -# to build the multilingual installer for those languages for which -# there exists XP localisations, and language pack installers for the -# rest. -gawk '/^ALLTAR :/ { n++; - if (n==3) { - printf "ALLTAR : openoffice_en-US openoffice_en-US'"$MULTILANGS"'"; - split ("'"$RESTLANGS"'", restlangs); - for (i in restlangs) { - printf " ooolanguagepack_%s", restlangs[i]; - } - printf "\n"; - next; - } - } - { print; } -' <util/makefile.mk >util/makefile.mk.new - -if cmp util/makefile.mk util/makefile.mk.new; then - : -else - echo Edited instsetoo_native/util/makefile.mk: - diff -u0 util/makefile.mk util/makefile.mk.new || true - mv util/makefile.mk.new util/makefile.mk +if [ -z "$DONTBUILD" ]; then + # Build the installers. + + # Edit the relevant target line in instsetoo_native/util/makefile.mk + # to build the multilingual installer for those languages for which + # there exists XP localisations, and language pack installers for the + # rest. + gawk '/^ALLTAR :/ { n++; + if (n==3) { + printf "ALLTAR : openoffice_en-US openoffice_en-US'"$MULTILANGS"'"; + split ("'"$RESTLANGS"'", restlangs); + for (i in restlangs) { + printf " ooolanguagepack_%s", restlangs[i]; + } + printf "\n"; + next; + } + } + { print; } + ' <util/makefile.mk >util/makefile.mk.new + + if cmp util/makefile.mk util/makefile.mk.new; then + : + else + echo Edited instsetoo_native/util/makefile.mk: + diff -u0 util/makefile.mk util/makefile.mk.new || true + mv util/makefile.mk.new util/makefile.mk + fi + + # For some reason one cannot use the "build" alias in this script. + perl $SOLARENV/bin/build.pl fi -# Build the installers. For some reason one cannot use the "build" -# alias in this script. -perl $SOLARENV/bin/build.pl - OUTDIR=`mktemp -d` ISOROOT=`mktemp -d` -SRCISOROOT=$TOOLSDIR/ooo-build-$CVSTAG +SRCISOROOT=$TOOLSDIR/ooo-build-$OOO_BUILDVERSION # Construct the installer CD contents @@ -100,7 +103,9 @@ cp -pR wntmsci10.pro/OpenOffice/msi/install/en-US`echo $MULTILANGS | sed -e 's/, mkdir $ISOROOT/langpacks for i in $RESTLANGS; do ( - cd wntmsci10.pro/OpenOffice_languagepack/msi/install/$i + ii=$i + [ -d wntmsci10.pro/OpenOffice_languagepack/msi/install/en-US_$i ] && ii=en-US_$i + cd wntmsci10.pro/OpenOffice_languagepack/msi/install/$ii zip -q -r $ISOROOT/langpacks/$ZIPNAMEPREFIX-$i.zip . ) done @@ -128,10 +133,11 @@ make distdir >/dev/null if [ -f download.list ]; then while read FILENAME; do case "$FILENAME" in - *.exe) + *.exe|*.EXE) # Ignore presumably non-redistributable files ;; *) + mkdir -p $SRCISOROOT/src cp -p src/$FILENAME $SRCISOROOT/src ;; esac |