User: curvirgo Date: 05/04/24 07:19:32 Modified: /ja/www/documents/develop/ ja_build
Log: changed for gcc 3.4 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.15&r2=1.16 Delta lines: +29 -16 --------------------- --- ja_build 23 Mar 2005 12:58:01 -0000 1.15 +++ ja_build 24 Apr 2005 14:19:29 -0000 1.16 @@ -88,7 +88,7 @@ [ `uname -s` = Linux -a `uname -m` = x86_64 ] && export OOO_BUILD_SYSTEM=LinuxAMD BUILDER_NAME=${BUILDER_NAME:-curvirgo} -VERSION=${VERSION:-1.9m87} +VERSION=${VERSION:-1.9m95} BUILD_NUMBER=${BUILD_NUMBER:-680} LANGUAGES=${LANGUAGES:-ja} PREFIX=${PREFIX:-/opt} @@ -97,7 +97,7 @@ 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} +JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_08} 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/v11~1.432} @@ -127,8 +127,8 @@ CREATE_SDK=${CREATE_SDK:-Yes} CREATE_SOLVER=${CREATE_SOLVER:-Yes} -PARALLEL_BUILD=${PARALLEL_BUILD:-No} -MAX_JOBS=${MAX_JOBS:-6} +PARALLEL_BUILD=${PARALLEL_BUILD:-Yes} +MAX_JOBS=${MAX_JOBS:-10} BUILD_OPTION=${BUILD_OPTION:-"strip=true"} PACKAGE_FORMAT=${PACKAGE_FORMAT:-"rpm deb portable"} @@ -154,7 +154,12 @@ case ${OOO_BUILD_SYSTEM} in LinuxIntel) - OOOUTPATH=unxlngi4 + GCC_VER=`gcc -v 2>&1 | tail -n 1 | awk '{print $3}' | sed 's/\.//g'` + if [ ${GCC_VER} -ge 340 ] ; then + OOOUTPATH=unxlngi6 # gcc 3.4 + else + OOOUTPATH=unxlngi4 # gcc 3.3 + fi CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3" [ ${BUILD_NUMBER} != 645 ] && { CONFIG_FLAGS="${CONFIG_FLAGS} --enable-cups --enable-fontconfig" @@ -189,7 +194,12 @@ CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" ;; Win32Intel) - OOOUTPATH=wntmsci10 + CL_VER=`cl 2>&1 | head -n 1 | sed -e 's/(R)//' -e 's/\.//g' | awk '{print $7}'` + if [ ${CL_VER} -ge 13103000 ] ; then + OOOUTPATH=wntmsci10 # VC 2003 + else + OOOUTPATH=wntmsci8 # VC 2002 + fi 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}" @@ -313,10 +323,14 @@ [ ${OOO_BUILD_SYSTEM} = LinuxIntel ] && { PrintMessage "Copying required libralies" LIBGCC_NAME=libgcc_s.so.1 - LIBCPP_NAME=libstdc++.so.5 + if [ ${GCC_VER} -ge 340 ] ; then + LIBCPP_NAME=libstdc++.so.6 # gcc 3.4 + else + LIBCPP_NAME=libstdc++.so.5 # gcc 3.3 + fi mkdir -p ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/lib DIR_LIST=`cat /etc/ld.so.conf | grep -e "^/"` - DIR_LIST="${DIR_LIST} /lib" + DIR_LIST="${DIR_LIST} /usr/local/lib /lib" for LDDIR in ${DIR_LIST} do [ -f ${LDDIR}/${LIBGCC_NAME} ] && install -v -m644 ${LDDIR}/${LIBGCC_NAME} ${SRC_ROOT}/solver/${BUILD_NUMBER}/${OOOUTPATH}.pro/lib @@ -464,14 +478,13 @@ # configure # ================================================== -( - PrintMessage "Running configure script." - cd ${SRC_ROOT}/config_office - ./configure ${CONFIG_FLAGS} || { +PrintMessage "Running configure script." +cd ${SRC_ROOT}/config_office +./configure ${CONFIG_FLAGS} || { PrintMessage "Configure failed. Fix it!" exit - } -) +} +cd ${SRC_ROOT} # ================================================== --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
