User: curvirgo Date: 05/03/23 04:58:04 Modified: /ja/www/documents/develop/ ja_build
Log: orrection by PKGFORMAT option addition, etc File Changes: Directory: /ja/www/documents/develop/ ===================================== File [changed]: ja_build Url: http://ja.openoffice.org/source/browse/ja/www/documents/develop/ja_build?r1=1.14&r2=1.15 Delta lines: +160 -147 ----------------------- --- ja_build 6 Feb 2005 14:20:10 -0000 1.14 +++ ja_build 23 Mar 2005 12:58:01 -0000 1.15 @@ -22,6 +22,56 @@ } +CreateInstallSet () +{ + PrintMessage "Create installation packages" + cd ${SRC_ROOT}/${INSTSETOO}/util + if [ "${1}" != "" ]; then + PKGFORMAT=${1} dmake openoffice ${BUILD_OPTION} + else + dmake openoffice ${BUILD_OPTION} + fi + + if [ -e ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice/install/ja ]; then + PrintMessage "Packaging installation set" + cd ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice/install/ja + case ${OOO_BUILD_SYSTEM} in + LinuxIntel) + PrintMessage "Packaging format : ${1}" + if [ "${1}" = "portable" ]; then + TEMP=`grep -in 'requires openofficeorg-core02' */openofficeorg-core01.install | sed 's/:/ /' | awk '{print $1}'` + COUNT=`expr ${TEMP} - 1` + head -n ${COUNT} */openofficeorg-core01.install > ${TEMP_DIR}/tempfile + COUNT=`grep -in 'Backing up old versions' */openofficeorg-core01.install | sed 's/:/ /' | awk '{print $1}'` + tail +${COUNT} */openofficeorg-core01.install >> ${TEMP_DIR}/tempfile + cp ${TEMP_DIR}/tempfile */openofficeorg-core01.install + for FILE in `grep -in 'echo $df' */*.install | grep -i 'print $11' | awk '{print $1}' | sed s/:.*//` + do + cp ${FILE} ${TEMP_DIR}/tempfile + cat ${TEMP_DIR}/tempfile | sed "s/awk '{print \$11}'/awk '{print \$10}'/" > ${FILE} + chmod 755 ${FILE} + done + rm -f */*.tar.gz + rm -f ${TEMP_DIR}/tempfile + fi + tar jcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}_${1}.tar.bz2 * + ;; + Win32Intel) + cp -p setup.ini ${TEMP_DIR} + perl -p -e "s/\n/\r\n/" < ${TEMP_DIR}/setup.ini > setup.ini + zip -r ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.zip * + rm -f ${TEMP_DIR}/setup.ini + ;; + *) + tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.tar.gz * + ;; + esac + else + PrintMessage "Installation sets not found, check installation sets." + fi +} + + # ================================================== # build environment settings # ================================================== @@ -35,9 +85,10 @@ [ `uname -s` = SunOS -a `uname -m` = i86pc -a "${COM}" = "GCC" ] && OOO_BUILD_SYSTEM=SolarisIntelGcc [ `uname -s | grep CYGWIN` ] && OOO_BUILD_SYSTEM=Win32Intel [ `uname -s` = Linux -a `uname -m` = ppc ] && OOO_BUILD_SYSTEM=LinuxPPC +[ `uname -s` = Linux -a `uname -m` = x86_64 ] && export OOO_BUILD_SYSTEM=LinuxAMD BUILDER_NAME=${BUILDER_NAME:-curvirgo} -VERSION=${VERSION:-1.9m75} +VERSION=${VERSION:-1.9m87} BUILD_NUMBER=${BUILD_NUMBER:-680} LANGUAGES=${LANGUAGES:-ja} PREFIX=${PREFIX:-/opt} @@ -49,8 +100,8 @@ JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_06} ANT_HOME=${ANT_HOME:-/usr/local/apache-ant-1.6.2} VC_DIR=${VC_DIR:-/cygdrive/c/progra~1/micros~1.net} -CSC_DIR=${CSC_DIR:-/cygdrive/c/windows/micros~1.net/framew~1/v10~1.370} -FRAME_HOME=${FRAME_HOME:-/cygdrive/c/progra~1/micros~1.net/framew~1} +CSC_DIR=${CSC_DIR:-/cygdrive/c/windows/micros~1.net/framew~1/v11~1.432} +FRAME_HOME=${FRAME_HOME:-/cygdrive/c/progra~1/micros~1.net/sdk/v1.1} DIRECTX_HOME=${DIRECTX_HOME:-/cygdrive/c/progra~1/micros~1.0sd} WDEVENV_DIR=${WDEVENV_DIR:-/cygdrive/c/progra~1/conver~1} @@ -63,12 +114,14 @@ HELPCONTENT_LOCATE=http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent HELPCONTENT_ARCHIVE=helpcontent_81 -LINUXGCCP_LOCATE=http://ja.openoffice.org/files/documents/111 -MOZZIP_DIR=${SRC_ROOT}/moz/zipped - -MOZOOO_LOCATE=http://external.openoffice.org/nonav/source/browse/*checkout*/external/moz -MOZILLA_SOURCE_LOCATE=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7.5/source -MOZILLA_SOURCE_ARCHIVE=mozilla-source-1.7.5.tar.gz +MOZILLA_VERSION=1.7.5 +MOZILLA_SOURCE_ARCHIVE=mozilla-source-${MOZILLA_VERSION}.tar.gz +MOZILLA_SOURCE_LOCATE=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MOZILLA_VERSION}/source +MOZ_GLIB_ARCHIVE=vc71-glib-1.2.10-bin.zip +MOZ_LIBIDL_ARCHIVE=vc71-libIDL-0.6.8-bin.zip +MOZ_LIBS_LOCATE=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32 +MOZ_WINTOOLS_ARCHIVE=wintools.zip +MOZ_WINTOOLS_LOCATE=http://ftp.mozilla.org/pub/mozilla.org/mozilla/source CONFIG_FLAGS="--with-lang=${LANGUAGES} --with-dict=ALL" @@ -76,6 +129,8 @@ CREATE_SOLVER=${CREATE_SOLVER:-Yes} PARALLEL_BUILD=${PARALLEL_BUILD:-No} MAX_JOBS=${MAX_JOBS:-6} +BUILD_OPTION=${BUILD_OPTION:-"strip=true"} +PACKAGE_FORMAT=${PACKAGE_FORMAT:-"rpm deb portable"} CRASHDUMP=${CRASHDUMP:-Yes} ENABLE_MOZILLA=${ENABLE_MOZILLA:-Yes} @@ -100,33 +155,37 @@ case ${OOO_BUILD_SYSTEM} in LinuxIntel) OOOUTPATH=unxlngi4 - MOZ_ARCHIVE_NAME=LINUXGCCI CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" - [ ${BUILD_NUMBER} != 645 ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-cups --enable-fontconfig" + [ ${BUILD_NUMBER} != 645 ] && { + CONFIG_FLAGS="${CONFIG_FLAGS} --enable-cups --enable-fontconfig" + DEFAULT_PACKAGE=portable + [ -f /etc/*-release ] && DEFAULT_PACKAGE=rpm + [ -f /etc/debian-version ] && DEFAULT_PACKAGE=deb + CONFIG_FLAGS="${CONFIG_FLAGS} --with-package-format=${DEFAULT_PACKAGE}" + } ;; LinuxPPC) OOOUTPATH=unxlngppc - MOZ_ARCHIVE_NAME=LINUXGCCP + CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" + ;; + LinuxAMD) + OOOUTPATH=unxlngx4 CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" ;; SolarisSparc) OOOUTPATH=unxsols4 - MOZ_ARCHIVE_NAME=SOLARISC52S CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" ;; SolarisIntel) OOOUTPATH=unxsoli4 - MOZ_ARCHIVE_NAME=SOLARISC52I CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" ;; SolarisSparcGcc) OOOUTPATH=unxsogs - MOZ_ARCHIVE_NAME=SOLARISGCCS CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" ;; SolarisIntelGcc) OOOUTPATH=unxsogi - MOZ_ARCHIVE_NAME=SOLARISGCCI CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" ;; Win32Intel) @@ -222,61 +281,36 @@ # Download mozilla source file # ================================================= -if [ ${ENABLE_MOZILLA} = Yes -a ${OOO_BUILD_SYSTEM} != Win32Intel ]; then +if [ ${ENABLE_MOZILLA} = Yes ]; then CONFIG_FLAGS="${CONFIG_FLAGS} --enable-mozilla" - [ ${MOZILLA_BUILD} = Yes ] && ( + [ ${MOZILLA_BUILD} = Yes ] && { + CONFIG_FLAGS="${CONFIG_FLAGS} --enable-build-mozilla --with-mozilla-version=${MOZILLA_VERSION}" PrintMessage "Download mozilla source file" - [ -d ${SRC_ROOT}/moz_original ] || ${GNUCP} -R ${SRC_ROOT}/moz ${SRC_ROOT}/moz_original - cd ${SRC_ROOT}/moz - [ -f ${SRC_ROOT}/moz/makefile.mk ] || wget -c ${MOZOOO_LOCATE}/makefile.mk?rev=1.1.2.18 -O ${SRC_ROOT}/moz/makefile.mk - [ -f ${SRC_ROOT}/moz/extractfiles.mk ] || wget -c ${MOZOOO_LOCATE}/extractfiles.mk?rev=1.1.2.14 -O ${SRC_ROOT}/moz/extractfiles.mk - [ -f ${SRC_ROOT}/moz/mozilla-source-1.7b.patch ] || wget -c ${MOZOOO_LOCATE}/mozilla-source-1.7b.patch?rev=1.1.2.3 -O ${SRC_ROOT}/moz/mozilla-source-1.7b.patch - [ -f ${SRC_ROOT}/moz/mozilla-source-1.7.5.patch ] || wget -c ${MOZOOO_LOCATE}/mozilla-source-1.7.5.patch?rev=1.1.2.6 -O ${SRC_ROOT}/moz/mozilla-source-1.7.5.patch - [ -f ${SRC_ROOT}/moz/mozilla-source-1.0.patch ] || wget -c ${MOZOOO_LOCATE}/mozilla-source-1.0.patch?rev=1.1.2.3 -O ${SRC_ROOT}/moz/mozilla-source-1.0.patch - [ -f ${SRC_ROOT}/moz/prj/build.lst.orig ] || ( - cd prj - mv -v build.lst build.lst.orig - wget -c ${MOZOOO_LOCATE}/prj/build.lst?rev=1.2.48.1 -O ${SRC_ROOT}/moz/prj/build.lst - ) [ -f ${TEMP_DIR}/${MOZILLA_SOURCE_ARCHIVE} ] || ( cd ${TEMP_DIR} wget -c ${MOZILLA_SOURCE_LOCATE}/${MOZILLA_SOURCE_ARCHIVE} -O ${TEMP_DIR}/${MOZILLA_SOURCE_ARCHIVE} ) - [ -d ${SRC_ROOT}/moz/download ] || mkdir -p -v ${SRC_ROOT}/moz/download ${GNUCP} -v ${TEMP_DIR}/${MOZILLA_SOURCE_ARCHIVE} ${SRC_ROOT}/moz/download + [ ${OOO_BUILD_SYSTEM} = Win32Intel ] && ( + cd ${TEMP_DIR} + [ -f ${TEMP_DIR}/${MOZ_GLIB_ARCHIVE} ] || wget -c ${MOZ_LIBS_LOCATE}/${MOZ_GLIB_ARCHIVE} -O ${TEMP_DIR}/${MOZ_GLIB_ARCHIVE} + [ -f ${TEMP_DIR}/${MOZ_LIBIDL_ARCHIVE} ] || wget -c ${MOZ_LIBS_LOCATE}/${MOZ_LIBIDL_ARCHIVE} -O ${TEMP_DIR}/${MOZ_LIBIDL_ARCHIVE} + [ -f ${TEMP_DIR}/${MOZ_WINTOOLS_ARCHIVE} ] || wget -c ${MOZ_WINTOOLS_LOCATE}/${MOZ_WINTOOLS_ARCHIVE} -O ${TEMP_DIR}/${MOZ_WINTOOLS_ARCHIVE} + ${GNUCP} -v ${TEMP_DIR}/${MOZ_GLIB_ARCHIVE} ${SRC_ROOT}/moz/download + ${GNUCP} -v ${TEMP_DIR}/${MOZ_LIBIDL_ARCHIVE} ${SRC_ROOT}/moz/download + ${GNUCP} -v ${TEMP_DIR}/${MOZ_WINTOOLS_ARCHIVE} ${SRC_ROOT}/moz/download ) + } else CONFIG_FLAGS="${CONFIG_FLAGS} --disable-mozilla" fi # ================================================= -# Download LINUXGCCP*.zip for LinuxPPC -# ================================================= - -[ ${OOO_BUILD_SYSTEM} = LinuxPPC ] && { - [ ${MOZILLA_BUILD} = Yes ] || { - [ -f ${MOZZIP_DIR}/LINUXGCCPinc.zip -a -f ${MOZZIP_DIR}/LINUXGCCPlib.zip -a -f ${MOZZIP_DIR}/LINUXGCCPruntime.zip ] || { - [ -f ${TEMP_DIR}/LINUXGCCPinc.zip -a -f ${TEMP_DIR}/LINUXGCCPlib.zip -a -f ${TEMP_DIR}/LINUXGCCPruntime.zip ] || ( - PrintMessage "Download and copying LINUXGCCP*.zip" - cd ${TEMP_DIR} - wget -c ${LINUXGCCP_LOCATE}/2112/LINUXGCCPinc.zip -O ${TEMP_DIR}/LINUXGCCPinc.zip - wget -c ${LINUXGCCP_LOCATE}/2113/LINUXGCCPlib.zip -O ${TEMP_DIR}/LINUXGCCPlib.zip - wget -c ${LINUXGCCP_LOCATE}/2114/LINUXGCCPruntime.zip -O ${TEMP_DIR}/LINUXGCCPruntime.zip - ) - ${GNUCP} -fv ${TEMP_DIR}/LINUXGCCPinc.zip ${MOZZIP_DIR} - ${GNUCP} -fv ${TEMP_DIR}/LINUXGCCPlib.zip ${MOZZIP_DIR} - ${GNUCP} -fv ${TEMP_DIR}/LINUXGCCPruntime.zip ${MOZZIP_DIR} - } - } -} - - -# ================================================= # Copy required libralies for Linux # ================================================= -[ ${OOO_BUILD_SYSTEM} = Linux ] && { +[ ${OOO_BUILD_SYSTEM} = LinuxIntel ] && { PrintMessage "Copying required libralies" LIBGCC_NAME=libgcc_s.so.1 LIBCPP_NAME=libstdc++.so.5 @@ -352,6 +386,7 @@ ${GNUCP} makefile.mk makefile.mk.original echo s/\$\(USER\)\$\(USERNAME\)/${BUILDER_NAME}/ > ${TEMP_DIR}/sed.cmd cat makefile.mk.original | sed -f ${TEMP_DIR}/sed.cmd > makefile.mk + rm -f ${TEMP_DIR}/sed.cmd } ) @@ -369,7 +404,7 @@ ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/svx/res ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/svx/source/intro ${GNUCP} -fv ${TEMP_DIR}/bmp/openintro.bmp ${SRC_ROOT}/svx/res/ooointro.bmp - ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/default_images/offmgr/res +# ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/default_images/offmgr/res ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/default_images/svx/res fi } @@ -448,7 +483,6 @@ else source ./${OOO_BUILD_SYSTEM}Env.Set.sh fi - if [ -f bootstrap ]; then PrintMessage "Bootstrapping." ./bootstrap @@ -477,80 +511,75 @@ # ================================================== +# MAXPROCESS=1 fixes +# ================================================== + +for i in cppuhelper/source/makefile.mk \ + package/source/zippackage/makefile.mk \ + configmgr/source/cppugen/makefile.mk \ + cpputools/source/registercomponent/makefile.mk \ + cpputools/source/regsingleton/makefile.mk \ + cpputools/source/unoexe/makefile.mk \ + io/source/*/makefile.mk \ + eventattacher/source/makefile.mk \ + stoc/source/*/makefile.mk \ + */source/unotypes/makefile.mk \ + */unotypes/makefile.mk \ + unotools/source/config/makefile.mk \ + unotools/source/i18n/makefile.mk \ + remotebridges/source/*/makefile.mk \ + shell/source/cmdmail/makefile.mk \ + shell/source/backends/localebe/makefile.mk \ + shell/source/backends/gconfbe/makefile.mk \ + shell/source/unix/exec/makefile.mk \ + testtools/source/bridgetest/makefile.mk \ + dtrans/source/X11/makefile.mk \ + dtrans/source/generic/makefile.mk \ + dtrans/source/cnttype/makefile.mk +do + awk '{ if ($0 ~ "^PRJNAME=") print "MAXPROCESS=1"; print ; }' <$i >$i.MAXPROCESS + mv -f $i.MAXPROCESS $i +done + + +# ================================================== # Start build process # ================================================== if [ ${BUILD_NUMBER} != 645 ]; then INSTSETOO=instsetoo_native + BUILD_OPTION="${BUILD_OPTION} alllangiso=ja" else INSTSETOO=instsetoo + BUILD_OPTION="${BUILD_OPTION} alllangext=81" fi PrintMessage "Start build process." -[ ${BUILD_NUMBER} != 645 -a -e ${SRC_ROOT}/wizards/${OOOUTPATH}.pro ] && rm -fr ${SRC_ROOT}/wizards/${OOOUTPATH}.pro &> /dev/null -[ ${BUILD_NUMBER} != 645 -a -e ${SRC_ROOT}/expat/${OOOUTPATH}.pro ] && rm -fr ${SRC_ROOT}/expat/${OOOUTPATH}.pro &> /dev/null - - -# ================================================== -# setting mozilla runtime build environment -# ================================================== - -[ ${MOZILLA_BUILD} = Yes -a ${OOO_BUILD_SYSTEM} != Win32Intel ] && { - [ -f ${SRC_ROOT}/moz/build.complete ] || ( - PrintMessage "Building mozilla runtime." - [ -f ${MOZZIP_DIR}/${MOZ_ARCHIVE_NAME}inc.zip -a ! -f ${MOZZIP_DIR}/${MOZ_ARCHIVE_NAME}inc.zip.original ] && ( - cd ${MOZZIP_DIR} - mv -v ${MOZ_ARCHIVE_NAME}inc.zip ${MOZ_ARCHIVE_NAME}inc.zip.original - mv -v ${MOZ_ARCHIVE_NAME}lib.zip ${MOZ_ARCHIVE_NAME}lib.zip.original - mv -v ${MOZ_ARCHIVE_NAME}runtime.zip ${MOZ_ARCHIVE_NAME}runtime.zip.original - ) - [ -d ${SRC_ROOT}/moz/${OOOUTPATH}.pro/zipped ] || { - mkdir -p -v ${SRC_ROOT}/moz/${OOOUTPATH}.pro - ln -s ${SRC_ROOT}/moz/zipped ${SRC_ROOT}/moz/${OOOUTPATH}.pro/zipped - } - cd ${SRC_ROOT}/solenv && perl ${SOLARENV}/bin/build.pl && perl ${SOLARENV}/bin/deliver.pl - cd ${SRC_ROOT}/moz && BUILD_MOZAB=TRUE perl ${SOLARENV}/bin/build.pl - perl ${SOLARENV}/bin/deliver.pl && dmake zip && touch ${SRC_ROOT}/moz/build.complete - ) -} +#[ ${BUILD_NUMBER} != 645 -a -e ${SRC_ROOT}/wizards/${OOOUTPATH}.pro ] && rm -fr ${SRC_ROOT}/wizards/${OOOUTPATH}.pro &> /dev/null +#[ ${BUILD_NUMBER} != 645 -a -e ${SRC_ROOT}/expat/${OOOUTPATH}.pro ] && rm -fr ${SRC_ROOT}/expat/${OOOUTPATH}.pro &> /dev/null # ================================================== # Start OOo build process # ================================================== +( if [ ${OOO_BUILD_SYSTEM} != Win32Intel -a ${PARALLEL_BUILD} = Yes ]; then cd ${SRC_ROOT}/${INSTSETOO}/util PrintMessage "Parallel Building ..." - perl ${SOLARENV}/bin/build.pl -P${MAX_JOBS} --all product=full || { + BUILD_OPTION="${BUILD_OPTION} -P${MAX_JOBS}" + perl ${SOLARENV}/bin/build.pl --all product=full ${BUILD_OPTION} || { echo "Dmake failed, fix the bug above." - cd ${SRC_ROOT} exit } - cd ${SRC_ROOT} else PrintMessage "Serial Building ..." - dmake || { + dmake ${BUILD_OPTION} || { echo "Dmake failed, fix the bug above." exit } fi - - -# ================================================== -# Create install packages -# ================================================== - -( - PrintMessage "Create installation packages" - strip solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/bin/{loader.bin,gnomeint,javaldx,pagein} - cd ${SRC_ROOT}/${INSTSETOO}/util - if [ ${BUILD_NUMBER} != 645 ]; then - dmake ooolanguagepack strip=true - dmake openoffice strip=true - else - dmake strip=true - fi + strip ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/bin/{loader.bin,gnomeint,javaldx,pagein} ) @@ -593,36 +622,22 @@ # Pack Installation sets # ================================================== -( - PrintMessage "Packaging installation sets" - if [ ${BUILD_NUMBER} != 645 ]; then - if [ -e ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice/install/ja* ]; then - cd ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice/install/ja* - if [ ${OOO_BUILD_SYSTEM} != Win32Intel ]; then - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.tar.gz * - else - cp -p setup.ini ${TEMP_DIR} - perl -p -e "s/\n/\r\n/" < ${TEMP_DIR}/setup.ini > setup.ini - zip -r ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.zip * - fi - else - PrintMessage "Installation sets not found, check installation sets." - fi - if [ -e ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice_languagepack/install/ja* ]; then - PrintMessage "Packaging language-pack" - cd ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice_languagepack/install/ja* - if [ ${OOO_BUILD_SYSTEM} != Win32Intel ]; then - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_languagepack_ja_${BUILDER_NAME}.tar.gz * - else - cp -p setup.ini ${TEMP_DIR} - perl -p -e "s/\n/\r\n/" < ${TEMP_DIR}/setup.ini > setup.ini - zip -r ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_languagepack_ja_${BUILDER_NAME}.zip * - fi +if [ ${BUILD_NUMBER} != 645 ]; then + if [ ${OOO_BUILD_SYSTEM} = LinuxIntel ]; then + for PKG in ${PACKAGE_FORMAT} + do + CreateInstallSet ${PKG} + done else - PrintMessage "Languagepack sets not found, check languagepack sets." + CreateInstallSet fi - else +else + PrintMessage "Create installation packages" + cd ${SRC_ROOT}/${INSTSETOO}/util + dmake ${BUILD_OPTION} + if [ -e ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/81/normal ]; then + PrintMessage "Packaging installation set" cd ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/81 [ -e install ] && rm -fr install &> /dev/null mv normal install @@ -636,11 +651,9 @@ if [ ${OOO_BUILD_SYSTEM} = Win32Intel ]; then zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.zip install else - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.tar.gz install + tar jcvf ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.tar.bz2 install fi else PrintMessage "Installation sets not found, check installation sets." fi - fi -) - +fi --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
