User: curvirgo
Date: 05/11/07 06:10:28

Modified:
 /ja/www/documents/develop/
  ja_build

Log:
 Fix install-set packaging function and langpack packaging function

File Changes:

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

File [changed]: ja_build
Url: 
http://ja.openoffice.org/source/browse/ja/www/documents/develop/ja_build?r1=1.28&r2=1.29
Delta lines:  +10 -10
---------------------
--- ja_build    6 Nov 2005 22:50:27 -0000       1.28
+++ ja_build    7 Nov 2005 14:10:25 -0000       1.29
@@ -104,18 +104,18 @@
                                fi
                                ;;
                        Win32Intel)
-                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE} ]; 
then
-                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE}
+                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/msi/install/${LANGUAGE}
 ]; then
+                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/msi/install/${LANGUAGE}
                                        zip -r 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.zip
 *
-                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE}_download
+                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/msi/install/${LANGUAGE}_download
                                        ${GNUCP} -vp *_${LANGUAGE}.exe 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.exe
                                else
                                        PrintMessage "Installation sets not 
found, check installation sets."
                                fi
                                ;;
                        *)
-                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE} ]; 
then
-                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE}
+                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/*/install/${LANGUAGE} 
]; then
+                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/*/install/${LANGUAGE}
                                        tar zcvf 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.tar.gz
 *
                                else
                                        PrintMessage "Installation sets not 
found, check installation sets."
@@ -205,18 +205,18 @@
                                fi
                                ;;
                        Win32Intel)
-                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE}
 ]; then
-                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE}
+                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/msi/install/${LANGUAGE}
 ]; then
+                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/msi/install/${LANGUAGE}
                                        zip -r 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}.zip
 *
-                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE}_download
+                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/msi/install/${LANGUAGE}_download
                                        ${GNUCP} -vp *_${LANGUAGE}.exe 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}.exe
                                else
                                        PrintMessage "Language packages not 
found, check language packages."
                                fi
                                ;;
                        *)
-                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE}
 ]; then
-                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE}
+                               if [ -d 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/*/install/${LANGUAGE}
 ]; then
+                                       cd 
${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/*/install/${LANGUAGE}
                                        tar zcvf 
${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}.tar.gz
 *
                                else
                                        PrintMessage "Language packages not 
found, check language packages."




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

メールによる返信