User: curvirgo Date: 05/02/01 06:38:40 Modified: /ja/www/documents/develop/ ja_build
Log: fixed for Solaris 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.11&r2=1.12 Delta lines: +170 -145 ----------------------- --- ja_build 23 Jan 2005 13:56:18 -0000 1.11 +++ ja_build 1 Feb 2005 14:38:38 -0000 1.12 @@ -26,63 +26,71 @@ # build environment settings # ================================================== -[ `uname -s` = Linux ] && export OOO_BUILD_SYSTEM=Linux -[ `uname -s` = SunOS ] && export OOO_BUILD_SYSTEM=Solaris -[ `uname -s | grep CYGWIN` ] && export OOO_BUILD_SYSTEM=Windows -[ `uname -s` = Linux -a `uname -m` = ppc ] && export OOO_BUILD_SYSTEM=LinuxPPC - -export BUILDER_NAME=curvirgo -export VERSION=1.9m74 -export BUILD_NUMBER=680 -export LANGUAGES=ja -export PREFIX=/opt - -export SRC_ROOT=`pwd` -export TEMP_DIR=${SRC_ROOT}/temp -export PATCH_DIR=${SRC_ROOT}/temp/patch/${BUILD_NUMBER} -export SETUPGUIDE_DIR=${SRC_ROOT}/temp/pdf -export CCACHE_DIR=/usr/bin -export JAVA_HOME=/usr/java/j2sdk1.4.2_06 -export ANT_HOME=/usr/local/apache-ant-1.6.2 -export VC_DIR=/cygdrive/c/progra~1/micros~1.net -export CSC_DIR=/cygdrive/c/windows/micros~1.net/framew~1/v10~1.370 -export FRAME_HOME=/cygdrive/c/progra~1/micros~1.net/framew~1 -export DIRECTX_HOME=/cygdrive/c/progra~1/micros~1.0sd -export WDEVENV_DIR=/cygdrive/c/progra~1/conver~1 - -export GPC_LOCATE=ftp://ftp.cs.man.ac.uk/pub/toby/gpc -export GPC_ARCHIVE=gpc231.zip - -export HELPCONTENT_LOCATE=http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent -export HELPCONTENT_ARCHIVE=helpcontent_81 - -export LINUXGCCP_LOCATE=http://ja.openoffice.org/files/documents/111 -export MOZZIP_DIR=${SRC_ROOT}/moz/zipped - -export MOZOOO_LOCATE=http://external.openoffice.org/nonav/source/browse/*checkout*/external/moz -export MOZILLA_SOURCE_LOCATE=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7b/src -export MOZILLA_SOURCE_ARCHIVE=mozilla-source-1.7b-source.tar.gz - -export CONFIG_FLAGS="--with-lang=${LANGUAGES} --with-dict=ALL" - -export CREATE_SDK=Yes -export CREATE_SOLVER=Yes -export SETUP_NATIVE=Yes -export PARALLEL_BUILD=No -export MAX_JOBS=6 - -export CRASHDUMP=Yes -export ENABLE_MOZILLA=Yes -export MOZILLA_BUILD=Yes -export ENABLE_GTK_PLUGIN=Yes -export ENABLE_KDE_PLUGIN=Yes -export ORIGINALPATCH=Yes -export REPLACE_SPLASH=Yes -export REPLACE_VENDOR_NAME=Yes -export COPY_SYMBOL=No -export USE_ORIGINALICON=No -export ATTACH_SETUPGUIDE=No -export SETUPGUIDE_VERSION=113 +#set -x + +[ `uname -s` = Linux ] && OOO_BUILD_SYSTEM=LinuxIntel +[ `uname -s` = SunOS ] && OOO_BUILD_SYSTEM=SolarisSparc +[ `uname -s` = SunOS -a `uname -m` = i86pc ] && OOO_BUILD_SYSTEM=SolarisIntel +[ `uname -s` = SunOS -a "${COM}" = "GCC" ] && OOO_BUILD_SYSTEM=SolarisSparcGcc +[ `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 + +BUILDER_NAME=${BUILDER_NAME:-curvirgo} +VERSION=${VERSION:-1.9m75} +BUILD_NUMBER=${BUILD_NUMBER:-680} +LANGUAGES=${LANGUAGES:-ja} +PREFIX=${PREFIX:-/opt} + +SRC_ROOT=${SRC_ROOT:-`pwd`} +TEMP_DIR=${TEMP_DIR:-${SRC_ROOT}/temp} +PATCH_DIR=${PATCH_DIR:-${SRC_ROOT}/temp/patch/${BUILD_NUMBER}} +SETUPGUIDE_DIR=${SETUPGUIDE_DIR:-${SRC_ROOT}/temp/pdf} +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} +DIRECTX_HOME=${DIRECTX_HOME:-/cygdrive/c/progra~1/micros~1.0sd} +WDEVENV_DIR=${WDEVENV_DIR:-/cygdrive/c/progra~1/conver~1} + +GNUCP=${GNUCP:-cp} +GNUPATCH=${GNUPATCH:-/usr/bin/gpatch} + +GPC_LOCATE=ftp://ftp.cs.man.ac.uk/pub/toby/gpc +GPC_ARCHIVE=gpc231.zip + +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 + +CONFIG_FLAGS="--with-lang=${LANGUAGES} --with-dict=ALL" + +CREATE_SDK=${CREATE_SDK:-Yes} +CREATE_SOLVER=${CREATE_SOLVER:-Yes} +PARALLEL_BUILD=${PARALLEL_BUILD:-No} +MAX_JOBS=${MAX_JOBS:-6} + +CRASHDUMP=${CRASHDUMP:-Yes} +ENABLE_MOZILLA=${ENABLE_MOZILLA:-Yes} +MOZILLA_BUILD=${MOZILLA_BUILD:-Yes} +ENABLE_GTK_PLUGIN=${ENABLE_GTK_PLUGIN:-Yes} +ENABLE_KDE_PLUGIN=${ENABLE_KDE_PLUGIN:-Yes} +ORIGINALPATCH=${ORIGINALPATCH:-Yes} +REPLACE_SPLASH=${REPLACE_SPLASH:-Yes} +REPLACE_VENDOR_NAME=${REPLACE_VENDOR_NAME:-Yes} +COPY_SYMBOL=${COPY_SYMBOL:-No} +USE_ORIGINALICON=${USE_ORIGINALICON:-No} +ATTACH_SETUPGUIDE=${ATTACH_SETUPGUIDE:-No} +SETUPGUIDE_VERSION=${SETUPGUIDE_VERSION:-114} + +export JAVA_HOME ANT_HOME # ================================================== @@ -90,44 +98,49 @@ # ================================================== case ${OOO_BUILD_SYSTEM} in - Linux) - export OOOUTPATH=unxlngi4 - export OOARCHENVIRONMENT=LinuxIntel - export MOZ_ARCHIVE_NAME=LINUXGCCI - export CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" - [ ${BUILD_NUMBER} != 645 ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --enable-cups --enable-fontconfig" + 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" ;; LinuxPPC) - export OOOUTPATH=unxlngppc - export OOARCHENVIRONMENT=LinuxPPC - export MOZ_ARCHIVE_NAME=LINUXGCCP - export CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" + OOOUTPATH=unxlngppc + MOZ_ARCHIVE_NAME=LINUXGCCP + CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" ;; - Solaris) - if [ `uname -p` = sparc ]; then - export OOOUTPATH=unxsols4 - export OOARCHENVIRONMENT=SolarisSparc - export MOZ_ARCHIVE_NAME=SOLARIS52S - else - export OOOUTPATH=unxsoli4 - export OOARCHENVIRONMENT=SolarisIntel - export MOZ_ARCHIVE_NAME=SOLARIS52I - fi - export 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}" ;; - Windows) - export OOOUTPATH=wntmsci8 - export OOARCHENVIRONMENT=Win32Intel - export CONFIG_FLAGS="${CONFIG_FLAGS} --with-use-shell=tcsh" - [ -d ${VC_DIR} ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --with-cl-home=${VC_DIR}" - [ -d ${WDEVENV_DIR} ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --with-wdevenv-path=${WDEVENV_DIR}" + SolarisIntelGcc) + OOOUTPATH=unxsogi + MOZ_ARCHIVE_NAME=SOLARISGCCI + CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" + ;; + Win32Intel) + OOOUTPATH=wntmsci10 + CONFIG_FLAGS="${CONFIG_FLAGS} --with-use-shell=tcsh" + [ -d ${VC_DIR} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-cl-home=${VC_DIR}" + [ -d ${WDEVENV_DIR} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-wdevenv-path=${WDEVENV_DIR}" [ ${BUILD_NUMBER} != 645 ] && { - [ -d ${FRAME_HOME} ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --with-frame-home=${FRAME_HOME}" - [ -d ${CSC_DIR} ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --with-csc-path=${CSC_DIR}" + [ -d ${FRAME_HOME} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-frame-home=${FRAME_HOME}" + [ -d ${CSC_DIR} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-csc-path=${CSC_DIR}" if [ -d ${DIRECTX_HOME} ]; then - export CONFIG_FLAGS="${CONFIG_FLAGS} --with-directx-home=${DIRECTX_HOME}" + CONFIG_FLAGS="${CONFIG_FLAGS} --with-directx-home=${DIRECTX_HOME}" else - export CONFIG_FLAGS="${CONFIG_FLAGS} -disable-directx" + CONFIG_FLAGS="${CONFIG_FLAGS} -disable-directx" fi } ;; @@ -138,11 +151,11 @@ esac -[ -d ${JAVA_HOME} ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --with-jdk-home=${JAVA_HOME}" -[ -d ${ANT_HOME} ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --with-ant-home=${ANT_HOME}" -[ ${CRASHDUMP} = Yes ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --enable-crashdump --enable-symbols=SMALL" -[ ${ENABLE_GTK_PLUGIN} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk" -[ ${ENABLE_KDE_PLUGIN} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ] && export CONFIG_FLAGS="${CONFIG_FLAGS} --enable-kde" +[ -d ${JAVA_HOME} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-jdk-home=${JAVA_HOME}" +[ -d ${ANT_HOME} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-ant-home=${ANT_HOME}" +[ ${CRASHDUMP} = Yes ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-crashdump --enable-symbols=SMALL" +[ ${ENABLE_GTK_PLUGIN} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk" +[ ${ENABLE_KDE_PLUGIN} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-kde" # ================================================= @@ -184,14 +197,14 @@ wget -c ${HELPCONTENT_LOCATE}/${HELPCONTENT_ARCHIVE}_wnt.zip -O ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_wnt.zip ) unzip -o -d ${TEMP_DIR}/help ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_wnt.zip - export OS_TYPE=wnt + OS_TYPE=wnt else [ -f ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_unix.tgz ] || ( cd ${TEMP_DIR} wget -c ${HELPCONTENT_LOCATE}/${HELPCONTENT_ARCHIVE}_unix.tgz -O ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_unix.tgz ) gzip -dc ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_unix.tgz|(cd ${TEMP_DIR}/help; tar xvf - ) - export OS_TYPE=unx + OS_TYPE=unx fi unzip -o -d ${SRC_ROOT}/helpcontent/${OS_TYPE}/common/japanese ${TEMP_DIR}/help/shared81.zip @@ -210,14 +223,15 @@ # ================================================= if [ ${ENABLE_MOZILLA} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ]; then - export CONFIG_FLAGS="${CONFIG_FLAGS} --enable-mozilla" + CONFIG_FLAGS="${CONFIG_FLAGS} --enable-mozilla" [ ${MOZILLA_BUILD} = Yes ] && ( PrintMessage "Download mozilla source file" - [ -d ${SRC_ROOT}/moz_original ] || cp -R ${SRC_ROOT}/moz ${SRC_ROOT}/moz_original + [ -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.10 -O ${SRC_ROOT}/moz/makefile.mk - [ -f ${SRC_ROOT}/moz/extractfiles.mk ] || wget -c ${MOZOOO_LOCATE}/extractfiles.mk?rev=1.1.2.8 -O ${SRC_ROOT}/moz/extractfiles.mk + [ -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 @@ -229,10 +243,10 @@ 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 - cp -v ${TEMP_DIR}/${MOZILLA_SOURCE_ARCHIVE} ${SRC_ROOT}/moz/download + ${GNUCP} -v ${TEMP_DIR}/${MOZILLA_SOURCE_ARCHIVE} ${SRC_ROOT}/moz/download ) else - export CONFIG_FLAGS="${CONFIG_FLAGS} --disable-mozilla" + CONFIG_FLAGS="${CONFIG_FLAGS} --disable-mozilla" fi @@ -250,9 +264,9 @@ wget -c ${LINUXGCCP_LOCATE}/2113/LINUXGCCPlib.zip -O ${TEMP_DIR}/LINUXGCCPlib.zip wget -c ${LINUXGCCP_LOCATE}/2114/LINUXGCCPruntime.zip -O ${TEMP_DIR}/LINUXGCCPruntime.zip ) - cp -fv ${TEMP_DIR}/LINUXGCCPinc.zip ${MOZZIP_DIR} - cp -fv ${TEMP_DIR}/LINUXGCCPlib.zip ${MOZZIP_DIR} - cp -fv ${TEMP_DIR}/LINUXGCCPruntime.zip ${MOZZIP_DIR} + ${GNUCP} -fv ${TEMP_DIR}/LINUXGCCPinc.zip ${MOZZIP_DIR} + ${GNUCP} -fv ${TEMP_DIR}/LINUXGCCPlib.zip ${MOZZIP_DIR} + ${GNUCP} -fv ${TEMP_DIR}/LINUXGCCPruntime.zip ${MOZZIP_DIR} } } } @@ -284,12 +298,12 @@ [ ${OOO_BUILD_SYSTEM} = Windows ] && { PrintMessage "Copying required Dynamic link libralies" install -v -m755 ${TEMP_DIR}/unicows/* ${SRC_ROOT}/external/unicows - install -v -m755 "`find ${VC_DIR} -name dbghelp.dll`" ${SRC_ROOT}/external/dbghelp - install -v -m755 "`find ${VC_DIR} -name 'msvcp70.dll'`" ${SRC_ROOT}/external/msvcp70 - install -v -m755 "`find ${VC_DIR} -name 'msvcr70.dll'`" ${SRC_ROOT}/external/msvcp70 + install -v -m755 `which dbghelp.dll` ${SRC_ROOT}/external/dbghelp + install -v -m755 `which msvcp70.dll` ${SRC_ROOT}/external/msvcp70 + install -v -m755 `which msvcr70.dll` ${SRC_ROOT}/external/msvcp70 [ ${BUILD_NUMBER} != 645 ] && { - install -v -m755 "`find ${VC_DIR} -name 'msvcp71.dll'`" ${SRC_ROOT}/external/msvcp71 - install -v -m755 "`find ${VC_DIR} -name 'msvcr71.dll'`" ${SRC_ROOT}/external/msvcp71 + install -v -m755 `which msvcp71.dll` ${SRC_ROOT}/external/msvcp71 + install -v -m755 `which msvcr71.dll` ${SRC_ROOT}/external/msvcp71 } } @@ -304,10 +318,10 @@ cd ${SRC_ROOT}/extras/source/wordbook/lang if [ ${BUILD_NUMBER} = 645 ]; then mkdir -p japanese - cp -fv english_us/soffice.dic japanese + ${GNUCP} -fv english_us/soffice.dic japanese else mkdir -p ja - cp -fv en-US/soffice.dic ja + ${GNUCP} -fv en-US/soffice.dic ja fi ) @@ -319,7 +333,7 @@ [ ${BUILD_NUMBER} != 645 ] && ( cd ${SRC_ROOT}/extras/source/templates/wizard/fax/lang mkdir -p ja - cp -fv en-US/*.ott ja + ${GNUCP} -fv en-US/*.ott ja ) @@ -335,7 +349,7 @@ cd svx/source/intro fi [ -e makefile.mk.original ] || { - cp makefile.mk makefile.mk.original + ${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 } @@ -349,14 +363,14 @@ [ ${REPLACE_SPLASH} = Yes ] && { PrintMessage "Replace splash images" if [ ${BUILD_NUMBER} = 645 ]; then - cp -fv ${TEMP_DIR}/bmp/*.bmp ${SRC_ROOT}/offmgr/res + ${GNUCP} -fv ${TEMP_DIR}/bmp/*.bmp ${SRC_ROOT}/offmgr/res else - cp -fv ${TEMP_DIR}/bmp/*.bmp ${SRC_ROOT}/svx/res - cp -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/svx/res - cp -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/svx/source/intro - cp -fv ${TEMP_DIR}/bmp/openintro.bmp ${SRC_ROOT}/svx/res/ooointro.bmp - cp -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/default_images/offmgr/res - cp -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/default_images/svx/res + ${GNUCP} -fv ${TEMP_DIR}/bmp/*.bmp ${SRC_ROOT}/svx/res + ${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/svx/res fi } @@ -367,7 +381,7 @@ [ ${USE_ORIGINALICON} = Yes ] && { PrintMessage "Replace original icon" - cp -fv ${TEMP_DIR}/OriginalIcon/* ${SRC_ROOT}/sysui/oowin32/office/icons + ${GNUCP} -fv ${TEMP_DIR}/OriginalIcon/* ${SRC_ROOT}/sysui/oowin32/office/icons } @@ -377,7 +391,7 @@ [ ${COPY_SYMBOL} = Yes ] && { PrintMessage "Copying custom toolbar icon" - cp -fv ${TEMP_DIR}/icon/*.bmp ${SRC_ROOT}/extras/source/symbols + ${GNUCP} -fv ${TEMP_DIR}/icon/*.bmp ${SRC_ROOT}/extras/source/symbols } @@ -400,9 +414,14 @@ # Set enviromental values for ccache # ================================================== -[ ${OOO_BUILD_SYSTEM} != Windows -a -x ${CCACHE_DIR}/ccache ] && { +[ ${OOO_BUILD_SYSTEM} != Windows -a -x `which ccache` ] && { + if [ ${OOO_BUILD_SYSTEM} = SolarisSparc -o ${OOO_BUILD_SYSTEM} = SolarisIntel ]; then + export CC="ccache cc" + export CXX="CC" + else export CC="ccache gcc" export CXX="ccache g++" + fi } @@ -427,7 +446,7 @@ if [ ${OOO_BUILD_SYSTEM} = Windows ]; then source ./winenv.set.sh else - source ./${OOARCHENVIRONMENT}Env.Set.sh + source ./${OOO_BUILD_SYSTEM}Env.Set.sh fi if [ -f bootstrap ]; then @@ -449,7 +468,7 @@ else PrintMessage "Patching original patches" [ -e ${PATCH_DIR} ] && ApplyPatch ${PATCH_DIR} - [ -e ${PATCH_DIR}/${OOARCHENVIRONMENT} ] && ApplyPatch ${PATCH_DIR}/${OOARCHENVIRONMENT} + [ -e ${PATCH_DIR}/${OOO_BUILD_SYSTEM} ] && ApplyPatch ${PATCH_DIR}/${OOO_BUILD_SYSTEM} echo '#!/bin/bash' > ${SRC_ROOT}/remove_patched_file.sh grep -i "patching file" ${SRC_ROOT}/patch.log | sed -e 's/patching file /rm -fv /' >> ${SRC_ROOT}/remove_patched_file.sh chmod 755 ${SRC_ROOT}/remove_patched_file.sh @@ -461,14 +480,15 @@ # Start build process # ================================================== -if [ ${BUILD_NUMBER} != 645 -a ${SETUP_NATIVE} = Yes ]; then - export INSTSETOO=instsetoo_native +if [ ${BUILD_NUMBER} != 645 ]; then + INSTSETOO=instsetoo_native else - export INSTSETOO=instsetoo + INSTSETOO=instsetoo 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 # ================================================== @@ -478,7 +498,7 @@ [ ${MOZILLA_BUILD} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ] && { [ -f ${SRC_ROOT}/moz/build.complete ] || ( PrintMessage "Building mozilla runtime." - export BUILD_MOZAB=TRUE + BUILD_MOZAB=TRUE [ -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 @@ -526,7 +546,7 @@ 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 -a ${SETUP_NATIVE} = Yes ]; then + if [ ${BUILD_NUMBER} != 645 ]; then dmake ooolanguagepack strip=true dmake openoffice strip=true else @@ -546,9 +566,9 @@ perl ${SOLARENV}/bin/build.pl --from sdk_oo if [ ${OOO_BUILD_SYSTEM} != "Windows" ] then - cp ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.tar.gz ${SRC_ROOT}/OOo_${VERSION}_${OOARCHENVIRONMENT}_sdk_ja_${BUILDER_NAME}.tar.gz + ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.tar.gz ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_ja_${BUILDER_NAME}.tar.gz else - cp ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.zip ${SRC_ROOT}/OOo_${VERSION}_${OOARCHENVIRONMENT}_sdk_ja_${BUILDER_NAME}.zip + ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.zip ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_ja_${BUILDER_NAME}.zip fi } ) @@ -562,9 +582,9 @@ [ ${CREATE_SOLVER} = Yes ] && { PrintMessage "Packaging SOLVER" if [ ${OOO_BUILD_SYSTEM} != "Windows" ]; then - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOARCHENVIRONMENT}_solver_ja_${BUILDER_NAME}.tar.gz solver + tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_ja_${BUILDER_NAME}.tar.gz solver else - zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOARCHENVIRONMENT}_solver_ja_${BUILDER_NAME}.zip solver + zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_ja_${BUILDER_NAME}.zip solver fi } ) @@ -576,13 +596,15 @@ ( PrintMessage "Packaging installation sets" - if [ ${BUILD_NUMBER} != 645 -a ${SETUP_NATIVE} = Yes ]; then + 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} != "Windows" ]; then - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOARCHENVIRONMENT}_install_ja_${BUILDER_NAME}.tar.gz * + tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.tar.gz * else - zip -r ${SRC_ROOT}/OOo_${VERSION}_native_${OOARCHENVIRONMENT}_install_ja_${BUILDER_NAME}.zip * + 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." @@ -591,9 +613,11 @@ PrintMessage "Packaging language-pack" cd ${SRC_ROOT}/${INSTSETOO}/${OOOUTPATH}.pro/OpenOffice_languagepack/install/ja* if [ ${OOO_BUILD_SYSTEM} != "Windows" ]; then - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOARCHENVIRONMENT}_languagepack_ja_${BUILDER_NAME}.tar.gz * + tar zcvf ${SRC_ROOT}/OOo_${VERSION}_native_${OOO_BUILD_SYSTEM}_languagepack_ja_${BUILDER_NAME}.tar.gz * else - zip -r ${SRC_ROOT}/OOo_${VERSION}_native_${OOARCHENVIRONMENT}_languagepack_ja_${BUILDER_NAME}.zip * + 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 else PrintMessage "Languagepack sets not found, check languagepack sets." @@ -605,18 +629,19 @@ mv normal install [ ${ATTACH_SETUPGUIDE} = Yes ] && { if [ ${OOO_BUILD_SYSTEM} = "Windows" ]; then - cp ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_win.pdf install/setupguide.pdf + ${GNUCP} ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_win.pdf install/setupguide.pdf else - cp ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_linux_solaris.pdf install/setupguide.pdf + ${GNUCP} ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_linux_solaris.pdf install/setupguide.pdf fi } if [ ${OOO_BUILD_SYSTEM} = "Windows" ]; then - zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOARCHENVIRONMENT}_install_ja_${BUILDER_NAME}.zip install + zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.zip install else - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOARCHENVIRONMENT}_install_ja_${BUILDER_NAME}.tar.gz install + tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_ja_${BUILDER_NAME}.tar.gz install fi else PrintMessage "Installation sets not found, check installation sets." fi fi ) + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
