User: curvirgo Date: 06/05/01 23:45:59 Modified: /ja/www/documents/develop/ jabuild
Log: fix windows dev-tools path File Changes: Directory: /ja/www/documents/develop/ ===================================== File [changed]: jabuild Url: http://ja.openoffice.org/source/browse/ja/www/documents/develop/jabuild?r1=1.7&r2=1.8 Delta lines: +52 -36 --------------------- --- jabuild 12 Feb 2006 13:04:56 -0000 1.7 +++ jabuild 2 May 2006 06:45:56 -0000 1.8 @@ -33,7 +33,6 @@ # ================================================== SRC_ROOT=${SRC_ROOT:-`pwd`} BUILDER_NAME=${BUILDER_NAME:-curvirgo} -#VERSION=${VERSION:-`head -n 20 ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep 'PACKAGEVERSION' | awk '{print $2}'`} VERSION=${VERSION:-`head -n 20 ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep 'PACKAGEVERSION' | awk '{print $2}'`-`grep 'LAST_MINOR' ${SRC_ROOT}/solenv/inc/minor.mk | sed 's/LAST_MINOR=//'`} BUILD_NUMBER=${BUILD_NUMBER:-`grep 'RSCVERSION' ${SRC_ROOT}/solenv/inc/minor.mk | sed 's/RSCVERSION=//'`} LANGUAGES=${LANGUAGES:-"en-US ja"} @@ -42,13 +41,13 @@ TEMP_DIR=${TEMP_DIR:-${SRC_ROOT}/temp} PATCH_DIR=${PATCH_DIR:-${SRC_ROOT}/temp/patch/${BUILD_NUMBER}} PKGOUTDIR=${PKGOUTDIR:-${SRC_ROOT}/OOo_Package} -JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_10} +JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_11} 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} -DIRECTX_HOME=${DIRECTX_HOME:-/cygdrive/c/progra~1/micros~1.0sd} -WDEVENV_DIR=${WDEVENV_DIR:-/cygdrive/c/progra~1/conver~1} +VC_DIR=${VC_DIR:-/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003} +CSC_DIR=${CSC_DIR:-/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v1.1.4322} +FRAME_HOME=${FRAME_HOME:-/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/SDK/v1.1} +DIRECTX_HOME=${DIRECTX_HOME:-/cygdrive/c/Program Files/DirectX_SDK} +WDEVENV_DIR=${WDEVENV_DIR:-/cygdrive/c/Program Files/ConvertDSWSetup} GNUCP=${GNUCP:-cp} GNUPATCH=${GNUPATCH:-/usr/bin/patch} @@ -61,7 +60,7 @@ MOZILLA_SOURCE_LOCATE=${MOZILLA_SOURCE_LOCATE:-http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla${MOZILLA_VERSION}/source} MOZ_GLIB_ARCHIVE=${MOZ_GLIB_ARCHIVE:-vc71-glib-1.2.10-bin.zip} MOZ_LIBIDL_ARCHIVE=${MOZ_LIBIDL_ARCHIVE:-vc71-libIDL-0.6.8-bin.zip} -MOZ_LIBS_LOCATE=${MOZ_LIBS_LOCATE:-ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32} +MOZ_LIBS_LOCATE=${MOZ_LIBS_LOCATE:-ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc71} MOZ_WINTOOLS_ARCHIVE=${MOZ_WINTOOLS_ARCHIVE:-wintools.zip} MOZ_WINTOOLS_LOCATE=${MOZ_WINTOOLS_LOCATE:-http://ftp.mozilla.org/pub/mozilla.org/mozilla/source} @@ -86,8 +85,8 @@ RPM_DIR=${RPM_DIR:-RPMS} DEB_DIR=${DEB_DIR:-DEBS} -PORTABLE_DIR=${PORTABLE_DIR:-linux-2.4-intel} -SLACKWARE_DIR=${SLACKWARE_DIR:-linux-2.4-intel} +PORTABLE_DIR=${PORTABLE_DIR:-linux-`uname -r | awk -F. '{print $1"."$2}'`-intel} +SLACKWARE_DIR=${SLACKWARE_DIR:-linux-`uname -r | awk -F. '{print $1"."$2}'`-intel} export JAVA_HOME ANT_HOME @@ -107,7 +106,7 @@ else OOOUTPATH=unxlngi4 # gcc 3.3 fi - CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3 --enable-gtk --enable-kde --enable-cups --enable-fontconfig --enable-libart --enable-openldap --enable-libsn -enable-pam-link --enable-xrender-link" + CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --enable-gcc3 --enable-gtk --enable-kde --enable-cups --enable-fontconfig --enable-libart --enable-openldap --enable-libsn -enable-pam-link --enable-xrender-link --without-system-stdlibs" DEFAULT_PACKAGE=`GetDefaultPackage` CONFIG_FLAGS="${CONFIG_FLAGS} --with-package-format=${DEFAULT_PACKAGE}" ;; @@ -136,6 +135,7 @@ CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} --with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}" ;; Win32Intel) + BUILD_OPTION=`echo ${BUILD_OPTION} | sed -e 's/strip=true//g' -e 's/^ *//' -e 's/ */ /g'` 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 @@ -143,6 +143,13 @@ OOOUTPATH=wntmsci8 # VC 2002 fi CONFIG_FLAGS="${CONFIG_FLAGS} --with-use-shell=tcsh" + VC_DIR=`ConvertShortUnixName ${VC_DIR}` + WDEVENV_DIR=`ConvertShortUnixName ${WDEVENV_DIR}` + FRAME_HOME=`ConvertShortUnixName ${FRAME_HOME}` + CSC_DIR=`ConvertShortUnixName ${CSC_DIR}` + DIRECTX_HOME=`ConvertShortUnixName ${DIRECTX_HOME}` + JAVA_HOME=`ConvertShortUnixName ${JAVA_HOME}` + ANT_HOME=`ConvertShortUnixName ${ANT_HOME}` [ -d ${VC_DIR} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-cl-home=${VC_DIR}" [ -d ${WDEVENV_DIR} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-wdevenv-path=${WDEVENV_DIR}" [ -d ${FRAME_HOME} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-frame-home=${FRAME_HOME}" @@ -164,6 +171,15 @@ [ -d ${ANT_HOME} ] && CONFIG_FLAGS="${CONFIG_FLAGS} --with-ant-home=${ANT_HOME}" [ x${CRASHDUMP} = xYes ] && CONFIG_FLAGS="${CONFIG_FLAGS} --enable-crashdump --enable-symbols=SMALL" +# ================================================== +# Windows Platformã§ã®pathé·ã®å¶éã«ããã¨ã©ã¼ãåé¿ããããã®æªç½® +# (Lines in ddf files must not contain more than 256 characters!) +# ================================================== +[ x${OOO_BUILD_SYSTEM} = xWin32Intel ] && { + TMP=/tmp + TEMP=/tmp + export TMP TEMP +} # ================================================= # ä¸æãã£ã¬ã¯ããªã®ä½æ @@ -212,16 +228,14 @@ # Windowsä¸ã§ã®å®è¡æã«å¿ è¦ã¨ãªãDLLã®æå®ä½ç½®ã¸ã®ã³ãã¼(Visual C++ã¤ã³ã¹ãã¼ã«å ãã³ãã³ããµã¼ããã¹ã«ç»é²ããã¦ããå¿ è¦æã) # ================================================= [ x${OOO_BUILD_SYSTEM} = xWin32Intel ] && { - VCP71DIR=${SRC_ROOT}/external/msvcp71 PrintMessage "Copying required Dynamic link libralies" CreatePackage InstallSet - install -v -m755 ${TEMP_DIR}/unicows/* ${SRC_ROOT}/external/unicows - 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 - CreateDirectory ${VCP71DIR} - install -v -m755 `which msvcp71.dll` ${VCP71DIR} - install -v -m755 `which msvcr71.dll` ${VCP71DIR} + [ x`echo ${TEMP_DIR}/unicows/unicows.* | grep -i dll` = x ] || install -v -m755 ${TEMP_DIR}/unicows/unicows.dll ${SRC_ROOT}/external/unicows + [ x`which dbghelp.dll` = x ] || install -v -m755 `which dbghelp.dll` ${SRC_ROOT}/external/dbghelp + [ x`which msvcp70.dll` = x ] || install -v -m755 `which msvcp70.dll` ${SRC_ROOT}/external/msvcp70 + [ x`which msvcr70.dll` = x ] || install -v -m755 `which msvcr70.dll` ${SRC_ROOT}/external/msvcp70 + [ x`which msvcp71.dll` = x ] || install -v -m755 `which msvcp71.dll` ${SRC_ROOT}/external/msvcp71 + [ x`which msvcr71.dll` = x ] || install -v -m755 `which msvcr71.dll` ${SRC_ROOT}/external/msvcp71 } # ================================================== @@ -362,23 +376,25 @@ BLD_OPTION="--all product=full" MESSAGE="Serial Building ..." PrintMessage "Start build process." - [ x${WITH_HTML} = xYes ] && BLD_OPTION="${BLD_OPTION} --html" - [ x${RESTART_BUILD} = xYes ] && BLD_OPTION="${BLD_OPTION} --from ${RESTART_PROJECT}" - case ${OOO_BUILD_SYSTEM} in - LinuxIntel) - ParallelSetting - [ $? = 0 ] && MESSAGE="Parallel Building ..." - ;; - Win32Intel) - ;; - *) + if [ x${SAFEMODE} = xYes ]; then + PrintMessage "${MESSAGE}" + dmake ${BUILD_OPTION} || { + PrintMessage "Build failed. Fix it!" + exit + } + else + [ x${OOO_BUILD_SYSTEM} = xWin32Intel ] || { ParallelSetting [ $? = 0 ] && MESSAGE="Parallel Building ..." - ;; - esac + } PrintMessage "${MESSAGE}" + if [ x`echo ${MESSAGE} | awk '{print $1}'` = xParallel ]; then + [ x${WITH_HTML} = xYes ] && BLD_OPTION="${BLD_OPTION} --html" + else + [ x${RESTART_BUILD} = xYes ] && BLD_OPTION="${BLD_OPTION} --from ${RESTART_PROJECT}" + fi BuildProject instsetoo_native/util "${BLD_OPTION} ${BUILD_OPTION}" - + fi } # ================================================== --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
