User: curvirgo Date: 05/09/30 07:38:03 Modified: /ja/www/documents/develop/ ja_build
Log: Fix "Windows_Download_Installer filename" ,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.25&r2=1.26 Delta lines: +24 -15 --------------------- --- ja_build 12 Sep 2005 14:11:17 -0000 1.25 +++ ja_build 30 Sep 2005 14:38:00 -0000 1.26 @@ -36,8 +36,10 @@ dmake openoffice ${BUILD_OPTION} fi + echo LANGUAGES=${LANGUAGES} for LANGUAGE in ${LANGUAGES} do + echo LANGUAGE=${LANGUAGE} if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE} ]; then PrintMessage "Packaging installation set [Language : ${LANGUAGE}]" if [ "${PACKAGE}" = "deb" ]; then @@ -69,7 +71,7 @@ Win32Intel) zip -r ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.zip * cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE}_download - ${GNUCP} -vp OOo_`echo ${VERSION} | sed 's/m/\./'`_windows_install_${LANGUAGE}.exe ${PKGOUTDIR}/OOo_`echo ${VERSION} | sed 's/m/\./'`_windows_install_${LANGUAGE}_${BUILDER_NAME}.exe + ${GNUCP} -vp OOo_*_windows_install_${LANGUAGE}.exe ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.exe ;; *) tar zcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.tar.gz * @@ -134,7 +136,7 @@ Win32Intel) zip -r ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}.zip * cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE}_download - ${GNUCP} -vp OOo_`echo ${VERSION} | sed 's/m/\./'`_languagepack_windows_install_${LANGUAGE}.exe ${PKGOUTDIR}/OOo_`echo ${VERSION} | sed 's/m/\./'`_languagepack_windows_install_${LANGUAGE}_${BUILDER_NAME}.exe + ${GNUCP} -vp OOo_*_languagepack_windows_install_${LANGUAGE}.exe ${PKGOUTDIR}/OOo_*_languagepack_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.exe ;; *) tar zcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}.tar.gz * @@ -170,9 +172,11 @@ case ${PACKAGE} in rpm) DIRECTORY=${RPM_DIR} - PrintMessage "MOVING deb_package desktop-integration file" - mkdir -vp ../deb/${DEB_DIR}/desktop-integration/ - mv -v ./${RPM_DIR}/desktop-integration/*.deb ../deb/${DEB_DIR}/desktop-integration/ +# PrintMessage "MOVING deb_package desktop-integration file" +# mkdir -vp ../deb/${DEB_DIR}/desktop-integration/ +# mv -v ./${RPM_DIR}/desktop-integration/*.deb ../deb/${DEB_DIR}/desktop-integration/ + PrintMessage "REMOVING deb_package desktop-integration file" + rm -fv ./${RPM_DIR}/desktop-integration/*.deb ;; deb) DIRECTORY=${DEB_DIR} @@ -251,10 +255,10 @@ [ `uname -s` = Linux -a `uname -m` = x86_64 ] && export OOO_BUILD_SYSTEM=LinuxAMD BUILDER_NAME=${BUILDER_NAME:-curvirgo} -VERSION=${VERSION:-1.9m128} +VERSION=${VERSION:-2.0rc1} BUILD_NUMBER=${BUILD_NUMBER:-680} #LANGUAGES=${LANGUAGES:-"JAPN"} # for 1.1.x -LANGUAGES=${LANGUAGES:-"en-US ja"} +LANGUAGES=${LANGUAGES:-"ja"} # for 2.0 PREFIX=${PREFIX:-/opt} SRC_ROOT=${SRC_ROOT:-`pwd`} @@ -262,8 +266,8 @@ PATCH_DIR=${PATCH_DIR:-${SRC_ROOT}/temp/patch/${BUILD_NUMBER}} PKGOUTDIR=${PKGOUTDIR:-${SRC_ROOT}/OOo_Package} SETUPGUIDE_DIR=${SETUPGUIDE_DIR:-${SRC_ROOT}/temp/pdf} -JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_08} -ANT_HOME=${ANT_HOME:-/usr/local/apache-ant-1.6.2} +JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_09} +ANT_HOME=${ANT_HOME:-/usr/local/apache-ant-1.6.5} VC_DIR=${VC_DIR:-/cygdrive/c/progra~1/micros~1.net} 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} @@ -307,7 +311,7 @@ COPY_SYMBOL=${COPY_SYMBOL:-No} USE_ORIGINALICON=${USE_ORIGINALICON:-No} ATTACH_SETUPGUIDE=${ATTACH_SETUPGUIDE:-No} -SETUPGUIDE_VERSION=${SETUPGUIDE_VERSION:-114} +SETUPGUIDE_VERSION=${SETUPGUIDE_VERSION:-115} export JAVA_HOME ANT_HOME @@ -644,7 +648,12 @@ [ ${ORIGINALPATCH} = Yes ] && { if [ -e ${SRC_ROOT}/patch.log ]; then - [ ${BUILD_NUMBER} = 645 ] && patch -p1 < ${PATCH_DIR}/helpcontent_font_fix_${OS_TYPE}.patch + [ ${BUILD_NUMBER} = 645 ] && { + for file in `ls ${PATCH_DIR}/${OOO_BUILD_SYSTEM}/helpcontent*.patch` + do + patch -p1 < ${FILE} + done + } else PrintMessage "Patching original patches" [ -e ${PATCH_DIR} ] && ApplyPatch ${PATCH_DIR} @@ -737,9 +746,9 @@ build.pl if [ ${OOO_BUILD_SYSTEM} != Win32Intel ] then - ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.tar.gz ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_${BUILDER_NAME}.tar.gz + ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.tar.gz ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_${BUILDER_NAME}.tar.gz else - ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.zip ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_${BUILDER_NAME}.zip + ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.zip ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_${BUILDER_NAME}.zip fi cd ${SRC_ROOT} } @@ -752,9 +761,9 @@ [ ${CREATE_SOLVER} = Yes ] && { PrintMessage "Packaging SOLVER" if [ ${OOO_BUILD_SYSTEM} != Win32Intel ]; then - tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.tar.gz solver + tar zcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.tar.gz solver else - zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.zip solver + zip -r ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.zip solver fi } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
