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

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

Log:
 add compress rate

File Changes:

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

File [changed]: jabuild.function
Url: 
http://ja.openoffice.org/source/browse/ja/www/documents/develop/jabuild.function?r1=1.8&r2=1.9
Delta lines:  +69 -321
----------------------
--- jabuild.function    2 May 2006 06:47:17 -0000       1.8
+++ jabuild.function    5 May 2006 04:12:33 -0000       1.9
@@ -2,76 +2,6 @@
 # Useful OpenOffice.org 2.0.x only.
 
 # ==================================================
-# ヘルプを表示する
-# ==================================================
-PrintHelp ()
-{
-  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
-}
-
-# ==================================================
-# コマンドパラメータの処理
-# ==================================================
-ParameterProcessing ()
-{
-  for opt in $@
-  do
-    case ${opt} in
-      --debug)
-        DEBUGMODE=Yes
-        ;;
-      --devel)
-        DEVELMODE=Yes
-        ;;
-      --download=*)
-        TAG=`echo ${opt} | sed 's/--download=//'`
-        [ x${TAG} = x ] && {
-          PrintMessage "CVS TAG is not specified !!"
-          exit
-        }
-        DOWNLOAD_SOURCE=Yes
-        ;;
-      --from=*)
-        RESTART_PROJECT=`echo ${opt} | sed 's/--from=//'`
-        [ x${RESTART_PROJECT} = x ] && {
-          PrintMessage "Project is not specified !!"
-          exit
-        }
-        RESTART_BUILD=Yes
-        ;;
-      --help)
-        PrintHelp
-        ;;
-      --html)
-        WITH_HTML=Yes
-        ;;
-      --pack)
-        PACKMODE=Yes
-        ;;
-      --safe)
-        SAFEMODE=Yes
-        ;;
-      *)
-        PrintHelp
-        ;;
-    esac
-  done
-}
-
-# ==================================================
 # メッセージを表示する
 # ==================================================
 PrintMessage ()
@@ -90,10 +20,10 @@
 {
   local DIR_NAME=${1}
   local MESSAGE=${2}
-  [ -d ${DIR_NAME} ] || {
+  if [ ! -d ${DIR_NAME} ]; then
     [ x"${MESSAGE}" = x ] || PrintMessage "${MESSAGE}"
     mkdir -p -v ${DIR_NAME}
-  }
+  fi
 }
 
 # ==================================================
@@ -103,54 +33,17 @@
 {
   local FILE_LOCATE=${1}
   local FILE_NAME=${2}
-  [ ! -f ${TEMP_DIR}/${FILE_NAME} -o -f ${TEMP_DIR}/${FILE_NAME}.chk ] && {
+  if [ ! -f ${TEMP_DIR}/${FILE_NAME} -o -f ${TEMP_DIR}/${FILE_NAME}.chk ]; then
     cd ${TEMP_DIR}
     touch ${TEMP_DIR}/${FILE_NAME}.chk
     wget -c ${FILE_LOCATE}/${FILE_NAME} -O ${TEMP_DIR}/${FILE_NAME} && rm -f 
${TEMP_DIR}/${FILE_NAME}.chk
-    [ $? = 0 ] || {
-      PrintMessage "${FILE_NAME} : Download failed !!"
-      exit
-    }
-    cd ${SRC_ROOT}
-  }
-}
-
-# ==================================================
-# CVSリポジトリからソースファイルをダウンロードする
-# ==================================================
-DownloadSourceFile ()
-{
-  local TAG=${1}
-  local CVSROOT=:pserver:[EMAIL PROTECTED]:/cvs
-  [ x`basename ${PWD}` = x${TAG} ] || {
-    CreateDirectory ${TAG} "Create CVS-TAG Directory : Name is < ${TAG} >"
-    cd ${TAG}
-  }
-  PrintMessage "Download Source File from anoncvs Repository"
-  cvs checkout -r ${TAG} OpenOffice
   if [ $? = 0 ]; then
-    SRC_ROOT=`pwd`
+      cd ${SRC_ROOT}
   else
-    PrintMessage "source file (TAG=${TAG}) : Download (from CVS Repository) 
failed !!"
+      PrintMessage "${FILE_NAME} : Download failed !!"
     exit
   fi
-}
-
-# ==================================================
-# ビルドするプラットホームのチェックを行い表示する
-# ==================================================
-GetPlatform ()
-{
-  local PLATFORM=NotSupported
-  [ `uname -s` = Linux ] && PLATFORM=LinuxIntel
-  [ `uname -s` = SunOS ] && PLATFORM=SolarisSparc
-  [ `uname -s` = SunOS -a `uname -m` = i86pc ] && PLATFORM=SolarisIntel
-  [ `uname -s` = SunOS -a "${COM}" = "GCC" ] && PLATFORM=SolarisSparcGcc
-  [ `uname -s` = SunOS -a `uname -m` = i86pc -a "${COM}" = "GCC" ] && 
PLATFORM=SolarisIntelGcc
-  [ `uname -s | grep CYGWIN` ] && PLATFORM=Win32Intel
-  [ `uname -s` = Linux -a `uname -m` = ppc ] && PLATFORM=LinuxPPC
-  [ `uname -s` = Linux -a `uname -m` = x86_64 ] && PLATFORM=LinuxAMD
-  echo ${PLATFORM}
+  fi
 }
 
 # ==================================================
@@ -169,18 +62,6 @@
 }
 
 # ==================================================
-# 
Linuxのディストリビューションを確認しデフォルトパッケージ名を表示する
-# ==================================================
-GetDefaultPackage ()
-{
-  local PACKAGE_FORMAT=portable
-  [ -f /etc/vine-release ] && PACKAGE_FORMAT=rpm
-  [ -f /etc/redhat-release ] && PACKAGE_FORMATE=rpm
-  [ -f /etc/debian-version ] && PACKAGE_FORMAT=deb
-  echo ${PACKAGE_FORMAT}
-}
-
-# ==================================================
 # patchファイルを探し出し適用する
 # ==================================================
 ApplyPatch ()
@@ -194,38 +75,6 @@
 }
 
 # ==================================================
-# confiugreスクリプトを実行する
-# ==================================================
-Configure ()
-{
-  local CONFIG_FLAGS=${1}
-  PrintMessage "Running configure script."
-  cd ${SRC_ROOT}/config_office &> /dev/null
-  if [ $? = 0 ]; then
-    eval ./configure ${CONFIG_FLAGS} || {
-      PrintMessage "Configure failed. Fix it!"
-      exit
-    }
-    cd ${SRC_ROOT}
-  else
-    PrintMessage "config_office directory is not found !! Retry sourcefile 
download."
-    exit
-  fi
-}
-
-# ==================================================
-# ビルド用環境変数を設定する
-# ==================================================
-LoadBuildEnvironment ()
-{
-  if [ x${OOO_BUILD_SYSTEM} = xWin32Intel ]; then
-    source ./winenv.set.sh
-  else
-    source ./${OOO_BUILD_SYSTEM}Env.Set.sh
-  fi
-}
-
-# ==================================================
 # 指定されたプロジェクトをビルドする
 # ==================================================
 BuildProject ()
@@ -233,26 +82,14 @@
   local PROJECT=${1}
   local OPTION=${2}
   cd ${SRC_ROOT}/${PROJECT}
-  build.pl ${OPTION} || {
-    PrintMessage "Can't build ${PROJECT}, fix the bug above."
-    exit
-  }
+  build.pl ${OPTION}
+  if [ $? = 0 ] ; then
   [ x`echo ${PROJECT} | grep -i instsetoo` = x ] && deliver.pl
   cd ${SRC_ROOT}
-}
-
-# ==================================================
-# 
Parallelビルドであれば呼び出し元の環境変数BLD_OPTIONにParallelビルドのオプションを追加、環境変数MAXPROCESS=1を設定する
-# Parallelビルドであれば0、Serialビルドであれば1を返す
-# ==================================================
-ParallelSetting ()
-{
-  [ x${PARALLEL_BUILD} = xYes ] && {
-    export MAXPROCESS=1
-    BLD_OPTION="${BLD_OPTION} -P${MAX_JOBS}"
-    return 0
-  }
-  return 1
+  else
+    PrintMessage "Can't build ${PROJECT}, fix the bug above."
+    exit
+  fi
 }
 
 # ==================================================
@@ -265,10 +102,10 @@
   cd ${RPM_DIR} &> /dev/null && {
     case ${PACKAGE_TYPE} in
       InstallSet)
-        [ x`echo ./desktop-integration/*.deb | sed '/\*/d'` = x ] || {
+        if [ x`echo ./desktop-integration/*.deb | sed '/\*/d'` != x ]; then
           PrintMessage "Delete deb_package desktop-integration file"
           rm -fv ./desktop-integration/*.deb
-        }
+        fi
         ;;
       LanguagePack)
         rm -f *.sh
@@ -292,11 +129,11 @@
 {
   local PACKAGE_TYPE=${1}
   cd ${PORTABLE_DIR} &> /dev/null && {
-    [ x${PACKAGE_TYPE} = xInstallSet ] && {
+    if [ x${PACKAGE_TYPE} = xInstallSet ]; then
       PrintMessage "Dependency-Check fixed ..."
       cat openoffice.org-core01.install | sed '/^#%requires/,/^fi/d' > 
openoffice.org-core01.install.fixed
       mv -fv $openoffice.org-core01.install.fixed openoffice.org-core01.install
-    }
+    fi
     rm -fv *.tar.gz
     cd ..
   }
@@ -316,13 +153,13 @@
       PrintMessage "Replace Packager Name : [EMAIL PROTECTED] -> 
${BUILDER_NAME}"
       cat ${BASENAME}/install/slack-desc | eval sed 's/[EMAIL 
PROTECTED]/${BUILDER_NAME}/' > slack-desc.${EXTENSION}
       mv -fv slack-desc.${EXTENSION} ${BASENAME}/install/slack-desc
-      cd ${BASENAME} && {
-        local COMPRESSION=`cat 
${SRC_ROOT}/instsetoo_native/util/openoffice.lst | sed '/^OpenOffice$/,/^}$/!d' 
| grep -i compression | awk '{print $2}'`
+      cd ${BASENAME} &> /dev/null
+      if [ $? = 0 ]; then
         PrintMessage "Repacking installation set [ File : ${file}]"
-        tar cvf - ./* | gzip -${COMPRESSION} - > ../${file}
+        tar cvf - ./* | gzip -${COMPRESS_RATE} - > ../${file}
         cd ..
         rm -fr ${BASENAME}
-      }
+      fi
     done
     cd ..
   }
@@ -334,16 +171,16 @@
 RebuildPackage ()
 {
   local PACKAGE_TYPE=${1}
-  local PACKAGE_FORMAT=${2}
+  local PKG=${2}
   case ${PACKAGE_TYPE} in
     openoffice)
-      PrintMessage "Create package. [Type : InstallSet] [Format : 
${PACKAGE_FORMAT}]"
+      PrintMessage "Create package. [Type : InstallSet] [Format : ${PKG}]"
       ;;
     openofficedev)
-      PrintMessage "Create package. [Type : InstallSet (for Development)] 
[Format : ${PACKAGE_FORMAT}]"
+      PrintMessage "Create package. [Type : InstallSet (for Development)] 
[Format : ${PKG}]"
       ;;
     ooolanguagepack)
-      PrintMessage "Create package. [Type : LanguagePack] [Format : 
${PACKAGE_FORMAT}]"
+      PrintMessage "Create package. [Type : LanguagePack] [Format : ${PKG}]"
       ;;
     *)
       PrintMessage "Unknown package type !!"
@@ -352,10 +189,10 @@
   esac
   cd ${SRC_ROOT}/instsetoo_native/util &> /dev/null
   if [ $? = 0 ]; then
-    if [ x${PACKAGE_FORMAT} = xnative ]; then
+    if [ x${PKG} = xnative ]; then
       dmake ${PACKAGE_TYPE} ${BUILD_OPTION}
     else
-      PKGFORMAT=${PACKAGE_FORMAT} dmake ${PACKAGE_TYPE} ${BUILD_OPTION}
+      PKGFORMAT=${PKG} dmake ${PACKAGE_TYPE} ${BUILD_OPTION}
     fi
     cd ${SRC_ROOT}
   else
@@ -369,32 +206,27 @@
 # ==================================================
 Package ()
 {
-  local PACKAGE_DIR=${1}
-  local PACKAGE_CMD=${2}
-  local PACKAGE_TYPE=${3}
+  local PACKAGE_TYPE=${1}
+  local PKG=${2}
   if [ -d ${PACKAGE_DIR} ]; then
     cd ${PACKAGE_DIR}
-    ${PACKAGE_CMD}
+    case ${OOO_BUILD_SYSTEM} in
+      Win32Intel)
+        zip -r -${COMPRESS_RATE} ${PKGOUTDIR}/${PACKAGE_NAME}.zip *
+        ;;
+      LinuxIntel)
+        [ x${PKG} = x ] || PACKAGE_NAME=${PACKAGE_NAME}_${PKG}
+        tar cvf - * | bzip2 -${COMPRESS_RATE} - > 
${PKGOUTDIR}/${PACKAGE_NAME}.tar.bz2
+        ;;
+      *)
+        tar cvf - * | gzip -${COMPRESS_RATE} - > 
${PKGOUTDIR}/${PACKAGE_NAME}.tar.gz
+        ;;
+    esac
     cd ${SRC_ROOT}
   else
     PrintMessage "${PACKAGE_TYPE} not found, check ${PACKAGE_TYPE}."
-  fi
-}
-
-# ==================================================
-# LinuxIntel : 
複数のパッケージを作成する場合は、それぞれのパッケージにあわせたDesktopIntegrationが作成される場合がある為、一度再構築し直しておく
-# ==================================================
-RebuildDesktopIntegration ()
-{
-  local PACKAGE_FORMAT=${1}
-  PrintMessage "Rebuild DesktopIntegration [Format : ${PACKAGE_FORMAT}]"
-  cd ${SRC_ROOT}/sysui
-  PKGFORMAT=${PACKAGE_FORMAT} build.pl || {
-    PrintMessage "Can't build ${PROJECT}, fix the bug above."
     exit
-  }
-  deliver.pl
-  cd ${SRC_ROOT}
+  fi
 }
 
 # ==================================================
@@ -404,9 +236,14 @@
 CreatePackage ()
 {
   local PKG_TYPE=${1}
-  local PACKAGE_FORMAT=${2}
+  local PKG=${2}
   case ${PKG_TYPE} in
-    InstallSet)
+    LanguagePack)
+      local 
PKG_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack"
+      local PKG_NAME="OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack"
+      local PACKAGE_TYPE=ooolanguagepack
+      ;;
+    InstallSet|*)
       if [ x${DEVELMODE} = xYes ]; then
         local 
PKG_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_Dev"
         local PKG_NAME="OOo-Dev_${VERSION}_${OOO_BUILD_SYSTEM}_install"
@@ -417,27 +254,18 @@
         local PACKAGE_TYPE=openoffice
       fi
       ;;
-    LanguagePack)
-      local 
PKG_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack"
-      local PKG_NAME="OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack"
-      local PACKAGE_TYPE=ooolanguagepack
-      ;;
-    *)
-      PrintMessage "Unknown package option !!"
-      exit
-      ;;
   esac
-  RebuildPackage ${PACKAGE_TYPE} ${PACKAGE_FORMAT}
+  RebuildPackage ${PACKAGE_TYPE} ${PKG}
   for LANGUAGE in ${LANGUAGES}
   do
     local PACKAGE_NAME="${PKG_NAME}_${LANGUAGE}_${BUILDER_NAME}"
-    PrintMessage "Packaging [Type : ${PKG_TYPE}] [Language : ${LANGUAGE}] 
[Format : ${PACKAGE_FORMAT}]"
+    PrintMessage "Packaging [Type : ${PKG_TYPE}] [Language : ${LANGUAGE}] 
[Format : ${PKG}]"
     case ${OOO_BUILD_SYSTEM} in
       LinuxIntel)
-        local PACKAGE_DIR="${PKG_DIR}/${PACKAGE_FORMAT}/install/${LANGUAGE}"
-        local PACKAGE_CMD="tar jcvf 
${PKGOUTDIR}/${PACKAGE_NAME}_${PACKAGE_FORMAT}.tar.bz2 *"
-        cd ${PACKAGE_DIR} &> /dev/null && {
-          case ${PACKAGE_FORMAT} in
+        local PACKAGE_DIR="${PKG_DIR}/${PKG}/install/${LANGUAGE}"
+        cd ${PACKAGE_DIR} &> /dev/null
+        if [ $? = 0 ]; then
+          case ${PKG} in
             portable)
               AddhocFix_portable ${PKG_TYPE}
               ;;
@@ -451,120 +279,40 @@
               ;;
           esac
           cd ${SRC_ROOT}
-        }
+        fi
         ;;
       Win32Intel)
         local PACKAGE_DIR="${PKG_DIR}/msi/install/${LANGUAGE}"
-        local PACKAGE_CMD="zip -r ${PKGOUTDIR}/${PACKAGE_NAME}.zip *"
-        cd ${PACKAGE_DIR}_download &> /dev/null && {
+        cd ${PACKAGE_DIR}_download &> /dev/null
+        if [ $? = 0 ]; then
           ${GNUCP} -vp *.exe ${PKGOUTDIR}/${PACKAGE_NAME}.exe
           cd ${SRC_ROOT}
-        }
+        fi
         ;;
       *)
         local PACKAGE_DIR="${PKG_DIR}/*/install/${LANGUAGE}"
-        local PACKAGE_CMD="tar cvf - * | gzip - > 
${PKGOUTDIR}/${PACKAGE_NAME}.tar.gz"
         ;;
     esac
-    Package "${PACKAGE_DIR}" "${PACKAGE_CMD}" "${PKG_TYPE}"
+    Package ${PKG_TYPE} ${PKG}
   done
 }
 
 # ==================================================
-# SDKパッケージを作成する
-# ==================================================
-
-PackageSDK ()
-{
-  local LANGUAGE=${1}
-  local 
PACKAGE_NAME="OOo_${VERSION}_${OOO_BUILD_SYSTEM}_sdk_${LANGUAGE}_${BUILDER_NAME}"
-  PrintMessage "Packaging SDK [Language : ${LANGUAGE} ]"
-  case ${OOO_BUILD_SYSTEM} in
-    LinuxIntel)
-      local 
PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_SDK/rpm/install/${LANGUAGE}"
-      local PACKAGE_CMD="tar jcvf 
${PKGOUTDIR}/${PACKAGE_NAME}_${DEFAULT_PACKAGE}.tar.bz2 *"
-      ;;
-    Win32Intel)
-      local 
PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_SDK/msi/install/${LANGUAGE}"
-      local PACKAGE_CMD="zip -r ${PKGOUTDIR}/${PACKAGE_NAME}.zip *"
-      cd ${PACKAGE_DIR}_download &> /dev/null && {
-        ${GNUCP} -vp *.exe ${PKGOUTDIR}/${PACKAGE_NAME}.exe
-        cd ${SRC_ROOT}
-      }
-      ;;
-    *)
-      local 
PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_SDK/*/install/${LANGUAGE}"
-      local PACKAGE_CMD="tar cvf - * | gzip - > 
${PKGOUTDIR}/${PACKAGE_NAME}.tar.gz"
-      ;;
-  esac
-  Package "${PACKAGE_DIR}" "${PACKAGE_CMD}" SDK
-}
-
-# ==================================================
-# SOLVERパッケージを作成する
-# ==================================================
-PackageSolver ()
-{
-  PrintMessage "Packaging SOLVER"
-  case ${OOO_BUILD_SYSTEM} in
-    LinuxIntel)
-      tar jcvf 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.tar.gz 
solver
-      ;;
-    Win32Intel)
-      zip -r -9 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.zip 
solver
-      ;;
-   *)
-      tar cvf - solver | gzip - > 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_solver_${BUILDER_NAME}.tar.gz
-      ;;
-  esac
-}
-
-# ==================================================
-# UNO Runtime Environmentパッケージを作成する
-# ==================================================
-PackageURE ()
-{
-  local URE_LINE_START=`grep -n "^URE" 
${SRC_ROOT}/instsetoo_native/util/openoffice.lst | awk -F: '{print $1}'`
-  local URE_VERSION=`tail +${URE_LINE_START} 
${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep -i 'package.*sion' | tr 
'\n' ' ' | awk '{print $2"-"$4}'`
-  local 
PACKAGE_NAME="URE_${URE_VERSION}_${OOO_BUILD_SYSTEM}_install_${BUILDER_NAME}"
-  PrintMessage "Copy to PKGOUTDIR Pack UnoRuntime Environment"
-  case ${OOO_BUILD_SYSTEM} in
-    LinuxIntel)
-      local 
PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/rpm/install/en-US"
-      local PACKAGE_CMD="tar jcvf ${PKGOUTDIR}/${PACKAGE_NAME}.tar.bz2 RPMS"
-      ;;
-    Win32Intel)
-      local 
PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/msi/install/en-US"
-      local PACKAGE_CMD="zip -r ${PKGOUTDIR}/${PACKAGE_NAME}.zip *"
-      cd ${PACKAGE_DIR}_download &> /dev/null && {
-        ${GNUCP} -vp *_en-US.exe ${PKGOUTDIR}/${PACKAGE_NAME}.exe
-        cd ${SRC_ROOT}
-      }
-      ;;
-    *)
-      local 
PACKAGE_DIR="${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/*/install/en-US"
-      local PACKAGE_CMD="tar cvf - * | gzip - > 
${PKGOUTDIR}/${PACKAGE_NAME}.tar.gz"
-      ;;
-  esac
-  Package "${PACKAGE_DIR}" "${PACKAGE_CMD}" "Uno Runtime Environment"
-}
-
-# ==================================================
 # LinuxIntel : 
SourceForge.jpの容量制限により100MバイトまでのファイルしかUpload出来ない為、coreパッケージとそれ以外のパッケージを分割する
 # ==================================================
 DividePackage ()
 {
   local LANGUAGE=${1}
-  local PACKAGE_FORMAT=${2}
+  local PKG=${2}
   cd ${PKGOUTDIR} &> /dev/null
-  for FILENAME in `echo 
*_install_${LANGUAGE}_${BUILDER_NAME}_${PACKAGE_FORMAT}.tar.bz2 | sed -e 
's/\.tar\.bz2//' -e '/\*/d'`
+  for FILENAME in `echo *_install_${LANGUAGE}_${BUILDER_NAME}_${PKG}.tar.bz2 | 
sed -e 's/\.tar\.bz2//' -e '/\*/d'`
   do
-    PrintMessage "Divide Package [Language = ${LANGUAGE}] : [Package = 
${PACKAGE_FORMAT}]"
-    [ -d ${PKGOUTDIR}/${PACKAGE_FORMAT} ] || mkdir -p 
${PKGOUTDIR}/${PACKAGE_FORMAT}
-    cd ${PKGOUTDIR}/${PACKAGE_FORMAT}
+    PrintMessage "Divide Package [Language = ${LANGUAGE}] : [Package = ${PKG}]"
+    [ -d ${PKGOUTDIR}/${PKG} ] || mkdir -p ${PKGOUTDIR}/${PKG}
+    cd ${PKGOUTDIR}/${PKG}
     PrintMessage "UNPACKING FILENAME = ${FILENAME}.tar.bz2"
     tar jxvf ../${FILENAME}.tar.bz2
-    case ${PACKAGE_FORMAT} in
+    case ${PKG} in
       rpm)
         DIRECTORY=${RPM_DIR}
         ;;
@@ -579,12 +327,12 @@
         ;;
     esac
     PrintMessage "Packaging Filename = ${FILENAME}_core.tar.bz2"
-    tar jcvf ${PKGOUTDIR}/${FILENAME}_core.tar.bz2 ${DIRECTORY}/*core*
+    tar cvf - ${DIRECTORY}/*core* | bzip2 -${COMPRESS_RATE} - > 
${PKGOUTDIR}/${FILENAME}_core.tar.bz2
     rm -f ${DIRECTORY}/*core*
     PrintMessage "Packaging Filename = ${FILENAME}_other.tar.bz2"
-    tar jcvf ${PKGOUTDIR}/${FILENAME}_other.tar.bz2 *
+    tar cvf - * | bzip2 -${COMPRESS_RATE} - > 
${PKGOUTDIR}/${FILENAME}_other.tar.bz2
     cd ${PKGOUTDIR}
-    rm -fr ${PKGOUTDIR}/${PACKAGE_FORMAT}
+    rm -fr ${PKGOUTDIR}/${PKG}
   done
   cd ${SRC_ROOT}
 }




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

メールによる返信