[eclipse-ptp/f16] - Add BR on ws-jaxme, add jaxmeapi and xml-commons-apis to orbitDeps - Add patch to remove unneeded
Orion Poplawski
orion at fedoraproject.org
Thu Sep 1 20:50:34 UTC 2011
commit 5dc0d88f89d13b3bd8e3c6b1ab9eba32edf65dc5
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Sep 1 14:50:22 2011 -0600
- Add BR on ws-jaxme, add jaxmeapi and xml-commons-apis to orbitDeps
- Add patch to remove unneeded dependencies
- Add BR on eclipse-jgit
- Add sdk and photran components to ptp-master
- Add rdt-sync, rdt-sync-fortran, and sdk sub-packages
- Fixup some requires
- Improve the finddeps.sh utility script
eclipse-ptp-deps.patch | 65 ++++++++++++++++++++++++++++++++++++
eclipse-ptp.spec | 86 ++++++++++++++++++++++++++++++++++++++++++++----
finddeps.sh | 46 ++++++++++++++++++++++----
3 files changed, 183 insertions(+), 14 deletions(-)
---
diff --git a/eclipse-ptp-deps.patch b/eclipse-ptp-deps.patch
new file mode 100644
index 0000000..2cb4fd3
--- /dev/null
+++ b/eclipse-ptp-deps.patch
@@ -0,0 +1,65 @@
+diff -up org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml
+--- org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml.deps 2011-05-25 20:08:10.000000000 -0600
++++ org.eclipse.ptp-v201107131351/releng/org.eclipse.ptp.rm.jaxb-feature/feature.xml 2011-08-31 14:30:43.209362459 -0600
+@@ -60,20 +60,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="javax.xml.stream"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+- id="com.sun.xml.bind"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.ptp.rm.jaxb.control.core"
+ download-size="0"
+ install-size="0"
+diff -up org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF
+--- org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF.deps 2011-05-18 19:50:32.000000000 -0600
++++ org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.jaxb.core/META-INF/MANIFEST.MF 2011-08-31 15:25:43.325615919 -0600
+@@ -15,10 +15,7 @@ Require-Bundle: org.eclipse.core.runtime
+ 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.bind;bundle-version="2.1.9",
+- com.sun.xml.bind;bundle-version="2.1.9",
+- javax.activation;bundle-version="1.1.0",
++ 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-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF
+--- org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF.deps 2011-06-04 09:02:38.000000000 -0600
++++ org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.core/META-INF/MANIFEST.MF 2011-08-31 15:25:26.426143517 -0600
+@@ -19,8 +19,6 @@ Require-Bundle: org.eclipse.ui,
+ org.eclipse.debug.core,
+ org.eclipse.ptp.remote.core,
+ 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.ptp.core
+ Bundle-Localization: plugin
+diff -up org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF.deps org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF
+--- org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF.deps 2011-06-04 09:01:39.000000000 -0600
++++ org.eclipse.ptp-v201107131351/rms/org.eclipse.ptp.rm.lml.ui/META-INF/MANIFEST.MF 2011-08-31 15:25:37.000813481 -0600
+@@ -6,8 +6,7 @@ Bundle-Version: 1.0.0.qualifier
+ Bundle-Localization: plugin
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: javax.xml;bundle-version="1.3.4",
+- javax.xml.bind;bundle-version="2.1.9",
+- javax.xml.stream;bundle-version="1.0.1",
++ javax.xml.bind;bundle-version="2.0.0",
+ org.eclipse.ui;bundle-version="3.6.1",
+ org.eclipse.core.runtime,
+ org.eclipse.ptp.rm.lml.core;bundle-version="1.0.0",
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 39cc427..a7db628 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -23,17 +23,24 @@ Source1: makesource.sh
Source2: cdtdb-4.0.3-eclipse.jar
# To help generate the needed Requires
Source3: finddeps.sh
+# Remove some unneeded dependencies
+Patch0: eclipse-ptp-deps.patch
BuildRequires: java-devel >= 1.5.0
BuildRequires: eclipse-pde >= %{pdereq}
BuildRequires: eclipse-cdt-parsers >= %{cdtreq}
#BuildRequires: eclipse-cdt-tests
# >= 1:6.0.2
+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
+Requires: eclipse-cdt >= %{cdtreq}
+# Pulled in by rdt.remotetools being in ptp main
+Requires: %{name}-rdt = %{version}-%{release}
%description
The aim of the parallel tools platform project is to produce an open-source
@@ -68,6 +75,10 @@ Requires: %{name}-rdt = %{version}-%{release}
Requires: %{name}-rdt-xlc = %{version}-%{release}
Requires: %{name}-remote-rse = %{version}-%{release}
Requires: %{name}-sci = %{version}-%{release}
+Requires: %{name}-sdk = %{version}-%{release}
+Requires: eclipse-photran = %{photranver}-%{release}
+Requires: eclipse-photran-intel = %{photranver}-%{release}
+Requires: eclipse-photran-xlf = %{photranver}-%{release}
%description master
The package will bring in all of the PTP components.
@@ -97,6 +108,7 @@ to the TAU performance analysis system.
%package etfw-tau-fortran
Summary: PTP External Tools Framework: TAU Fortran Enabler
Group: Development/Libraries
+Requires: %{name}-etfw-tau = %{version}-%{release}
Requires: eclipse-photran = %{photranver}-%{release}
BuildArch: noarch
@@ -142,6 +154,8 @@ Adds a range of static analysis and programming assistance tools.
Summary: PTP Remote Development Tools
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: eclipse-jgit
+Requires: eclipse-rse >= %{rsereq}
Provides: %{name}-rdt-remotetools = %{version}-%{release}
Obsoletes: %{name}-rdt-remotetools < %{version}-%{release}
BuildArch: noarch
@@ -149,10 +163,32 @@ BuildArch: noarch
%description rdt
PTP components for supporting Remote Development Tools.
+%package rdt-sync
+Summary: PTP Remote Synchronization Support
+Group: Development/Libraries
+Requires: %{name}-rdt = %{version}-%{release}
+Requires: eclipse-cdt-parsers >= %{cdtreq}
+BuildArch: noarch
+
+%description rdt-sync
+Adds the ability to remotely synchronize projects.
+
+
+%package rdt-sync-fortran
+Summary: PTP Fortran Synchronization Support
+Group: Development/Libraries
+Requires: %{name}-rdt-sync = %{version}-%{release}
+BuildArch: noarch
+
+%description rdt-sync-fortran
+Adds the ability to remotely synchronize Fortran projects.
+
+
%package rdt-xlc
Summary: PTP Remote Development Tools XL C/C++ Compiler Support
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-rdt = %{version}-%{release}
+Requires: eclipse-cdt-parsers >= %{cdtreq}
BuildArch: noarch
%description rdt-xlc
@@ -162,7 +198,6 @@ Remote support for the IBM XL C/C++ compilers.
%package sci
Summary: PTP Scalable Communication Infrastructure (SCI)
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description sci
@@ -170,6 +205,16 @@ Parallel Tools Platform components that implements the Scalable Communication
Infrastructure (SCI).
+%package sdk
+Summary: Parallel Tools Platform SDK
+Group: Development/Libraries
+BuildArch: noarch
+
+%description sdk
+Eclipse Parallel Tools Platform. Software development kit including source
+code and developer documentation.
+
+
%package -n eclipse-photran
Version: %{photranver}
Summary: Photran End-User Runtime
@@ -217,6 +262,7 @@ Provides support for remote services using RSE.
%prep
%setup -q -n org.eclipse.ptp-%{reltag}
+%patch0 -p1 -b .deps
find -name \*.jar -exec rm {} +
mkdir cdtdb-4.0.3-eclipse
pushd cdtdb-4.0.3-eclipse
@@ -228,9 +274,12 @@ 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
# 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/
+# Incorrectly tagged
+rm rdt/org.eclipse.ptp.rdt.managedbuilder.gnu.ui/src/org/eclipse/ptp/rdt/managedbuilder/gnu/ui/scannerdiscovery/PerProjectSICollectorSkipCygTrans.java
%build
@@ -245,12 +294,13 @@ popd
#Interferes with feature build
rm -rf cdtdb-4.0.3-eclipse
-#We need to build some core features first due to dependencies, then we can build the
-#main feature and others. Use -Dnoclean=true so the aggregate features don't remove
-#needed pre-built dependencies
-for feature in org.eclipse.ptp.{utils,services,remote,remotetools} org.eclipse.photran org.eclipse.photran.{intel,xlf} org.eclipse.ptp org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.upc,rdt,rdt.xlc,remote.rse,sci}
+# We need to build some core features first due to dependencies, then we can build the
+# 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 org.eclipse.ptp.{etfw.{ppw,tau,tau.fortran},gem,pldt.upc,rdt.{sync,sync.fortran,xlc},remote.rse,sci,sdk}
do
- %{eclipse_arch_base}/buildscripts/pdebuild -d "cdt cdt-parsers rse" \
+ %{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
done
@@ -315,6 +365,16 @@ rm -rf ${RPM_BUILD_ROOT}
%doc releng/org.eclipse.ptp.master/epl-v10.html
%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt
+%files rdt-sync
+%defattr(-,root,root,-)
+%doc releng/org.eclipse.ptp.master/epl-v10.html
+%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sync
+
+%files rdt-sync-fortran
+%defattr(-,root,root,-)
+%doc releng/org.eclipse.ptp.master/epl-v10.html
+%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sync.fortran
+
%files rdt-xlc
%defattr(-,root,root,-)
%doc releng/org.eclipse.ptp.master/epl-v10.html
@@ -330,6 +390,11 @@ rm -rf ${RPM_BUILD_ROOT}
%doc releng/org.eclipse.ptp.master/epl-v10.html
%{eclipse_noarch_base}/dropins/org.eclipse.ptp.sci
+%files sdk
+%defattr(-,root,root,-)
+%doc releng/org.eclipse.ptp.master/epl-v10.html
+%{eclipse_noarch_base}/dropins/org.eclipse.ptp.sdk
+
%files -n eclipse-photran
%defattr(-,root,root,-)
%doc releng/org.eclipse.ptp.master/epl-v10.html
@@ -351,6 +416,13 @@ rm -rf ${RPM_BUILD_ROOT}
- Update to PTP 5.0.1, photran 7.0.1
- Bump CDT and PDE requirement
- Work around issue with pdebuild shared license feature
+- Add BR on ws-jaxme, add jaxmeapi and xml-commons-apis to orbitDeps
+- Add patch to remove unneeded dependencies
+- Add BR on eclipse-jgit
+- Add sdk and photran components to ptp-master
+- Add rdt-sync, rdt-sync-fortran, and sdk sub-packages
+- Fixup some requires
+- Improve the finddeps.sh utility script
* Wed May 18 2011 Orion Poplawski <orion at cora.nwra.com> - 4.0.7-1
- Update to PTP 4.0.7, photran 6.0.7
diff --git a/finddeps.sh b/finddeps.sh
index e1111dd..bdcf8c7 100755
--- a/finddeps.sh
+++ b/finddeps.sh
@@ -1,21 +1,53 @@
find org.eclipse.ptp-v* -name feature.xml | sort | while read f
do
- fname=$(echo $f | sed -e 's,.*org.,,' -e 's,-feature.*,,' -e 's,\.,-,g')
- #echo Feature $fname:
- deps=$(grep -F 'import plugin' $f | sed -e 's,.*plugin=",,' -e 's,".*,,' | while read p
+ #fname=$(echo $f | sed -e 's,.*org.,,' -e 's,-feature.*,,' -e 's,\.,-,g')
+ fname=$(echo $f | sed -e 's,.*org.,org.,' -e 's,-feature.*,,')
+ echo -n "Feature $fname "
+ dir=`find /usr/*/eclipse -name ${fname}_\* | grep -F /features/`
+ if [ -z "$dir" ]
+ then
+ echo -n "(not found): "
+ else
+ rpm=$(rpm -qf $dir --qf '%{NAME}\n')
+ echo -n "($rpm): "
+ fi
+ pdeps=$(grep -F 'import plugin' $f | sed -e 's,.*plugin=",,' -e 's,".*,,' | while read p
do
jar=`find /usr/*/eclipse -name ${p}_\* | grep plugin`
if [ -z "${jar}" ]
then
- echo Searching for $p found nothing 1>&2
+ echo Searching for plugin $p found nothing 1>&2
continue
fi
rpm=$(rpm -qf $jar --qf '%{NAME}\n')
if [ "${rpm/ /}" != "${rpm}" ]
then
- echo Searching for $p found $jar in rpms $rpm 1>&2
+ echo Searching for plugin $p found $jar in rpms $rpm 1>&2
fi
echo $rpm
done | sort -u)
- echo $fname: $deps
-done # > deps
+ fdeps=$(grep -F 'import feature' $f | sed -e 's,.*feature=",,' -e 's,".*,,' -e 's/_feature//' | while read p
+ do
+ jar=`find /usr/*/eclipse -name ${p}_\* | grep feature`
+ if [ -z "${jar}" ]
+ then
+ echo Searching for feature $p found nothing 1>&2
+ continue
+ fi
+ rpm=$(rpm -qf $jar --qf '%{NAME}\n')
+ if [ "${rpm/ /}" != "${rpm}" ]
+ then
+ echo Searching for feature $p found $jar in rpms $rpm 1>&2
+ fi
+ echo $rpm
+ done | sort -u)
+ echo $pdeps / $fdeps
+done
+
+# Make sure no duplicates
+find /usr/share/eclipse/dropins/org.eclipse.{ptp,photran}*/plugins -name \*.jar | sed s/_.*/_/ | sort -u | while read jardir
+do
+ jar=`basename $jardir`
+ n=`find /usr/*/eclipse/dropins/org.eclipse.{ptp,photran}*/plugins -name ${jar}\* | wc -l`
+ [ $n -gt 1 ] && echo $jar is duplicated && find /usr/*/eclipse/dropins/org.eclipse.{ptp,photran}*/plugins -name ${jar}\*
+done
More information about the scm-commits
mailing list