User: curvirgo
Date: 06/05/04 21:12:11

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

Log:
 add compress rate

File Changes:

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

File [changed]: jabuild
Url: 
http://ja.openoffice.org/source/browse/ja/www/documents/develop/jabuild?r1=1.8&r2=1.9
Delta lines:  +359 -185
-----------------------
--- jabuild     2 May 2006 06:45:56 -0000       1.8
+++ jabuild     5 May 2006 04:12:08 -0000       1.9
@@ -6,27 +6,12 @@
 # jabuild.functionおよびカスタマイズ設定値のロード
 # ==================================================
 if [ -f `dirname $0`/jabuild.function ]; then
-  . `dirname $0`/jabuild.function
+  source `dirname $0`/jabuild.function
 else
   echo "jabuild.function not found !!"
   exit
 fi
-[ -f ./ooobuild.conf ] && . ./ooobuild.conf
-
-# ==================================================
-# コマンドパラメータの処理
-# ==================================================
-ParameterProcessing $@
-
-# ==================================================
-# DEBUGMODEの設定
-# ==================================================
-[ x${DEBUGMODE} = xYes ] && set -x
-
-# ==================================================
-# CVSリポジトリからソースファイルをダウンロード
-# ==================================================
-[ x${DOWNLOAD_SOURCE} = xYes ] && DownloadSourceFile ${TAG}
+[ -f ./ooobuild.conf ] && source ./ooobuild.conf
 
 # ==================================================
 # デフォルトのビルド環境設定
@@ -82,6 +67,8 @@
 MERGE_LOCALIZE_DATA=${MERGE_LOCALIZE_DATA:-Yes}
 REPLACE_SPLASH=${REPLACE_SPLASH:-No}
 REPLACE_VENDOR_NAME=${REPLACE_VENDOR_NAME:-Yes}
+CHANGE_COMPRESS_RATE=${CHANGE_COMPRESS_RATE:-Yes}
+COMPRESS_RATE=${COMPRESS_RATE:-9}
 
 RPM_DIR=${RPM_DIR:-RPMS}
 DEB_DIR=${DEB_DIR:-DEBS}
@@ -91,9 +78,100 @@
 export JAVA_HOME ANT_HOME
 
 # ==================================================
+# コマンドパラメータの処理
+# ==================================================
+for opt in $@
+do
+  case ${opt} in
+    --debug)
+      DEBUGMODE=Yes
+      ;;
+    --devel)
+      DEVELMODE=Yes
+      ;;
+    --download=*)
+      TAG=`echo ${opt} | sed 's/--download=//'`
+      if [ x${TAG} = x ]; then
+        PrintMessage "CVS TAG is not specified !!"
+        exit
+      else
+        DOWNLOAD_SOURCE=Yes
+      fi
+      ;;
+    --from=*)
+      RESTART_PROJECT=`echo ${opt} | sed 's/--from=//'`
+      [ x${RESTART_PROJECT} = x ] && {
+        PrintMessage "Project is not specified !!"
+        exit
+      }
+      RESTART_BUILD=Yes
+      ;;
+    --html)
+      WITH_HTML=Yes
+      ;;
+    --pack)
+      PACKMODE=Yes
+      ;;
+    --safe)
+      SAFEMODE=Yes
+      ;;
+    --help|*)
+      cat << EOF
+Usage: jabuild [OPTION]
+
+OPTION:
+        --debug                            Debug mode
+        --devel                            Development build
+        --download=[CVS TAG]               Download from CVS Repository and 
Build
+        --from=[Project]                   Restart from specified project 
(Serial-Build only)
+        --help                             Print this help
+        --html                             Output build processing html file 
(Invalid when a safe mode.)
+        --pack                             Packaging only
+        --safe                             Use safety build command
+EOF
+      exit
+      ;;
+  esac
+done
+
+# ==================================================
+# DEBUGMODEの設定
+# ==================================================
+[ x${DEBUGMODE} = xYes ] && set -x
+
+# ==================================================
+# CVSリポジトリからソースファイルをダウンロードする
+# ==================================================
+if [ x${DOWNLOAD_SOURCE} = xYes ]; then
+  CVSROOT=:pserver:[EMAIL PROTECTED]:/cvs
+  if [ x`basename ${PWD}` != x${TAG} ]; then
+    CreateDirectory ${TAG} "Create CVS-TAG Directory : Name is < ${TAG} >"
+    cd ${TAG}
+  fi
+  PrintMessage "Download Source File from anoncvs Repository"
+  cvs checkout -r ${TAG} OpenOffice
+  if [ $? = 0 ]; then
+    SRC_ROOT=`pwd`
+  else
+    PrintMessage "source file (TAG=${TAG}) : Download (from CVS Repository) 
failed !!"
+    exit
+  fi
+fi
+
+# ==================================================
 # ビルドプラットホームの検出
 # ==================================================
-OOO_BUILD_SYSTEM=`GetPlatform`
+OOO_BUILD_SYSTEM=NotSupported
+[ `uname -s` = Linux ] && OOO_BUILD_SYSTEM=LinuxIntel
+[ `uname -s` = SunOS ] && OOO_BUILD_SYSTEM=SolarisSparc
+[ `uname -s` = SunOS -a `uname -m` = i86pc ] && OOO_BUILD_SYSTEM=SolarisIntel
+[ `uname -s` = SunOS -a "${COM}" = "GCC" ] && OOO_BUILD_SYSTEM=SolarisSparcGcc
+[ `uname -s` = SunOS -a `uname -m` = i86pc -a "${COM}" = "GCC" ] && 
OOO_BUILD_SYSTEM=SolarisIntelGcc
+[ `uname -s | grep CYGWIN` ] && OOO_BUILD_SYSTEM=Win32Intel
+[ `uname -s` = Linux -a `uname -m` = ppc ] && OOO_BUILD_SYSTEM=LinuxPPC
+[ `uname -s` = Linux -a `uname -m` = x86_64 ] && OOO_BUILD_SYSTEM=LinuxAMD
+PrintMessage "Building platform : ${OOO_BUILD_SYSTEM}"
+[ x${OOO_BUILD_SYSTEM} = xNotSupported  ] && exit
 
 # ==================================================
 # ビルドプラットホーム別の設定
@@ -107,7 +185,10 @@
       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 
--without-system-stdlibs"
-    DEFAULT_PACKAGE=`GetDefaultPackage`
+    DEFAULT_PACKAGE=portable
+    [ -f /etc/vine-release ] && DEFAULT_PACKAGE=rpm
+    [ -f /etc/redhat-release ] && DEFAULT_PACKAGE=rpm
+    [ -f /etc/debian-version ] && DEFAULT_PACKAGE=deb
     CONFIG_FLAGS="${CONFIG_FLAGS} --with-package-format=${DEFAULT_PACKAGE}"
     ;;
   LinuxPPC)
@@ -159,28 +240,23 @@
     else
       CONFIG_FLAGS="${CONFIG_FLAGS} -disable-directx"
     fi
+# ==================================================
+# Windows 
Platformでのpath長の制限によるエラーを回避するための措置
+# (Lines in ddf files must not contain more than 256 characters!)
+# ==================================================
+    TMP=/tmp
+    TEMP=/tmp
+    export TMP TEMP
     ;;
   *)
     PrintMessage "Operating system/CPU not supported yet."
     exit
     ;;
 esac
-PrintMessage "Building platform : ${OOO_BUILD_SYSTEM}"
-
 [ -d ${JAVA_HOME} ] &&  CONFIG_FLAGS="${CONFIG_FLAGS} 
--with-jdk-home=${JAVA_HOME}"
 [ -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
-}
-
 # =================================================
 # 一時ディレクトリの作成
 # =================================================
@@ -191,101 +267,103 @@
 # =================================================
 CreateDirectory ${PKGOUTDIR} "Creating Package Out directory"
 
-[ x${PACKMODE} = xYes ] || {
-
+#-----------------------------------------------------------------------------------------------------------------------------
+if [ x${PACKMODE} != xYes ]; then
 # =================================================
 # GPCのダウンロードと展開
 # =================================================
-  [ -f ${SRC_ROOT}/external/gpc/gpc.c -a -f ${SRC_ROOT}/external/gpc/gpc.h ] 
|| {
+if [ -f ${SRC_ROOT}/external/gpc/gpc.c -a -f ${SRC_ROOT}/external/gpc/gpc.h ]; 
then :
+else
     PrintMessage "Download, unpack and copying GPC"
     DownloadFile ${GPC_LOCATE} ${GPC_ARCHIVE}
     unzip -o -d ${TEMP_DIR} ${TEMP_DIR}/${GPC_ARCHIVE}
     mv ${TEMP_DIR}/gpc231/* ${SRC_ROOT}/external/gpc/
     rmdir ${TEMP_DIR}/gpc231
-  }
+fi
 
 # =================================================
 # 
Mozillaソースなどのダウンロードと所定位置へのコピー、およびCONFIG_FLAGSの設定
 # =================================================
-  if [ x${ENABLE_MOZILLA} = xYes ]; then
+if [ x${ENABLE_MOZILLA} = xYes ]; then
     PrintMessage "Download mozilla source file"
     DownloadFile ${MOZILLA_SOURCE_LOCATE} ${MOZILLA_SOURCE_ARCHIVE}
     ${GNUCP} -v ${TEMP_DIR}/${MOZILLA_SOURCE_ARCHIVE} ${SRC_ROOT}/moz/download
-    [ x${OOO_BUILD_SYSTEM} = xWin32Intel ] && {
+  if [ x${OOO_BUILD_SYSTEM} = xWin32Intel ]; then
       DownloadFile ${MOZ_LIBS_LOCATE} ${MOZ_GLIB_ARCHIVE}
       DownloadFile ${MOZ_LIBS_LOCATE} ${MOZ_LIBIDL_ARCHIVE}
       DownloadFile ${MOZ_WINTOOLS_LOCATE} ${MOZ_WINTOOLS_ARCHIVE}
       ${GNUCP} -v ${TEMP_DIR}/${MOZ_GLIB_ARCHIVE} ${SRC_ROOT}/moz/download
       ${GNUCP} -v ${TEMP_DIR}/${MOZ_LIBIDL_ARCHIVE} ${SRC_ROOT}/moz/download
       ${GNUCP} -v ${TEMP_DIR}/${MOZ_WINTOOLS_ARCHIVE} ${SRC_ROOT}/moz/download
-    }
+  fi
     CONFIG_FLAGS="${CONFIG_FLAGS} --enable-mozilla --enable-build-mozilla  
--with-mozilla-version=${MOZILLA_VERSION}"
-  else
+else
     CONFIG_FLAGS="${CONFIG_FLAGS} --disable-mozilla"
-  fi
+fi
 
 # =================================================
 # 
Windows上での実行時に必要となるDLLの所定位置へのコピー(Visual
 
C++インストール先がコマンドサーチパスに登録されている必要有り)
 # =================================================
-  [ x${OOO_BUILD_SYSTEM} = xWin32Intel ] && {
+if [ x${OOO_BUILD_SYSTEM} = xWin32Intel ]; then
     PrintMessage "Copying required Dynamic link libralies"  CreatePackage 
InstallSet
-
     [ 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
-  }
+fi
 
 # ==================================================
 # 
各国語用Wordbookが存在しない場合に、代替として英語用ファイルを各国語用のディレクトリにコピーする
 # For the detail, see issue #10718
 # ==================================================
-  PrintMessage "Fixed Japanese original issues"
-  cd ${SRC_ROOT}/extras/source/wordbook/lang &> /dev/null && {
+PrintMessage "Fixed Japanese original issues"
+cd ${SRC_ROOT}/extras/source/wordbook/lang &> /dev/null
+if [ $? = 0 ]; then
     for LNG in ${LANGUAGES}
     do
-      [ -d ${LNG} ] || {
+    if [ -d ${LNG} ]; then
         mkdir -p ${LNG}
         ${GNUCP} -fv en-US/soffice.dic ${LNG}
-      }
+    fi
     done
     cd ${SRC_ROOT}
-  }
+fi
 
 # ==================================================
 # [EMAIL PROTECTED]
 # ==================================================
-  [ x${REPLACE_VENDOR_NAME} = xYes ] && {
+if [ x${REPLACE_VENDOR_NAME} = xYes ]; then
     PrintMessage "Replace Vendor name"
-    cd svx/source/intro &> /dev/null && {
-      [ -e makefile.mk.original ] || {
+  cd svx/source/intro &> /dev/null
+  if [ $? = 0 ]; then
+    if [ ! -e makefile.mk.original ]; then
         ${GNUCP} makefile.mk makefile.mk.original
         PrintMessage "Replace VendorName : [EMAIL PROTECTED] -> 
${BUILDER_NAME}"
         cat makefile.mk.original | eval sed 
's/\$\(USER\)\$\(USERNAME\)/${BUILDER_NAME}/' > makefile.mk
-      }
+    fi
       cd ${SRC_ROOT}
-    }
-  }
+  fi
+fi
 
 # ==================================================
 # スプラッシュイメージの置換
 # ==================================================
-  [ x${REPLACE_SPLASH} = xYes ] && {
+if [ x${REPLACE_SPLASH} = xYes ]; then
     PrintMessage "Replace splash images"
     ${GNUCP} -fv ${TEMP_DIR}/bmp/*.bmp ${SRC_ROOT}/svx/res
     ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/svx/res
     ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/svx/source/intro
     ${GNUCP} -fv ${TEMP_DIR}/bmp/openintro.bmp ${SRC_ROOT}/svx/res/ooointro.bmp
     ${GNUCP} -fv ${TEMP_DIR}/bmp/*.png ${SRC_ROOT}/default_images/svx/res
-  }
+fi
 
 # ==================================================
 # CCACHEを使用してビルドするように環境変数へ設定
 # ==================================================
-  [ x${OOO_BUILD_SYSTEM} != xWin32Intel ] && {
-    [ x`which ccache` = x ] || {
+if [ x${OOO_BUILD_SYSTEM} != xWin32Intel ]; then
+  if [ x`which ccache` != x ]; then
       PrintMessage "Enable gcc over CCACHE"
       if [ ${OOO_BUILD_SYSTEM} = SolarisSparc -o ${OOO_BUILD_SYSTEM} = 
SolarisIntel ]; then
         export CC="ccache cc"
@@ -294,15 +372,15 @@
         export CC="ccache gcc"
         export CXX="ccache g++"
       fi
-    }
-  }
+  fi
+fi
 
 # ==================================================
 # 
すでにpatchファイルが適用済みか確認し、未適用の場合はApplyPatchファンクションをコールする
 # 
また、patch適用したファイルのみ後から削除できるように削除用のスクリプトファイルを作成する
 # ==================================================
-  [ x${ORIGINALPATCH} = xYes ] && {
-    [ -e ${SRC_ROOT}/patch.log ] || {
+if [ x${ORIGINALPATCH} = xYes ]; then
+  if [ ! -e ${SRC_ROOT}/patch.log ]; then
       REMOVE_SCRIPT=remove_patched_file.sh
       DOWNLOAD_SCRIPT=patchedfile_redownload.sh
       PrintMessage "Patching original patches"
@@ -320,43 +398,74 @@
 EOF
       grep -i "patching file" ${SRC_ROOT}/patch.log | sed -e 's/patching file 
/cvs update -r \${1} /' >> ${SRC_ROOT}/${DOWNLOAD_SCRIPT}
       chmod 755 ${SRC_ROOT}/${DOWNLOAD_SCRIPT}
-    }
-  }
+  fi
+fi
 
 # ==================================================
-# configure
+# confiugreスクリプトを実行する
 # ==================================================
-  Configure "${CONFIG_FLAGS}"
+PrintMessage "Running configure script."
+cd ${SRC_ROOT}/config_office &> /dev/null
+if [ $? = 0 ]; then
+  eval ./configure ${CONFIG_FLAGS}
+  if [ $? = 0 ]; then
+    cd ${SRC_ROOT}
+  else
+    PrintMessage "Configure failed. Fix it!"
+    exit
+  fi
+else
+  PrintMessage "config_office directory is not found !! Retry sourcefile 
download."
+  exit
+fi
 
 # ==================================================
 # 分散ビルドツールdmakeのビルド
 # ==================================================
-  [ x${RESTART_BUILD} = xYes ] || {
+if [ x${RESTART_BUILD} != xYes ]; then
     if [ -f ./bootstrap ]; then
       PrintMessage "Bootstrapping."
-      ./bootstrap || {
+    ./bootstrap
+    if [ $? != 0 ]; then
         PrintMessage "Bootstrap failed. Fix it!"
         exit
-      }
+    fi
     else
       PrintMessage "Configure failed. Fix it!"
       exit
     fi
-  }
-}
+fi
+fi
+#-----------------------------------------------------------------------------------------------------------------------------
 
 # ==================================================
-# ビルド環境設定スクリプトのロード
+# 圧縮率の変更
 # ==================================================
-LoadBuildEnvironment
+if [ x${CHANGE_COMPRESS_RATE} = xYes ]; then
+  cd ${SRC_ROOT}/instsetoo_native/util
+  if [ ! -f openoffice.lst.orig ]; then
+    PrintMessage "Compression rate setting..."
+    mv -v openoffice.lst openoffice.lst.orig
+    cat openoffice.lst.orig | eval sed 's/compression.*/compression\ 
${COMPRESS_RATE}/g' > openoffice.lst
+  fi
+  cd ${SRC_ROOT}
+fi
 
-[ x${PACKMODE} = xYes ] || {
-  [ x${RESTART_BUILD} = xYes ] || {
+# ==================================================
+# ビルド環境設定スクリプトのロード
+# ==================================================
+if [ x${OOO_BUILD_SYSTEM} = xWin32Intel ]; then
+  source ./winenv.set.sh
+else
+  source ./${OOO_BUILD_SYSTEM}Env.Set.sh
+fi
 
+#-----------------------------------------------------------------------------------------------------------------------------
+if [ x${PACKMODE} != xYes ]; then
 # ==================================================
 # 
ローカライズデータ用ツールのビルドとオリジナルローカライズデータの登録
 # ==================================================
-    [ x${MERGE_LOCALIZE_DATA} = xYes ] && {
+if [ x${RESTART_BUILD} != xYes  -a x${MERGE_LOCALIZE_DATA} = xYes ]; then
       PrintMessage "Prepare localize tools."
       BuildProject transex3 "--all ${BUILD_OPTION}"
       PrintMessage "Merging localize data."
@@ -367,63 +476,128 @@
           localize -m -x -l ${LNG} -f ${GSI}
         done
       done
-    }
-  }
+fi
 
 # ==================================================
 # ビルドプロセスの開始
 # ==================================================
-  BLD_OPTION="--all product=full"
-  MESSAGE="Serial Building ..."
-  PrintMessage "Start build process."
-  if [ x${SAFEMODE} = xYes ]; then
+BLD_OPTION="--all product=full"
+MESSAGE="Serial Building ..."
+PrintMessage "Start build process."
+if [ x${SAFEMODE} = xYes ]; then
     PrintMessage "${MESSAGE}"
-    dmake ${BUILD_OPTION} || {
+  dmake ${BUILD_OPTION}
+  if [ $? != 0 ]; then
       PrintMessage "Build failed. Fix it!"
       exit
-    }
-  else
-    [ x${OOO_BUILD_SYSTEM} = xWin32Intel ] || {
-        ParallelSetting
-        [ $? = 0 ] && MESSAGE="Parallel Building ..."
-    }
-    PrintMessage "${MESSAGE}"
-    if [ x`echo ${MESSAGE} | awk '{print $1}'` = xParallel ]; then
+  fi
+else
+  if [ x${OOO_BUILD_SYSTEM} != xWin32Intel -a x${PARALLEL_BUILD} = xYes ]; then
+    # ==================================================
+    # 
Parallelビルドであれば環境変数BLD_OPTIONにParallelビルドのオプションを追加、環境変数MAXPROCESS=1を設定する
+    # ==================================================
+    export MAXPROCESS=1
+    BLD_OPTION="${BLD_OPTION} -P${MAX_JOBS}"
+    MESSAGE="Parallel Building ..."
       [ x${WITH_HTML} = xYes ] && BLD_OPTION="${BLD_OPTION} --html"
     else
       [ x${RESTART_BUILD} = xYes ] && BLD_OPTION="${BLD_OPTION} --from 
${RESTART_PROJECT}"
     fi
+  PrintMessage "${MESSAGE}"
     BuildProject instsetoo_native/util "${BLD_OPTION} ${BUILD_OPTION}"
-  fi
-}
+fi
+fi
+#-----------------------------------------------------------------------------------------------------------------------------
 
 # ==================================================
 # SDK パッケージの作成
 # ==================================================
-[ x${CREATE_SDK} = xYes ] && {
-  for LANG in ${LANGUAGES}
-  do
-    PackageSDK ${LANG}
-  done
-}
+if [ x${CREATE_SDK} = xYes ]; then
+  PACKAGE_NAME="OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_${BUILDER_NAME}"
+  PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_SDK"
+  PrintMessage "Packaging SDK"
+  case ${OOO_BUILD_SYSTEM} in
+    LinuxIntel)
+      PACKAGE_DIR="${PACKAGE_DIR}/rpm/install/en-US"
+      ;;
+    Win32Intel)
+      PACKAGE_DIR="${PACKAGE_DIR}/msi/install/en-US"
+      cd ${PACKAGE_DIR}_download &> /dev/null
+      if [ $? = 0 ]; then
+        ${GNUCP} -vp *.exe ${PKGOUTDIR}/${PACKAGE_NAME}.exe
+        cd ${SRC_ROOT}
+      fi
+      ;;
+    *)
+      PACKAGE_DIR="${PACKAGE_DIR}/*/install/en-US"
+      ;;
+  esac
+  Package SDK
+fi
 
 # ==================================================
 # SOLVER パッケージの作成
 # ==================================================
-[ x${CREATE_SOLVER} = xYes ] && PackageSolver
+if [ x${CREATE_SOLVER} = xYes ]; then
+  PrintMessage "Packaging SOLVER"
+  case ${OOO_BUILD_SYSTEM} in
+    LinuxIntel)
+      tar cvf - solver | bzip2 -${COMPRESS_RATE} - > 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.tar.bz2
+      ;;
+    Win32Intel)
+      zip -r -${COMPRESS_RATE} 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.zip 
solver
+      ;;
+   *)
+      tar cvf - solver | gzip -${COMPRESS_RATE} - > 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.tar.gz
+      ;;
+  esac
+fi
 
 # ==================================================
-# UnoRuntime Environment パッケージの作成
+# Uno Runtime Environment パッケージの作成
 # ==================================================
-[ x${CREATE_URE_PACKAGE} = xYes ] && PackageURE
+if [ x${CREATE_URE_PACKAGE} = xYes ]; then
+  URE_LINE=`grep -n "^URE" ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | 
awk -F: '{print $1}'`
+  URE_VERSION=`tail +${URE_LINE} 
${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep -i 'package.*sion' | tr 
'\n' ' ' | awk '{print $2"-"$4}'`
+  PACKAGE_NAME="URE_${URE_VERSION}_${OOO_BUILD_SYSTEM}_install_${BUILDER_NAME}"
+  PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/"
+  PrintMessage "Copy to PKGOUTDIR Pack UnoRuntime Environment"
+  case ${OOO_BUILD_SYSTEM} in
+    LinuxIntel)
+      PACKAGE_DIR="${PACKAGE_DIR}/rpm/install/en-US"
+      ;;
+    Win32Intel)
+      PACKAGE_DIR="${PACKAGE_DIR}/msi/install/en-US"
+      cd ${PACKAGE_DIR}_download &> /dev/null
+      if [ $? = 0 ]; then
+        ${GNUCP} -vp *_en-US.exe ${PKGOUTDIR}/${PACKAGE_NAME}.exe
+        cd ${SRC_ROOT}
+      fi
+      ;;
+    *)
+      PACKAGE_DIR="${PACKAGE_DIR}/*/install/en-US"
+      ;;
+  esac
+  Package URE
+fi
 
 # ==================================================
 # インストールセットの作成
+# LinuxIntel : 
複数のパッケージを作成する場合は、それぞれのパッケージにあわせたDesktopIntegrationが作成される場合がある為、前もって一度再構築し直しておく
 # ==================================================
 if [ x${OOO_BUILD_SYSTEM} = xLinuxIntel ]; then
   for PKG in ${PACKAGE_FORMAT}
   do
-    RebuildDesktopIntegration ${PKG}
+    PrintMessage "Rebuild DesktopIntegration [Format : ${PKG}]"
+    cd ${SRC_ROOT}/sysui
+    PKGFORMAT=${PKG} build.pl
+    if [ $? != 0 ]; then
+      PrintMessage "Can't build ${PROJECT}, fix the bug above."
+      exit
+    else
+      deliver.pl
+      cd ${SRC_ROOT}
+    fi
     CreatePackage InstallSet ${PKG}
     [ x${CREATE_LANGUAGEPACK} = xYes ] && CreatePackage LanguagePack ${PKG}
   done
@@ -435,7 +609,7 @@
 # ==================================================
 # インストールセットの分割 (SourceForge.jpアップロード用)
 # ==================================================
-[ x${OOO_BUILD_SYSTEM} = xLinuxIntel -a x${DIVIDE_PACKAGE} = xYes ] && {
+if [ x${OOO_BUILD_SYSTEM} = xLinuxIntel -a x${DIVIDE_PACKAGE} = xYes ]; then
   for LANG in ${LANGUAGES}
   do
     for PACKAGE in ${PACKAGE_FORMAT}
@@ -443,4 +617,4 @@
       DividePackage ${LANG} ${PACKAGE}
     done
   done
-}
+fi




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

メールによる返信