[eclipse-ptp] Update deps patch and build order
Orion Poplawski
orion at fedoraproject.org
Tue Oct 25 18:08:54 UTC 2011
commit 5478ba9c3a8c2d54a26aa9140531e700458311e9
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Oct 25 12:08:53 2011 -0600
Update deps patch and build order
eclipse-ptp-deps.patch | 70 +++++++++++++++++++++++++++++++++++++++---------
eclipse-ptp.spec | 5 +--
2 files changed, 59 insertions(+), 16 deletions(-)
---
diff --git a/eclipse-ptp-deps.patch b/eclipse-ptp-deps.patch
index e148156..a53b470 100644
--- a/eclipse-ptp-deps.patch
+++ b/eclipse-ptp-deps.patch
@@ -1,10 +1,24 @@
diff -up org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml
--- org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps 2011-09-23 07:53:39.000000000 -0600
-+++ org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml 2011-10-24 08:47:05.003337510 -0600
-@@ -60,20 +60,6 @@
++++ org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml 2011-10-24 13:34:13.521681362 -0600
+@@ -46,34 +46,6 @@
unpack="false"/>
<plugin
+- id="javax.xml"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="javax.xml.bind"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
- id="javax.xml.stream"
- download-size="0"
- install-size="0"
@@ -22,27 +36,57 @@ diff -up org.eclipse.ptp-v201110141146/releng/org.eclipse.ptp.rm.jaxb-feature/fe
id="org.eclipse.ptp.rm.jaxb.control.core"
download-size="0"
install-size="0"
+@@ -85,13 +57,6 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="javax.activation"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+ unpack="false"/>
+
+ </feature>
diff -up org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
--- org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps 2011-09-01 16:59:30.000000000 -0600
-+++ org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF 2011-10-21 14:48:52.586249165 -0600
-@@ -16,8 +16,7 @@ Require-Bundle: org.eclipse.core.runtime
++++ org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF 2011-10-24 13:16:25.558024346 -0600
+@@ -14,10 +14,6 @@ Require-Bundle: org.eclipse.core.runtime
+ org.eclipse.ptp.remote.core,
+ org.eclipse.ptp.core,
org.eclipse.ptp.rm.core,
- javax.xml;bundle-version="1.3.4",
- javax.xml.stream;bundle-version="1.0.1",
+- javax.xml;bundle-version="1.3.4",
+- javax.xml.stream;bundle-version="1.0.1",
- javax.xml.bind;bundle-version="2.1.9",
- com.sun.xml.bind;bundle-version="2.1.9",
-+ javax.xml.bind;bundle-version="2.0.0",
org.eclipse.cdt.debug.core;bundle-version="7.1.0",
org.eclipse.core.variables;bundle-version="3.2.400"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff -up org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF
--- org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps 2011-08-10 07:16:41.000000000 -0600
-+++ org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF 2011-10-21 14:48:47.624426901 -0600
-@@ -17,6 +17,5 @@ Bundle-Vendor: %pluginProvider
- Require-Bundle: org.eclipse.core.runtime,
- javax.xml;bundle-version="1.3.4",
- javax.xml.stream;bundle-version="1.0.1",
++++ org.eclipse.ptp-v201110141146/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF 2011-10-24 13:16:32.262792082 -0600
+@@ -14,9 +14,5 @@ Export-Package: org.eclipse.ptp.rm.lml.c
+ Bundle-Activator: org.eclipse.ptp.rm.lml.core.LMLCorePlugin
+ Bundle-ActivationPolicy: lazy
+ Bundle-Vendor: %pluginProvider
+-Require-Bundle: org.eclipse.core.runtime,
+- javax.xml;bundle-version="1.3.4",
+- javax.xml.stream;bundle-version="1.0.1",
- javax.xml.bind;bundle-version="2.1.9",
- com.sun.xml.bind;bundle-version="2.1.9"
-+ javax.xml.bind;bundle-version="2.0.0",
++Require-Bundle: org.eclipse.core.runtime
Bundle-Localization: plugin
+diff -up org.eclipse.ptp-v201110141146/tools/etfw/org.eclipse.ptp.etfw.parallel/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201110141146/tools/etfw/org.eclipse.ptp.etfw.parallel/META-INF/MANIFEST.MF
+--- org.eclipse.ptp-v201110141146/tools/etfw/org.eclipse.ptp.etfw.parallel/META-INF/MANIFEST.MF.deps 2011-09-12 18:34:36.000000000 -0600
++++ org.eclipse.ptp-v201110141146/tools/etfw/org.eclipse.ptp.etfw.parallel/META-INF/MANIFEST.MF 2011-10-24 13:23:44.881741466 -0600
+@@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.ptp.core,
+ org.eclipse.ptp.launch,
+ org.eclipse.ptp.debug.core,
+ org.eclipse.ptp.remote.core,
+- org.eclipse.ptp.remote.ui;bundle-version="5.0.0",
+- org.eclipse.ptp.rm.jaxb.control.core;bundle-version="2.0.0"
++ org.eclipse.ptp.remote.ui;bundle-version="5.0.0"
+ Bundle-Vendor: %pluginProvider
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 24101ab..d8926b1 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -33,7 +33,6 @@ BuildRequires: eclipse-cdt-parsers >= %{cdtreq}
BuildRequires: eclipse-jgit
BuildRequires: eclipse-rse >= %{rsereq}
BuildRequires: lpg-java-compat = 1.1.0
-BuildRequires: ws-jaxme
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -273,7 +272,7 @@ sed -i -e 's/os="linux"//' photran/org.eclipse.photran.intel-feature/feature.xml
#Fix line endings, causes problems with pdebuild link names
find -name MANIFEST.MF -exec sed -i -e 's|\r||' {} +
mkdir orbitDeps
-build-jar-repository -s -p orbitDeps xml-commons-apis jaxme/jaxmeapi.jar
+#build-jar-repository -s -p orbitDeps jaxme/jaxmeapi.jar
# Needed for shared license references to work
mv releng/org.eclipse.ptp.license-feature releng/org.eclipse.ptp.license
ln -s ../releng/org.eclipse.ptp.license photran/
@@ -295,7 +294,7 @@ rm -rf cdtdb-4.0.3-eclipse
# main feature and others. Use -Dnoclean=true so the aggregate features don't remove
# needed pre-built dependencies
# remotejars attempts to bundle up jars and fails to build
-for feature in org.eclipse.ptp.{utils,services,remote,remotetools} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp.rdt org.eclipse.ptp.rm.jaxb org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.upc,rdt.{sync,sync.fortran,xlc},remote.rse,sci,sdk}
+for feature in org.eclipse.ptp.{utils,services,remote,remotetools} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp.rdt{,.sync,.sync.fortran,.xlc} org.eclipse.ptp.core org.eclipse.ptp.rm.jaxb org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.upc,remote.rse,sci,sdk}
do
%{eclipse_arch_base}/buildscripts/pdebuild -d "cdt cdt-parsers jgit rse" \
-f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5 -Dnoclean=true" -o `pwd`/orbitDeps
More information about the scm-commits
mailing list