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

[curvirgo]

User: curvirgo
Date: 06/02/12 05:04:58

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

Log:
 add "rebuild desktop-integration"

File Changes:

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

File [changed]: jabuild
Url: 
http://ja.openoffice.org/source/browse/ja/www/documents/develop/jabuild?r1=1.6&r2=1.7
Delta lines:  +13 -10
---------------------
--- jabuild     18 Dec 2005 14:28:41 -0000      1.6
+++ jabuild     12 Feb 2006 13:04:56 -0000      1.7
@@ -103,7 +103,7 @@
   LinuxIntel)
     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
+      OOOUTPATH=unxlngi6      # gcc 3.4 or later
     else
       OOOUTPATH=unxlngi4      # gcc 3.3
     fi
@@ -313,19 +313,11 @@
 # configure
 # ==================================================
   Configure "${CONFIG_FLAGS}"
-}
-
-# ==================================================
-# ビルド環境設定スクリプトのロード
-# ==================================================
-LoadBuildEnvironment
-
-[ x${PACKMODE} = xYes ] || {
-  [ x${RESTART_BUILD} = xYes ] || {
 
 # ==================================================
 # 分散ビルドツールdmakeのビルド
 # ==================================================
+  [ x${RESTART_BUILD} = xYes ] || {
     if [ -f ./bootstrap ]; then
       PrintMessage "Bootstrapping."
       ./bootstrap || {
@@ -336,6 +328,16 @@
       PrintMessage "Configure failed. Fix it!"
       exit
     fi
+  }
+}
+
+# ==================================================
+# ビルド環境設定スクリプトのロード
+# ==================================================
+LoadBuildEnvironment
+
+[ x${PACKMODE} = xYes ] || {
+  [ x${RESTART_BUILD} = xYes ] || {
 
 # ==================================================
 # 
ローカライズデータ用ツールのビルドとオリジナルローカライズデータの登録
@@ -405,6 +407,7 @@
 if [ x${OOO_BUILD_SYSTEM} = xLinuxIntel ]; then
   for PKG in ${PACKAGE_FORMAT}
   do
+    RebuildDesktopIntegration ${PKG}
     CreatePackage InstallSet ${PKG}
     [ x${CREATE_LANGUAGEPACK} = xYes ] && CreatePackage LanguagePack ${PKG}
   done




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