[ja-cvs] CVS update: /ja/www/documents/develop/

[curvirgo]

User: curvirgo
Date: 05/12/18 06:28:46

Modified:
 /ja/www/documents/develop/
  jabuild

Log:
 The from option is added.

File Changes:

Directory: /ja/www/documents/develop/
=====================================

File [changed]: jabuild
Url: 
http://ja.openoffice.org/source/browse/ja/www/documents/develop/jabuild?r1=1.5&r2=1.6
Delta lines:  +21 -48
---------------------
--- jabuild     17 Dec 2005 18:19:20 -0000      1.5
+++ jabuild     18 Dec 2005 14:28:41 -0000      1.6
@@ -42,7 +42,7 @@
 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_09}
+JAVA_HOME=${JAVA_HOME:-/usr/java/j2sdk1.4.2_10}
 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}
@@ -313,7 +313,6 @@
 # configure
 # ==================================================
   Configure "${CONFIG_FLAGS}"
-
 }
 
 # ==================================================
@@ -322,6 +321,7 @@
 LoadBuildEnvironment
 
 [ x${PACKMODE} = xYes ] || {
+  [ x${RESTART_BUILD} = xYes ] || {
 
 # ==================================================
 # 分散ビルドツールdmakeのビルド
@@ -352,34 +352,6 @@
       done
     done
   }
-
-# ==================================================
-# LinuxIntel : 
複数のパッケージを作成する場合に、デフォルト以外のメニュー登録用パッケージは作成されない為、それ以外のメニュー登録用パッケージを前もって作成する
-# ==================================================
-  [ x${OOO_BUILD_SYSTEM} = xLinuxIntel ] && {
-    MENU_CONFIG="${CONFIG_FLAGS}"
-    PrintMessage "Prepare menus package."
-    for PKG in ${PACKAGE_FORMAT}
-    do
-      case ${PKG} in
-        ${DEFAULT_PACKAGE})
-          ;;
-        portable)
-          ;;
-        slackware)
-          ;;
-        *)
-          MENU_CONFIG=`echo "${CONFIG_FLAGS}" | eval sed 
's/--with-package-format=${DEFAULT_PACKAGE}/--with-package-format=${PKG}/'`
-          Configure "${MENU_CONFIG}"
-          LoadBuildEnvironment
-          BuildProject sysui "--all ${BUILD_OPTION}"
-          ;;
-      esac
-    done
-    [ "${CONFIG_FLAGS}" = "${MENU_CONFIG}" ] || {
-      Configure "${CONFIG_FLAGS}"
-      LoadBuildEnvironment
-    }
   }
 
 # ==================================================
@@ -389,6 +361,7 @@
   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




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]