[eclipse-ptp: 2/3] Update to PTP 6.0.3, photran 8.0.3 Use maven/tycho for building, major rework of spec Add patch remo
Orion Poplawski
orion at fedoraproject.org
Tue Dec 4 22:55:07 UTC 2012
commit ba88e5beca793aa8ed1b44ea3f702b7f3fb6d574
Author: Orion Poplawski <orion at nwra.com>
Date: Tue Dec 4 15:53:34 2012 -0700
Update to PTP 6.0.3, photran 8.0.3
Use maven/tycho for building, major rework of spec
Add patch remove ant-trax dependency, fix maven jdk tools.jar dep
Drop overrides patch
Move pldt and rdt-sync into the main package
Add fortran meta sub-package to bring in Fortran support
Drop cdt-compilers, rdt-sdk, and rdt-xlc-sdk sub-packages
.gitignore | 2 +
eclipse-ptp-notrax.patch | 68 +++++++++
eclipse-ptp.spec | 352 ++++++++++++++++++++--------------------------
makesource.sh | 4 +-
sources | 4 +-
5 files changed, 228 insertions(+), 202 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f80ad9e..cfa97c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
/org.eclipse.photran-7.0.7.tar.xz
/org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068.tar.gz
/org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf.tar.gz
+/org.eclipse.ptp-a0dac268418a969d9a24e8f641827238d2d5f0ce.tar.gz
+/org.eclipse.photran-7c45b16ff335f6d0d4fc0cc0983ec19bbffa0922.tar.gz
diff --git a/eclipse-ptp-notrax.patch b/eclipse-ptp-notrax.patch
new file mode 100644
index 0000000..e39b8aa
--- /dev/null
+++ b/eclipse-ptp-notrax.patch
@@ -0,0 +1,68 @@
+diff -up org.eclipse.ptp-PTP_6_0_2/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml.notrax org.eclipse.ptp-PTP_6_0_2/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml
+--- org.eclipse.ptp-PTP_6_0_2/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml.notrax 2012-09-17 22:22:14.000000000 -0600
++++ org.eclipse.ptp-PTP_6_0_2/rdt/org.eclipse.ptp.rdt.core.remotejars/pom.xml 2012-12-04 09:06:51.725528197 -0700
+@@ -29,15 +29,6 @@
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+- <dependencies>
+- <dependency>
+- <groupId>com.sun</groupId>
+- <artifactId>tools</artifactId>
+- <version>1.5.0</version>
+- <scope>system</scope>
+- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+- </dependency>
+- </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+@@ -59,9 +50,11 @@
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+- <groupId>ant</groupId>
+- <artifactId>ant-trax</artifactId>
+- <version>1.6.5</version>
++ <groupId>com.sun</groupId>
++ <artifactId>tools</artifactId>
++ <version>1.5.0</version>
++ <scope>system</scope>
++ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <executions>
+diff -up org.eclipse.ptp-PTP_6_0_2/rms/org.eclipse.ptp.rm.lml.da.server/pom.xml.notrax org.eclipse.ptp-PTP_6_0_2/rms/org.eclipse.ptp.rm.lml.da.server/pom.xml
+--- org.eclipse.ptp-PTP_6_0_2/rms/org.eclipse.ptp.rm.lml.da.server/pom.xml.notrax 2012-09-17 22:22:14.000000000 -0600
++++ org.eclipse.ptp-PTP_6_0_2/rms/org.eclipse.ptp.rm.lml.da.server/pom.xml 2012-12-04 09:06:56.862500051 -0700
+@@ -28,15 +28,6 @@
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+- <dependencies>
+- <dependency>
+- <groupId>com.sun</groupId>
+- <artifactId>tools</artifactId>
+- <version>1.5.0</version>
+- <scope>system</scope>
+- <systemPath>${java.home}/../lib/tools.jar</systemPath>
+- </dependency>
+- </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+@@ -50,9 +41,11 @@
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+- <groupId>ant</groupId>
+- <artifactId>ant-trax</artifactId>
+- <version>1.6.5</version>
++ <groupId>com.sun</groupId>
++ <artifactId>tools</artifactId>
++ <version>1.5.0</version>
++ <scope>system</scope>
++ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <executions>
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index f8c4dd2..0382482 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,5 +1,5 @@
-%global ptpver 6.0.1
-%global photranver 8.0.1
+%global ptpver 6.0.3
+%global photranver 8.0.3
%global eclipse_noarch_base %{_datadir}/eclipse
%global eclipse_arch_base %{_libdir}/eclipse
%global cdtreq 1:8.1.0
@@ -10,10 +10,12 @@
%else
%global pdebuild %{eclipse_arch_base}/buildscripts/pdebuild
%endif
-%global ptp_build_id 201206130201
-%global ptp_git_tag PTP_6_0_1
-%global photran_build_id 201206122044
-%global photran_git_tag PTP_6_0_1
+%global ptp_build_id 201211112147
+#global ptp_git_tag PTP_6_0_2
+%global ptp_git_tag a0dac268418a969d9a24e8f641827238d2d5f0ce
+%global photran_build_id 201211112133
+#global photran_git_tag PTP_6_0_2
+%global photran_git_tag 7c45b16ff335f6d0d4fc0cc0983ec19bbffa0922
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -38,14 +40,15 @@ URL: http://www.eclipse.org/ptp
# The following tarballs were downloaded from the git repositories
Source0: http://git.eclipse.org/c/ptp/org.eclipse.ptp.git/snapshot/org.eclipse.ptp-%{ptp_git_tag}.tar.gz
Source1: http://git.eclipse.org/c/ptp/org.eclipse.photran.git/snapshot/org.eclipse.photran-%{photran_git_tag}.tar.gz
+# These are made with makesource.sh
+#Source0: org.eclipse.ptp-%{ptp_git_tag}.tar.xz
+#Source1: org.eclipse.photran-%{photran_git_tag}.tar.xz
Source2: makesource.sh
# To help generate the needed Requires
Source3: finddeps.sh
-# Remove extra gtk arches for tycho build (see bug 837967)
-Patch0: eclipse-ptp-tycho-build.patch
-# Patch so Java compiler won't fail when interface methods are implemented with override statement
-Patch1: %{name}-remove-overrides.patch
+# Remove dependency specifications on ant-trax
+Patch0: eclipse-ptp-notrax.patch
# Remove some unneeded dependencies
BuildRequires: java-devel >= 1.5.0
@@ -64,8 +67,18 @@ BuildArch: noarch
Requires: eclipse-cdt >= %{cdtreq}
# Pulled in by rdt.remotetools being in ptp main
Requires: %{name}-rdt = %{version}-%{release}
+Provides: %{name}-cdt-compilers = %{version}-%{release}
+Obsoletes: %{name}-cdt-compilers < %{version}-%{release}
+Provides: %{name}-pldt = %{version}-%{release}
+Obsoletes: %{name}-pldt < %{version}-%{release}
Provides: %{name}-rdt-remotetools = %{version}-%{release}
Obsoletes: %{name}-rdt-remotetools < %{version}-%{release}
+Provides: %{name}-rdt-sdk = %{version}-%{release}
+Obsoletes: %{name}-rdt-sdk < %{version}-%{release}
+Provides: %{name}-rdt-sync = %{version}-%{release}
+Obsoletes: %{name}-rdt-sync < %{version}-%{release}
+Provides: %{name}-rdt-xlc-sdk = %{version}-%{release}
+Obsoletes: %{name}-rdt-xlc-sdk < %{version}-%{release}
%description
The aim of the parallel tools platform project is to produce an open-source
@@ -91,20 +104,17 @@ Requires: eclipse-cdt >= %{cdtreq}
Requires: %{name} = %{version}-%{release}
#master package is a virtual package that requires all of the components
-Requires: %{name}-cdt-compilers = %{version}-%{release}
Requires: %{name}-etfw-ppw = %{version}-%{release}
Requires: %{name}-etfw-tau = %{version}-%{release}
Requires: %{name}-etfw-tau-fortran = %{version}-%{release}
+Requires: %{name}-fortran = %{version}-%{release}
Requires: %{name}-gem = %{version}-%{release}
-Requires: %{name}-rm-contrib = %{version}-%{release}
Requires: %{name}-pldt-fortran = %{version}-%{release}
-Requires: %{name}-pldt-openacc = %{version}-%{release}
Requires: %{name}-pldt-upc = %{version}-%{release}
Requires: %{name}-rdt = %{version}-%{release}
-Requires: %{name}-rdt-sdk = %{version}-%{release}
Requires: %{name}-rdt-xlc = %{version}-%{release}
-Requires: %{name}-rdt-xlc-sdk = %{version}-%{release}
Requires: %{name}-remote-rse = %{version}-%{release}
+Requires: %{name}-rm-contrib = %{version}-%{release}
Requires: %{name}-sci = %{version}-%{release}
Requires: %{name}-sdk = %{version}-%{release}
Requires: eclipse-photran = %{photranver}-%{release}
@@ -115,17 +125,6 @@ Requires: eclipse-photran-xlf = %{photranver}-%{release}
The package will bring in all of the PTP components.
-%package cdt-compilers
-Summary: Cray, PGI, and Open64 C/C++ Compiler Support
-Group: Development/Tools
-Requires: eclipse-cdt >= %{cdtreq}
-BuildArch: noarch
-
-%description cdt-compilers
-Provides CDT error parsers C/C++ compilers from Cray, the Portland Group, and
-the Open64 project.
-
-
%package etfw-ppw
Summary: PTP Parallel Performance Wizard (PPW)
Group: Development/Libraries
@@ -159,6 +158,22 @@ Adds selective instrumentation functionality for Fortran via the
Photran project.
+%package fortran
+Summary: PTP Fortran Support
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-etfw-tau-fortran = %{version}-%{release}
+Requires: %{name}-pldt-fortran = %{version}-%{release}
+Requires: %{name}-rdt-sync-fortran = %{version}-%{release}
+Requires: eclipse-photran = %{photranver}-%{release}
+Requires: eclipse-photran-intel = %{photranver}-%{release}
+Requires: eclipse-photran-xlf = %{photranver}-%{release}
+BuildArch: noarch
+
+%description fortran
+Adds Fortran support to PTP.
+
+
%package gem
Summary: PTP Graphical Explorer of MPI Programs (GEM)
Group: Development/Libraries
@@ -193,17 +208,6 @@ BuildArch: noarch
Adds a range of static analysis and programming assistance tools for Fortran.
-%package pldt-openacc
-Summary: PTP Parallel Language Development Tools OpenACC Support
-Group: Development/Libraries
-Requires: eclipse-cdt-parsers >= %{cdtreq}
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description pldt-openacc
-PTP Parallel Language Development Tools support for OpenACC.
-
-
%package pldt-upc
Summary: PTP Parallel Language Development Tools UPC Support
Group: Development/Libraries
@@ -212,7 +216,9 @@ Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description pldt-upc
-Adds a range of static analysis and programming assistance tools.
+Adds a range of static analysis and programming assistance tools for UPC.
+Note: this is separated from the rest of PLDT since it requires the UPC
+feature of CDT, which is sometimes not installed with CDT.
%package rdt
@@ -226,25 +232,6 @@ BuildArch: noarch
%description rdt
PTP components for supporting Remote Development Tools.
-%package rdt-sdk
-Summary: PTP Remote Development Tools SDK
-Group: Development/Libraries
-Requires: %{name}-rdt = %{version}-%{release}
-BuildArch: noarch
-
-%description rdt-sdk
-PTP components for supporting Remote Development Tools SDK.
-
-
-%package rdt-sync
-Summary: PTP Remote Synchronization Support
-Group: Development/Libraries
-Requires: eclipse-jgit
-BuildArch: noarch
-
-%description rdt-sync
-Adds the ability to remotely synchronize projects.
-
%package rdt-sync-fortran
Summary: PTP Fortran Synchronization Support
@@ -267,18 +254,6 @@ BuildArch: noarch
Remote support for the IBM XL C/C++ compilers.
-%package rdt-xlc-sdk
-Summary: PTP Remote Development Tools XL C/C++ Compiler Support SDK
-Group: Development/Libraries
-Requires: %{name}-rdt-sdk = %{version}-%{release}
-Requires: %{name}-rdt-xlc = %{version}-%{release}
-Requires: eclipse-cdt-parsers >= %{cdtreq}
-BuildArch: noarch
-
-%description rdt-xlc-sdk
-Remote support for the IBM XL C/C++ compilers (SDK).
-
-
%package rm-contrib
Summary: PTP Contributed Resource Manager Definitions
Group: Development/Libraries
@@ -356,26 +331,14 @@ Provides support for remote services using RSE.
%prep
%setup -q -c -T -a 0 -a 1
-
-# Move the commit snapshot contents up one directory so we can build
-# as normal
-#pushd org.eclipse.photran-%{photran_git_tag}
-#mv * ..
-#popd
-#pushd org.eclipse.ptp-%{ptp_git_tag}
-#mv * ..
-#popd
-#rm -rf org.eclipse.photran-%{photran_git_tag}
-#rm -rf org.eclipse.ptp-%{ptp_git_tag}
-#%patch1 -p1 -b .overrides
-#patch0 -p1 -b .tycho-build
+# Fix tycho version
+sed -i -e '/tycho-version/s/0.15.0/0.16.0/' */pom.xml
pushd org.eclipse.ptp-%{ptp_git_tag}
-%pom_disable_module rdt/org.eclipse.ptp.rdt.core.remotejars
-%pom_disable_modules releng/org.eclipse.ptp.rdt.remotejars-feature
-#sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+%patch0 -p1 -b .notrax
+# Copy into place for %doc
+cp releng/org.eclipse.ptp-feature/epl-v10.html ..
popd
-cd org.eclipse.photran-%{photran_git_tag}
-#sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+pushd org.eclipse.photran-%{photran_git_tag}
# We need to rebuild this jar from the sources within it
pwd
@@ -390,10 +353,12 @@ find -name \*.jar -exec rm {} +
sed -i -e 's/os="linux"//' 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||' {} +
+popd
+
%build
export JAVA_HOME=%{java_home}
-export PATH=%{java_bin}:/usr/bin:$PATH
+export PATH=/usr/bin:$PATH
# Build the helper jar first
pushd org.eclipse.photran-%{photran_git_tag}/cdtdb-4.0.3-eclipse
classpath=$(echo %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar | sed -e 's/ /:/g')
@@ -402,150 +367,141 @@ jar cf ../org.eclipse.rephraserengine.core/cdtdb-4.0.3-eclipse.jar *
popd
#Interferes with feature build
rm -rf cdtdb-4.0.3-eclipse
-
+# Build the projects
pushd org.eclipse.photran-%{photran_git_tag}
-mvn-rpmbuild install
+mvn-rpmbuild -Dmaven.repo.local=../.m2 -DforceContextQualifier=%{photran_build_id} install
popd
pushd org.eclipse.ptp-%{ptp_git_tag}
-mvn-rpmbuild install
+mvn-rpmbuild -Dmaven.repo.local=../.m2 -DforceContextQualifier=%{ptp_build_id} install
popd
-# 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 run git and fails to build
-#for feature in org.eclipse.ptp.{utils,services,remote,remotetools,core} org.eclipse.photran org.eclipse.ptp.rdt{.editor,,.sdk,.sync,.sync.fortran,.xlc{,.sdk}} org.eclipse.ptp.rm.jaxb{,.contrib} org.eclipse.ptp org.eclipse.ptp.{cdt.compilers,etfw.{ppw,tau,tau.fortran},gem,pldt.{fortran,openacc,upc},remote.rse,sci,sdk}
-#for feature in org.eclipse.ptp.master org.eclipse.photran org.eclipse.ptp.rdt{.editor,,.sdk,.sync,.sync.fortran,.xlc{,.sdk}} org.eclipse.ptp.rm.jaxb{,.contrib} org.eclipse.ptp org.eclipse.ptp.{cdt.compilers,etfw.{ppw,tau,tau.fortran},gem,pldt.{fortran,openacc,upc},remote.rse,sci,sdk} org.eclipse.photran.{intel,xlf}
-#do
-# # some features use a different timestamp qualifier
-# if [ ${feature/ptp/} != $feature ]
-# then
-# timestamp=%{ptp_build_id}
-# else
-# timestamp=%{photran_build_id}
-# fi
-# %{pdebuild} -d "cdt cdt-parsers jgit rse" \
-# -f $feature -a "-DjavacSource=1.6 -DjavacTarget=1.6 \
-# -Dnoclean=true -DforceContextQualifier=%{ptp_build_id} -DflattenDependencies=true -DparallelCompilation=true"
-#done
-
%install
-rm -rf ${RPM_BUILD_ROOT}
-#Cleanup some pre-built features
-for zip in build/rpmBuild/org.eclipse.ptp.{core,utils,services,remote,remotetools,rm.jaxb}.zip
-do
- rm $zip
-done
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/{features,plugins}
-#Install all of the remaining features
-for zip in build/rpmBuild/*.zip
+# ptp
+for jar in org.eclipse.ptp-%{ptp_git_tag}/releng/org.eclipse.ptp.repo/target/repository/features/*.jar
do
- feature=`basename $zip .zip`
- install -d -m755 ${RPM_BUILD_ROOT}%{eclipse_noarch_base}/dropins/${feature}
-
- unzip -o -d ${RPM_BUILD_ROOT}%{eclipse_noarch_base}/dropins/${feature} \
- build/rpmBuild/${feature}.zip
- mv ${RPM_BUILD_ROOT}%{eclipse_noarch_base}/dropins/${feature}/eclipse/* \
- ${RPM_BUILD_ROOT}%{eclipse_noarch_base}/dropins/${feature}
- rmdir ${RPM_BUILD_ROOT}%{eclipse_noarch_base}/dropins/${feature}/eclipse
+ name=$(basename $jar .jar)
+ unzip -u -d %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/$name $jar
+ if [ $name == org.eclipse.ptp_%{version}.%{ptp_build_id} ]
+ then
+ # Group the core features
+ sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_noarch_base}/dropins/ptp/eclipse/features/\1_*#gp' %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 > files.$name
+ # Add the plugins for those features
+ sed -ne '/id=/s#.*"\(.*\)"#\1#gp' %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 | while read f
+ do
+ [ $f == org.eclipse.ptp ] && continue
+ sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_noarch_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/${f}_*/feature.xml | tail -n +2 >> files.$name
+ done
+ sort -u -o files.$name files.$name
+ else
+ sed -ne '/id=/s#.*"\(.*\)"#%{eclipse_noarch_base}/dropins/ptp/eclipse/plugins/\1_*.jar#gp' %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/features/$name/feature.xml | tail -n +2 > files.$name
+ fi
done
+cp -u org.eclipse.ptp-%{ptp_git_tag}/releng/org.eclipse.ptp.repo/target/repository/plugins/*.jar \
+ %{buildroot}%{eclipse_noarch_base}/dropins/ptp/eclipse/plugins/
+# special case for rephraserengine feature included in photran
+sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{photranver}.%{photran_build_id}
-%files
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp
-
-%files master
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-
-%files cdt-compilers
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.cdt.compilers
-%files etfw-ppw
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.etfw.ppw
+%files -f files.org.eclipse.ptp_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%dir %{eclipse_noarch_base}/dropins/ptp
+%dir %{eclipse_noarch_base}/dropins/ptp/eclipse
+%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/features
+%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/plugins
-%files etfw-tau
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.etfw.tau
-
-%files etfw-tau-fortran
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.etfw.tau.fortran
+%files master
+%doc epl-v10.html
-%files gem
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.gem
+%files etfw-ppw -f files.org.eclipse.ptp.etfw.ppw_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.ppw_*
-%files pldt-fortran
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.pldt.fortran
+%files etfw-tau -f files.org.eclipse.ptp.etfw.tau_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau_*
-%files pldt-openacc
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.pldt.openacc
+%files etfw-tau-fortran -f files.org.eclipse.ptp.etfw.tau.fortran_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.etfw.tau.fortran_*
-%files pldt-upc
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.pldt.upc
+%files fortran
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.fortran_*
-%files rdt
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.editor
+%files gem -f files.org.eclipse.ptp.gem_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.gem_*
-%files rdt-sdk
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sdk
+%files pldt-fortran -f files.org.eclipse.ptp.pldt.fortran_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.pldt.fortran_*
-%files rdt-sync
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sync
+%files pldt-upc -f files.org.eclipse.ptp.pldt.upc_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.pldt.upc_*
-%files rdt-sync-fortran
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.sync.fortran
+%files rdt -f files.org.eclipse.ptp.rdt_%{version}.%{ptp_build_id} -f files.org.eclipse.ptp.rdt.editor_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt_*
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.editor_*
-%files rdt-xlc
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.xlc
+%files rdt-sync-fortran -f files.org.eclipse.ptp.rdt.sync.fortran_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.sync.fortran_*
-%files rdt-xlc-sdk
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rdt.xlc.sdk
+%files rdt-xlc -f files.org.eclipse.ptp.rdt.xlc_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rdt.xlc_*
-%files remote-rse
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.remote.rse
+%files remote-rse -f files.org.eclipse.ptp.remote.rse_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.remote.rse_*
-%files rm-contrib
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rm.jaxb.contrib
+%files rm-contrib -f files.org.eclipse.ptp.rm.jaxb.contrib_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.rm.jaxb.contrib_*
-%files sci
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.sci
+%files sci -f files.org.eclipse.ptp.sci_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sci_*
-%files sdk
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.ptp.sdk
+%files sdk -f files.org.eclipse.ptp.sdk_%{version}.%{ptp_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.ptp.sdk_*
-%files -n eclipse-photran
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.photran
+%files -n eclipse-photran -f files.org.eclipse.photran_%{photranver}.%{photran_build_id} -f files.org.eclipse.rephraserengine_%{photranver}.%{photran_build_id}
+%doc epl-v10.html
+%dir %{eclipse_noarch_base}/dropins/ptp
+%dir %{eclipse_noarch_base}/dropins/ptp/eclipse
+%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/features
+%dir %{eclipse_noarch_base}/dropins/ptp/eclipse/plugins
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.photran_*
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.rephraserengine_*
-%files -n eclipse-photran-intel
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.photran.intel
+%files -n eclipse-photran-intel -f files.org.eclipse.photran.intel_%{photranver}.%{photran_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.photran.intel_*
-%files -n eclipse-photran-xlf
-%doc releng/org.eclipse.ptp-feature/epl-v10.html
-%{eclipse_noarch_base}/dropins/org.eclipse.photran.xlf
+%files -n eclipse-photran-xlf -f files.org.eclipse.photran.xlf_%{photranver}.%{photran_build_id}
+%doc epl-v10.html
+%{eclipse_noarch_base}/dropins/ptp/eclipse/features/org.eclipse.photran.xlf_*
%changelog
+* Tue Nov 4 2012 Orion Poplawski <orion at cora.nwra.com> - 6.0.3-1
+- Update to PTP 6.0.3, photran 8.0.3
+- Use maven/tycho for building, major rework of spec
+- Add patch remove ant-trax dependency, fix maven jdk tools.jar dep
+- Drop overrides patch
+- Move pldt and rdt-sync into the main package
+- Add fortran meta sub-package to bring in Fortran support
+- Drop cdt-compilers, rdt-sdk, and rdt-xlc-sdk sub-packages
+
* Fri Jul 6 2012 Orion Poplawski <orion at cora.nwra.com> - 6.0.0-1
- Update to PTP 6.0.0, photran 8.0.0
diff --git a/makesource.sh b/makesource.sh
index a89af62..e4809be 100755
--- a/makesource.sh
+++ b/makesource.sh
@@ -9,12 +9,12 @@ ptptag=PTP_`echo $ptpver | sed 's/\./_/g'`
[ ! -d org.eclipse.ptp ] && git clone git://git.eclipse.org/gitroot/ptp/org.eclipse.ptp.git
pushd org.eclipse.ptp
git pull
-git archive $ptptag | xz -c > ../org.eclipse.ptp-${ptpver}.tar.xz
+git archive --prefix org.eclipse.ptp-$ptp_git_tag/ $ptp_git_tag | xz -c > ../org.eclipse.ptp-${ptp_git_tag}.tar.xz
popd
# Checkout and create photran tarball
[ ! -d org.eclipse.photran ] && git clone git://git.eclipse.org/gitroot/ptp/org.eclipse.photran.git
pushd org.eclipse.photran
git pull
-git archive $ptptag | xz -c > ../org.eclipse.photran-${photranver}.tar.xz
+git archive --prefix org.eclipse.photran-$photran_git_tag/ $photran_git_tag | xz -c > ../org.eclipse.photran-${photran_git_tag}.tar.xz
popd
diff --git a/sources b/sources
index 808bcab..45e9321 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-722abd97ec46320e86f7191c3e309d5b org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068.tar.gz
-46e89d98fd151ec1dcf9056c7155501a org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf.tar.gz
+b8ea0f1eefec1a495d15ee57f11e3c09 org.eclipse.ptp-a0dac268418a969d9a24e8f641827238d2d5f0ce.tar.gz
+32f1fa00188a927d2394ec5ce585d253 org.eclipse.photran-7c45b16ff335f6d0d4fc0cc0983ec19bbffa0922.tar.gz
More information about the scm-commits
mailing list