User: curvirgo Date: 05/02/06 06:20:13 Modified: /ja/www/documents/develop/ ja_build
Log: fix typo (Windows -> Win32Intel) 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.13&r2=1.14 Delta lines: +16 -16 --------------------- --- ja_build 6 Feb 2005 13:11:40 -0000 1.13 +++ ja_build 6 Feb 2005 14:20:10 -0000 1.14 @@ -154,8 +154,8 @@ [ -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" +[ ${ENABLE_GTK_PLUGIN} = Yes -a ${OOO_BUILD_SYSTEM} != Win32Intel ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk" +[ ${ENABLE_KDE_PLUGIN} = Yes -a ${OOO_BUILD_SYSTEM} != Win32Intel ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-kde" # ================================================= @@ -191,7 +191,7 @@ [ ${BUILD_NUMBER} = 645 ] && { PrintMessage "Download, unpack and copying Japanges Help contents" mkdir -p ${TEMP_DIR}/help - if [ ${OOO_BUILD_SYSTEM} = Windows ]; then + if [ ${OOO_BUILD_SYSTEM} = Win32Intel ]; then [ -f ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_wnt.zip ] || ( cd ${TEMP_DIR} wget -c ${HELPCONTENT_LOCATE}/${HELPCONTENT_ARCHIVE}_wnt.zip -O ${TEMP_DIR}/${HELPCONTENT_ARCHIVE}_wnt.zip @@ -222,7 +222,7 @@ # Download mozilla source file # ================================================= -if [ ${ENABLE_MOZILLA} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ]; then +if [ ${ENABLE_MOZILLA} = Yes -a ${OOO_BUILD_SYSTEM} != Win32Intel ]; then CONFIG_FLAGS="${CONFIG_FLAGS} --enable-mozilla" [ ${MOZILLA_BUILD} = Yes ] && ( PrintMessage "Download mozilla source file" @@ -295,7 +295,7 @@ # Copy required DLL for Windows # ================================================= -[ ${OOO_BUILD_SYSTEM} = Windows ] && { +[ ${OOO_BUILD_SYSTEM} = Win32Intel ] && { PrintMessage "Copying required Dynamic link libralies" install -v -m755 ${TEMP_DIR}/unicows/* ${SRC_ROOT}/external/unicows install -v -m755 `which dbghelp.dll` ${SRC_ROOT}/external/dbghelp @@ -402,7 +402,7 @@ [ ${ATTACH_SETUPGUIDE} = Yes ] && { PrintMessage "Copying setupguide" mkdir -p ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/bin - if [ ${OOO_BUILD_SYSTEM} = "Windows" ]; then + if [ ${OOO_BUILD_SYSTEM} = Win32Intel ]; then install -v -m644 ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_win.pdf ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/bin else install -v -m644 ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_linux_solaris.pdf ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/bin @@ -414,7 +414,7 @@ # Set enviromental values for ccache # ================================================== -[ ${OOO_BUILD_SYSTEM} != Windows -a -x `which ccache` ] && { +[ ${OOO_BUILD_SYSTEM} != Win32Intel -a -x `which ccache` ] && { if [ ${OOO_BUILD_SYSTEM} = SolarisSparc -o ${OOO_BUILD_SYSTEM} = SolarisIntel ]; then export CC="ccache cc" export CXX="CC" @@ -443,7 +443,7 @@ # Set enviroment values and bootstrap # ================================================== -if [ ${OOO_BUILD_SYSTEM} = Windows ]; then +if [ ${OOO_BUILD_SYSTEM} = Win32Intel ]; then source ./winenv.set.sh else source ./${OOO_BUILD_SYSTEM}Env.Set.sh @@ -495,7 +495,7 @@ # setting mozilla runtime build environment # ================================================== -[ ${MOZILLA_BUILD} = Yes -a ${OOO_BUILD_SYSTEM} != Windows ] && { +[ ${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 ] && ( @@ -519,7 +519,7 @@ # Start OOo build process # ================================================== -if [ ${OOO_BUILD_SYSTEM} != Windows -a ${PARALLEL_BUILD} = Yes ]; then +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 || { @@ -563,7 +563,7 @@ PrintMessage "Packaging SDK" cd sdk_oo perl ${SOLARENV}/bin/build.pl --from sdk_oo - if [ ${OOO_BUILD_SYSTEM} != "Windows" ] + if [ ${OOO_BUILD_SYSTEM} != Win32Intel ] then ${GNUCP} ${OOOUTPATH}.pro/bin/OpenOffice.org*_SDK.tar.gz ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_ja_${BUILDER_NAME}.tar.gz else @@ -580,7 +580,7 @@ ( [ ${CREATE_SOLVER} = Yes ] && { PrintMessage "Packaging SOLVER" - if [ ${OOO_BUILD_SYSTEM} != "Windows" ]; then + if [ ${OOO_BUILD_SYSTEM} != Win32Intel ]; then tar zcvf ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_ja_${BUILDER_NAME}.tar.gz solver else zip -r ${SRC_ROOT}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_ja_${BUILDER_NAME}.zip solver @@ -598,7 +598,7 @@ 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 + 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} @@ -611,7 +611,7 @@ 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} != "Windows" ]; then + 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} @@ -627,13 +627,13 @@ [ -e install ] && rm -fr install &> /dev/null mv normal install [ ${ATTACH_SETUPGUIDE} = Yes ] && { - if [ ${OOO_BUILD_SYSTEM} = "Windows" ]; then + if [ ${OOO_BUILD_SYSTEM} = Win32Intel ]; then ${GNUCP} ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_win.pdf install/setupguide.pdf else ${GNUCP} ${SETUPGUIDE_DIR}/InstGuide_${SETUPGUIDE_VERSION}_linux_solaris.pdf install/setupguide.pdf fi } - if [ ${OOO_BUILD_SYSTEM} = "Windows" ]; then + 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
