From 3948221f310a11e1c9260d8856c16a7853ea35b6 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Jul 31 2012 11:38:27 +0000 Subject: successful build. --- diff --git a/eclipse.spec b/eclipse.spec index 7252858..3c730dc 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -277,6 +277,9 @@ developing Eclipse plugins. %pom_disable_module features/org.eclipse.equinox.weaving.sdk rt.equinox.bundles %pom_disable_module features/master-equinox-weaving eclipse.platform.releng +#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} . @@ -317,6 +320,17 @@ find . -name *.so -exec rm -f {} \; find . -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/" {} \; + +#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298 +sed -i -e "s/new Equinox(configuration)/new Equinox((Map) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +sed -i -e "s/new Equinox(configuration1)/new Equinox((Map) (Object) configuration1)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +sed -i -e "s/new Equinox(configuration2)/new Equinox((Map) (Object) configuration2)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java +sed -i -e "s/new Equinox(configuration)/new Equinox((Map) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java + +sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java +sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java #popd %build