From 64c07e20f529d1d683821d2232375e8b8f39a9ec Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Oct 31 2006 07:43:15 +0000 Subject: - Re-enable building of the icu4j plugins. --- diff --git a/eclipse.spec b/eclipse.spec index 0eda7fc..20d912d 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -32,7 +32,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 8%{?dist} +Release: 9%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -729,30 +729,30 @@ rm com.jcraft.jsch_*.jar popd # setup with the icu4j plugins for building -#pushd baseLocation/plugins -#rm com.ibm.icu.base_3.4.5.jar \ -# com.ibm.icu_3.4.5.jar \ -# com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip \ -# com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip -#mkdir -p icu4j-build-temp - -#pushd icu4j-build-temp -#unzip -qq %{SOURCE7} -#sed --in-place "s/ .*bootclasspath=.*//g" build.xml -#ant eclipseProjects -#popd +pushd baseLocation/plugins +rm com.ibm.icu.base_3.4.5.jar \ + com.ibm.icu_3.4.5.jar \ + com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip \ + com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip +mkdir -p icu4j-build-temp + +pushd icu4j-build-temp +unzip -qq %{SOURCE7} +sed --in-place "s/ .*bootclasspath=.*//g" build.xml +ant eclipseProjects +popd -#mkdir -p icu4j-build -#mv icu4j-build-temp/eclipseProjects/com.ibm.icu icu4j-build -#mv icu4j-build-temp/eclipseProjects/com.ibm.icu.base icu4j-build -#rm -r icu4j-build-temp +mkdir -p icu4j-build +mv icu4j-build-temp/eclipseProjects/com.ibm.icu icu4j-build +mv icu4j-build-temp/eclipseProjects/com.ibm.icu.base icu4j-build +rm -r icu4j-build-temp # add build.xml patches -#pushd icu4j-build -#%patch3 -p1 -#popd +pushd icu4j-build +%patch3 -p1 +popd -#popd +popd # delete included jars # FIXME: file a bug about these @@ -789,31 +789,31 @@ popd rm -r baseLocation/plugins/com.jcraft.jsch_0.1.28.jar-build # finish the icu4j build -#pushd baseLocation/plugins +pushd baseLocation/plugins # build the icu.base plugin -#zipfile=$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip -#pushd icu4j-build/com.ibm.icu.base/src -#find -name \*.java | xargs touch --date=1/1/1970 -#zip -X -9 -r $zipfile . -i \*.java -#popd -#pushd icu4j-build/com.ibm.icu.base -#ant build.update.jar -#popd -#mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar . +zipfile=$PWD/com.ibm.icu.base.source_3.4.5/src/com.ibm.icu.base_3.4.5/src.zip +pushd icu4j-build/com.ibm.icu.base/src +find -name \*.java | xargs touch --date=1/1/1970 +zip -X -9 -r $zipfile . -i \*.java +popd +pushd icu4j-build/com.ibm.icu.base +ant build.update.jar +popd +mv icu4j-build/com.ibm.icu.base/com.ibm.icu.base_3.4.5.jar . # build the icu plugin -#zipfile=$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip -#pushd icu4j-build/com.ibm.icu/src -#find -name \*.java | xargs touch --date=1/1/1970 -#zip -X -9 -r $zipfile . -i \*.java -#popd -#pushd icu4j-build/com.ibm.icu -#ant build.update.jar -#popd -#mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar . +zipfile=$PWD/com.ibm.icu.source_3.4.5/src/com.ibm.icu_3.4.5/src.zip +pushd icu4j-build/com.ibm.icu/src +find -name \*.java | xargs touch --date=1/1/1970 +zip -X -9 -r $zipfile . -i \*.java +popd +pushd icu4j-build/com.ibm.icu +ant build.update.jar +popd +mv icu4j-build/com.ibm.icu/com.ibm.icu_3.4.5.jar . -#popd +popd # Bootstrapping is 3 parts: # 1. Build ecj with gcj -C -- only necessary until gcjx/ecj lands in gcc @@ -1629,6 +1629,9 @@ rm -f %{_datadir}/%{name}/configuration/org.eclipse.update/platform.xml* %{_datadir}/%{name}/plugins/org.eclipse.sdk_* %changelog +* Tue Oct 31 2006 Ben Konrath 3.2.1-9 +- Re-enable building of the icu4j plugins. + * Mon Oct 30 2006 Ben Konrath 3.2.1-8 - Temporarily disable building of icu4j plugin.