User: curvirgo Date: 05/11/06 14:50:30 Modified: /ja/www/documents/develop/ ja_build
Log: Fix package function for m138 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.27&r2=1.28 Delta lines: +162 -129 ----------------------- --- ja_build 2 Nov 2005 10:26:52 -0000 1.27 +++ ja_build 6 Nov 2005 22:50:27 -0000 1.28 @@ -25,7 +25,6 @@ CreateInstallSet () { PACKAGE=${1} - PORTABLE_DIR=linux-2.4-intel PrintMessage "Create installation packages" [ "${PACKAGE}" != "" ] && PrintMessage "Packaging format : ${PACKAGE}" @@ -39,49 +38,52 @@ for LANGUAGE in ${LANGUAGES} do - echo LANGUAGE=${LANGUAGE} - if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE} ]; then PrintMessage "Packaging installation set [Language : ${LANGUAGE}]" - if [ "${PACKAGE}" = "deb" ]; then - DEBOUTPATH=_DEBIAN - else - DEBOUTPATH= - fi - cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro${DEBOUTPATH}/OpenOffice/install/${LANGUAGE} case ${OOO_BUILD_SYSTEM} in LinuxIntel) + if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/${PACKAGE}/install/${LANGUAGE} ]; then + cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/${PACKAGE}/install/${LANGUAGE} + PrintMessage "Packaging format : ${PACKAGE}" case ${PACKAGE} in portable) - TEMP=`grep -in 'requires openoffice.org-core02' */openoffice.org-core01.install | sed 's/:/ /' | awk '{print $1}'` + cd ${PORTABLE_DIR} && { + TEMP=`grep -in 'requires openoffice.org-core02' openoffice.org-core01.install | sed 's/:/ /' | awk '{print $1}'` COUNT=`expr ${TEMP} - 1` - head -n ${COUNT} */openoffice.org-core01.install > ${TEMP_DIR}/tempfile - COUNT=`grep -in 'Backing up old versions' */openoffice.org-core01.install | sed 's/:/ /' | awk '{print $1}'` - tail +${COUNT} */openoffice.org-core01.install >> ${TEMP_DIR}/tempfile - ${GNUCP} ${TEMP_DIR}/tempfile */openoffice.org-core01.install - for FILE in `grep -in 'echo $df' */*.install | grep -i 'print $11' | awk '{print $1}' | sed s/:.*//` - do - ${GNUCP} ${FILE} ${TEMP_DIR}/tempfile - cat ${TEMP_DIR}/tempfile | sed "s/awk '{print \$11}'/awk '{print \$10}'/" > ${FILE} - chmod 755 ${FILE} + head -n ${COUNT} openoffice.org-core01.install > ${TEMP_DIR}/tempfile + COUNT=`grep -in 'Backing up old versions' openoffice.org-core01.install | sed 's/:/ /' | awk '{print $1}'` + tail +${COUNT} openoffice.org-core01.install >> ${TEMP_DIR}/tempfile + mv -f ${TEMP_DIR}/tempfile openoffice.org-core01.install + for file in `grep -in 'echo $df' *.install | grep -i 'print $11' | awk '{print $1}' | sed s/:.*//` + do + cat ${file} | sed "s/awk '{print \$11}'/awk '{print \$10}'/" > ${TEMP_DIR}/tempfile + mv -f ${TEMP_DIR}/tempfile ${file} done - rm -f */*.tar.gz - rm -f ${TEMP_DIR}/tempfile + rm -f *.tar.gz + cd .. + } + ;; + rpm) + cd ${RPM_DIR} && { + PrintMessage "Delete deb_package desktop-integration file" + rm -fv ./desktop-integration/*.deb + cd .. + } ;; slackware) - cd ${PORTABLE_DIR} - for file in `echo *` + cd ${PORTABLE_DIR} && { + for file in `ls * 2> /dev/null` do [ -d ${file} ] && rm -fr ${file} done mkdir -p tempdir - for file in `echo *.tgz` + for file in `ls *.tgz 2> /dev/null` do - PrintMessage "Unpacking installation set [Language : ${LANGUAGE}]" + PrintMessage "Unpacking installation set [ File : ${file}]" tar zxf ${file} -Ctempdir && rm -f ${file} PrintMessage "Replace Packager Name : [EMAIL PROTECTED] -> ${BUILDER_NAME}" cat tempdir/install/slack-desc | eval sed 's/[EMAIL PROTECTED]/${BUILDER_NAME}/' > slack-desc mv -f slack-desc tempdir/install - PrintMessage "Repacking installation set [Language : ${LANGUAGE}]" + PrintMessage "Repacking installation set [ File : ${file}]" cd tempdir tar cf ../`basename ${file} .tgz`.tar . cd .. @@ -91,24 +93,35 @@ done rm -fr tempdir cd .. + } ;; *) ;; esac tar jcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}_${PACKAGE}.tar.bz2 * + else + PrintMessage "Installation sets not found, check installation sets." + fi ;; Win32Intel) + if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/install/${LANGUAGE} ]; then + cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice/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 ${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} tar zcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_install_${LANGUAGE}_${BUILDER_NAME}.tar.gz * - ;; - esac else PrintMessage "Installation sets not found, check installation sets." fi + ;; + esac done cd ${SRC_ROOT} } @@ -117,9 +130,9 @@ CreateLanguagePack () { PACKAGE=${1} - PORTABLE_DIR=linux-2.4-intel PrintMessage "Create language packages" + [ "${PACKAGE}" != "" ] && PrintMessage "Packaging format : ${PACKAGE}" cd ${SRC_ROOT}/instsetoo_native/util if [ "${PACKAGE}" != "" ]; then PKGFORMAT=${PACKAGE} dmake ooolanguagepack ${BUILD_OPTION} @@ -129,50 +142,49 @@ for LANGUAGE in ${LANGUAGES} do - if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/install/${LANGUAGE} ]; then PrintMessage "Packaging language packages [Language : ${LANGUAGE}]" - if [ "${PACKAGE}" = "deb" ]; then - DEBOUTPATH=_DEBIAN - else - DEBOUTPATH= - fi - cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro${DEBOUTPATH}/OpenOffice_languagepack/install/${LANGUAGE} case ${OOO_BUILD_SYSTEM} in LinuxIntel) - PrintMessage "Packaging format : ${PACKAGE}" + if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/${PACKAGE}/install/${LANGUAGE} ]; then + cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/OpenOffice_languagepack/${PACKAGE}/install/${LANGUAGE} case ${PACKAGE} in portable) - for FILE in `ls */*.install` + cd ${PORTABLE_DIR} && { + for file in `ls *.install 2> /dev/null` do - ${GNUCP} ${FILE} ${TEMP_DIR}/tempfile - cat ${TEMP_DIR}/tempfile | sed "s/awk '{print \$11}'/awk '{print \$10}'/" > ${FILE} - chmod 755 ${FILE} + cat ${file} | sed "s/awk '{print \$11}'/awk '{print \$10}'/" > ${TEMP_DIR}/tempfile + mv -f ${TEMP_DIR}/tempfile ${file} done - rm -f */*.tar.gz - rm -f ${TEMP_DIR}/tempfile + rm -f *.tar.gz + cd .. + } ;; rpm) cd RPMS && { rm -f *.sh - tar zxf *.tar.gz && rm -f *.tar.gz + for file in `ls *.tar.gz 2> /dev/null` + do + tar zxf ${file} + rm -f ${file} + done cd .. } ;; slackware) - cd ${PORTABLE_DIR} - for file in `echo *` + cd ${PORTABLE_DIR} && { + for file in `ls * 2> /dev/null` do [ -d ${file} ] && rm -fr ${file} done mkdir -p tempdir - for file in `echo *.tgz` + for file in `ls *.tgz 2> /dev/null` do - PrintMessage "Unpacking installation set [Language : ${LANGUAGE}]" + PrintMessage "Unpacking installation set [ File : ${file}]" tar zxf ${file} -Ctempdir && rm -f ${file} PrintMessage "Replace Packager Name : [EMAIL PROTECTED] -> ${BUILDER_NAME}" cat tempdir/install/slack-desc | eval sed 's/[EMAIL PROTECTED]/${BUILDER_NAME}/' > slack-desc mv -f slack-desc tempdir/install - PrintMessage "Repacking installation set [Language : ${LANGUAGE}]" + PrintMessage "Repacking installation set [ File : ${file}]" cd tempdir tar cf ../`basename ${file} .tgz`.tar . cd .. @@ -182,24 +194,35 @@ done rm -fr tempdir cd .. + } ;; *) ;; esac tar jcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}_${PACKAGE}.tar.bz2 * + else + PrintMessage "Language packages not found, check language packages." + 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} 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 ${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} tar zcvf ${PKGOUTDIR}/OOo_${VERSION}_${OOO_BUILD_SYSTEM}_langpack_${LANGUAGE}_${BUILDER_NAME}.tar.gz * - ;; - esac else PrintMessage "Language packages not found, check language packages." fi + ;; + esac done cd ${SRC_ROOT} } @@ -207,10 +230,6 @@ DividePackage () { - RPM_DIR=RPMS - DEB_DIR=DEBS - PORTABLE_DIR=linux-2.4-intel - cd ${PKGOUTDIR} for LANGUAGE in ${LANGUAGES} do @@ -227,8 +246,6 @@ case ${PACKAGE} in rpm) DIRECTORY=${RPM_DIR} - PrintMessage "REMOVING deb_package desktop-integration file" - rm -fv ./${RPM_DIR}/desktop-integration/*.deb ;; deb) DIRECTORY=${DEB_DIR} @@ -264,7 +281,14 @@ CFG_FLAGS=${CONFIG_FLAGS} for PKG in ${PACKAGE_FORMAT} do - [ ${PKG} != ${DEFAULT_PACKAGE} -a ${PKG} != portable ] && { + case ${PKG} in + ${DEFAULT_PACKAGE}) + ;; + portable) + ;; + slackware) + ;; + *) CONFIG_FLAGS=`echo ${CFG_FLAGS} | eval sed 's/--with-package-format=${DEFAULT_PACKAGE}/-with-package-format=${PKG}/'` pushd . cd ${SRC_ROOT}/config_office @@ -274,7 +298,8 @@ cd ${SRC_ROOT}/sysui build.pl --all && deliver.pl popd - } + ;; + esac done [ "${CONFIG_FLAGS}" != "${CFG_FLAGS}" ] && { CONFIG_FLAGS=${CFG_FLAGS} @@ -311,8 +336,9 @@ SRC_ROOT=${SRC_ROOT:-`pwd`} BUILDER_NAME=${BUILDER_NAME:-curvirgo} -VERSION=${VERSION:-`head -n 20 ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep -i 'packageversion' | awk '{print $2}'`} -BUILD_NUMBER=${BUILD_NUMBER:-680} +#VERSION=${VERSION:-`head -n 20 ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep 'PACKAGEVERSION' | awk '{print $2}'`} +VERSION=${VERSION:-`head -n 20 ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep 'PACKAGEVERSION' | awk '{print $2}'`-`grep 'LAST_MINOR' ${SRC_ROOT}/solenv/inc/minor.mk | sed 's/LAST_MINOR=//'`} +BUILD_NUMBER=${BUILD_NUMBER:-`grep 'RSCVERSION' ${SRC_ROOT}/solenv/inc/minor.mk | sed 's/RSCVERSION=//'`} #LANGUAGES=${LANGUAGES:-"JAPN"} # for 1.1.x LANGUAGES=${LANGUAGES:-"en-US ja"} # for 2.0 PREFIX=${PREFIX:-/opt} @@ -369,6 +395,10 @@ ATTACH_SETUPGUIDE=${ATTACH_SETUPGUIDE:-No} SETUPGUIDE_VERSION=${SETUPGUIDE_VERSION:-115} +RPM_DIR=RPMS +DEB_DIR=DEBS +PORTABLE_DIR=linux-2.4-intel + export JAVA_HOME ANT_HOME @@ -887,18 +917,21 @@ [ ${BUILD_NUMBER} != 645 ] && { PrintMessage "Copy to PKGOUTDIR Pack UnoRuntime Environment" - if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/install/en-US ]; then + if [ -d ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/rpm/install/en-US ]; then URE_VERSION=`tail -n 16 ${SRC_ROOT}/instsetoo_native/util/openoffice.lst | grep -i 'package.*sion' | tr '\n' ' ' | awk '{print $2"-"$4}'` case ${OOO_BUILD_SYSTEM} in LinuxIntel) + cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/rpm/install/en-US tar jcvf URE_${URE_VERSION}_${OOO_BUILD_SYSTEM}_install_${BUILDER_NAME}.tar.bz2 RPMS ;; Win32Intel) + cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/install/en-US zip -r ${PKGOUTDIR}/URE_${URE_VERSION}_${OOO_BUILD_SYSTEM}_install_${BUILDER_NAME}.zip * cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/install/en-US_download ${GNUCP} -vp *_en-US.exe ${PKGOUTDIR}/URE_${URE_VERSION}_${OOO_BUILD_SYSTEM}_install_${BUILDER_NAME}.exe ;; *) + cd ${SRC_ROOT}/instsetoo_native/${OOOUTPATH}.pro/URE/install/en-US tar zcvf URE_${URE_VERSION}_${OOO_BUILD_SYSTEM}_install_${BUILDER_NAME}.tar.gz * ;; esac --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
