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

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

Log:
 Add download option, etc.

File Changes:

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

File [changed]: jabuild
Url: 
http://ja.openoffice.org/source/browse/ja/www/documents/develop/jabuild?r1=1.2&r2=1.3
Delta lines:  +37 -17
---------------------
--- jabuild     12 Dec 2005 08:55:58 -0000      1.2
+++ jabuild     17 Dec 2005 14:04:09 -0000      1.3
@@ -24,6 +24,11 @@
 [ x${DEBUGMODE} = xYes ] && set -x
 
 # ==================================================
+# CVSリポジトリからソースファイルをダウンロード
+# ==================================================
+[ x${DOWNLOAD_SOURCE} = xYes ] && DownloadSourceFile ${TAG}
+
+# ==================================================
 # デフォルトのビルド環境設定
 # ==================================================
 SRC_ROOT=${SRC_ROOT:-`pwd`}
@@ -61,7 +66,7 @@
 
MOZ_WINTOOLS_LOCATE=${MOZ_WINTOOLS_LOCATE:-http://ftp.mozilla.org/pub/mozilla.org/mozilla/source}
 
 CONFIG_FLAGS="--with-lang=\"${LANGUAGES}\" --with-dict=ALL 
--with-images='hicontrast industrial crystal'"
-BUILD_OPTION=${BUILD_OPTION:-"--all strip=true"}
+BUILD_OPTION=${BUILD_OPTION:-"strip=true"}
 PACKAGE_FORMAT=${PACKAGE_FORMAT:-"rpm deb portable slackware"}
 CREATE_SDK=${CREATE_SDK:-Yes}
 CREATE_SOLVER=${CREATE_SOLVER:-Yes}
@@ -90,12 +95,6 @@
 # ビルドプラットホームの検出
 # ==================================================
 OOO_BUILD_SYSTEM=`GetPlatform`
-if [ x${OOO_BUILD_SYSTEM} = xNotSupported ]; then
-  PrintMessage "Operating system/CPU not supported yet."
-  exit
-else
-  PrintMessage "Building platform : ${OOO_BUILD_SYSTEM}"
-fi
 
 # ==================================================
 # ビルドプラットホーム別の設定
@@ -107,7 +106,7 @@
       OOOUTPATH=unxlngi6      # gcc 3.4
     else
       OOOUTPATH=unxlngi4      # gcc 3.3
-    fiLanguagePack
+    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"
     DEFAULT_PACKAGE=`GetDefaultPackage`
     CONFIG_FLAGS="${CONFIG_FLAGS} --with-package-format=${DEFAULT_PACKAGE}"
@@ -115,26 +114,32 @@
   LinuxPPC)
     OOOUTPATH=unxlngppc
     CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk --enable-kde --prefix=${PREFIX} 
--enable-gcc3"
+    PACKAGE_FORMAT=rpm
     ;;
   LinuxAMD)
     OOOUTPATH=unxlngx4
     CONFIG_FLAGS="${CONFIG_FLAGS} --enable-gtk --enable-kde --prefix=${PREFIX} 
--enable-gcc3"
+    PACKAGE_FORMAT=rpm
     ;;
   SolarisSparc)
     OOOUTPATH=unxsols4
     CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} 
--with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}"
+    PACKAGE_FORMAT=native
     ;;
   SolarisIntel)
     OOOUTPATH=unxsoli4
     CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} 
--with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}"
+    PACKAGE_FORMAT=native
     ;;
   SolarisSparcGcc)
     OOOUTPATH=unxsogs
     CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} 
--with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}"
+    PACKAGE_FORMAT=native
     ;;
   SolarisIntelGcc)
     OOOUTPATH=unxsogi
     CONFIG_FLAGS="${CONFIG_FLAGS} --prefix=${PREFIX} 
--with-gnu-patch=${GNUPATCH} --with-gnu-cp=${GNUCP}"
+    PACKAGE_FORMAT=native
     ;;
   Win32Intel)
     CL_VER=`cl 2>&1 | head -n 1 | sed -e 's/(R)//' -e 's/\.//g' | awk '{print 
$7}'`
@@ -153,10 +158,14 @@
     else
       CONFIG_FLAGS="${CONFIG_FLAGS} -disable-directx"
     fi
+    PACKAGE_FORMAT=native
     ;;
   *)
+    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}"
@@ -287,12 +296,23 @@
 # ==================================================
   [ x${ORIGINALPATCH} = xYes ] && {
     [ -e ${SRC_ROOT}/patch.log ] || {
+      REMOVE_SCRIPT=remove_patched_file.sh
+      DOWNLOAD_SCRIPT=patchedfile_redownload.sh
       PrintMessage "Patching original patches"
       [ -e ${PATCH_DIR} ] && ApplyPatch ${PATCH_DIR}
       [ -e ${PATCH_DIR}/${OOO_BUILD_SYSTEM} ] && ApplyPatch 
${PATCH_DIR}/${OOO_BUILD_SYSTEM}
-      echo '#!/bin/bash' > ${SRC_ROOT}/remove_patched_file.sh
-      grep -i "patching file" ${SRC_ROOT}/patch.log | sed -e 's/patching file 
/rm -fv /' >> ${SRC_ROOT}/remove_patched_file.sh
-      chmod 755 ${SRC_ROOT}/remove_patched_file.sh
+      echo '#!/bin/bash' > ${SRC_ROOT}/${REMOVE_SCRIPT}
+      grep -i "patching file" ${SRC_ROOT}/patch.log | sed -e 's/patching file 
/rm -fv /' >> ${SRC_ROOT}/${REMOVE_SCRIPT}
+      chmod 755 ${SRC_ROOT}/${REMOVE_SCRIPT}
+      cat << EOF > ${SRC_ROOT}/${DOWNLOAD_SCRIPT}
+#!/bin/bash
+[ x\${1} = x ] && {
+  echo Usage : ${DOWNLOAD_SCRIPT} [CVS_tag]
+  exit
+}
+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}
     }
   }
 
@@ -329,7 +349,7 @@
 # ==================================================
   [ x${MERGE_LOCALIZE_DATA} = xYes ] && {
     PrintMessage "Prepare localize tools."
-    BuildProject transex3 "${BUILD_OPTION}"
+    BuildProject transex3 "--all ${BUILD_OPTION}"
     PrintMessage "Merging localize data."
     for GSI in `echo ${TEMP_DIR}/sdf/*.sdf | sed '/\*/d'`
     do
@@ -359,7 +379,7 @@
           MENU_CONFIG=`echo "${CONFIG_FLAGS}" | eval sed 
's/--with-package-format=${DEFAULT_PACKAGE}/--with-package-format=${PKG}/'`
           Configure "${MENU_CONFIG}"
           LoadBuildEnvironment
-          BuildProject sysui "${BUILD_OPTION}"
+          BuildProject sysui "--all ${BUILD_OPTION}"
           ;;
       esac
     done
@@ -372,7 +392,7 @@
 # ==================================================
 # ビルドプロセスの開始
 # ==================================================
-  BLD_OPTION="product=full"
+  BLD_OPTION="--all product=full"
   MESSAGE="Serial Building ..."
   PrintMessage "Start build process."
   [ x${WITH_HTML} = xYes ] && BLD_OPTION="${BLD_OPTION} --html"
@@ -389,7 +409,7 @@
       ;;
   esac
   PrintMessage "${MESSAGE}"
-  BuildProject instsetoo_native/util "${BUILD_OPTION} ${BLD_OPTION}"
+  BuildProject instsetoo_native/util "${BLD_OPTION} ${BUILD_OPTION}"
 
 }
 
@@ -423,8 +443,8 @@
     [ x${CREATE_LANGUAGEPACK} = xYes ] && CreatePackage LanguagePack ${PKG}
   done
 else
-  CreatePackage InstallSet
-  [ x${CREATE_LANGUAGEPACK} = xYes ] && CreatePackage LanguagePack
+  CreatePackage InstallSet native
+  [ x${CREATE_LANGUAGEPACK} = xYes ] && CreatePackage LanguagePack native
 fi
 
 # ==================================================




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

メールによる返信