uncomment some previously commented preparation steps (replacing links

to sdk).
clean up preparation steps.
build only for current architecture.
This commit is contained in:
Krzysztof Daniel 2012-08-02 10:09:08 +02:00
parent d12201287f
commit 326bd496be
1 changed files with 27 additions and 44 deletions

View File

@ -267,7 +267,6 @@ developing Eclipse plugins.
%patch14
%patch15
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
%pom_disable_module bundles/org.eclipse.equinox.http.jetty6 rt.equinox.bundles .
@ -281,45 +280,35 @@ developing Eclipse plugins.
#no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar.
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/
#export JAVA_HOME=%{java_home}
#%setup -q -n eclipse-build-%{eb_sha1}
#cp %{SOURCE1} .
#ant applyPatches
#%patch0
#pushd build/eclipse-%{eclipse_version}-%{build_id}-src
#sed -i -e "s|\[2.9.0,3.0.0)|\[2.9.0,4.0.0)|g" plugins/org.eclipse.help.base/META-INF/MANIFEST.MF
# Use our system-installed javadocs, reference only what we built, and
# don't like to osgi.org docs (FIXME: maybe we should package them?)
#sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
# -e "/osgi\.org/d" \
# -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
# plugins/org.eclipse.platform.doc.isv/platformOptions.txt
#sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
# -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
# plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
#sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
# -e "/osgi\.org/d" \
# plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
#sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
# -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
# -e "/osgi\.org/d" \
# plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
# plugins/org.eclipse.pde.doc.user/pdeOptions.txt
#sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
# plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
# plugins/org.eclipse.pde.doc.user/pdeOptions.txt
sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
-e "/osgi\.org/d" \
-e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \
eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
-e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \
eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \
-e "/osgi\.org/d" \
eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt
sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \
-e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \
-e "/osgi\.org/d" \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \
eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt
#fix for glib 2.31 not allowing include of anything else but glib
#sed -i -e "s|#include <glib/gslist.h>||g" plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c
sed -i -e "s|#include <glib/gslist.h>||g" eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c
# make sure there are no jars left
find . -name *.jar -exec rm -f {} \;
find . -name *.class -exec rm -f {} \;
find . -name *.so -exec rm -f {} \;
find . -type f -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \;
find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
find . -name org.eclipse.jdt.core.prefs -exec sed -i -e "s/inlineJsrBytecode=enabled/inlineJsrBytecode=disabled/" {} \;
@ -337,35 +326,29 @@ sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.ge
sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml
sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/pom.xml
#Remove all architectures that do not match current build architecture.
%pom_xpath_remove "*[local-name() = 'environment' and
(child::*[local-name() = 'os' and not(text() = 'linux')]
or child::*[local-name() = 'ws' and not(text() = 'gtk')]
or child::*[local-name() = 'arch' and not(text() = '%{_arch}')]) ]" eclipse-parent/pom.xml
%build
mvn-local -f eclipse-parent/pom.xml \
install \
-Dmaven.local.mode=true
#\
# -Dmaven.repo.local=/var/tmp/lts/R4_localrepo
mvn-local -f maven-cbi-plugin/pom.xml \
install \
-Dmaven.local.mode=true
#\
# -Dmaven.repo.local=/var/tmp/lts/R4_localrepo
mvn-local install \
-Dmaven.test.skip=true -Dnative=linux.gtk.`uname -p` \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch} \
-Dmaven.local.mode=true
#\
# -Dmaven.repo.local=/var/tmp/lts/R4_localrepo
mvn-local clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.`uname -p` \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch} \
-Dmaven.local.mode=true
#\
# -Dmaven.repo.local=/var/tmp/lts/R4_localrepo
#export JAVA_HOME=%{java_home}
#ant provision.cvs
%install
exit 0;
export JAVA_HOME=%{java_home}