[eclipse-ptp: 1/3] tycho build work
Orion Poplawski
orion at fedoraproject.org
Tue Dec 4 22:55:01 UTC 2012
commit 53400b8bbf2e9c2f5f04c0850ce29f723ef5f530
Author: Orion Poplawski <orion at nwra.com>
Date: Tue Aug 7 11:08:34 2012 -0600
tycho build work
eclipse-ptp-deps.patch | 12 ---
eclipse-ptp-remove-overrides.patch | 134 ++++++++++++++++++------------------
eclipse-ptp.spec | 119 ++++++++++++++++++--------------
3 files changed, 134 insertions(+), 131 deletions(-)
---
diff --git a/eclipse-ptp-remove-overrides.patch b/eclipse-ptp-remove-overrides.patch
index d1bffd7..0583075 100644
--- a/eclipse-ptp-remove-overrides.patch
+++ b/eclipse-ptp-remove-overrides.patch
@@ -1,28 +1,63 @@
-diff -up ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java.fix ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java
---- ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java.fix 2012-04-16 16:25:30.000000000 -0400
-+++ ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java 2012-04-16 16:25:46.000000000 -0400
-@@ -56,7 +56,6 @@ public class CrayErrorParser implements
- private static final int FILENAME_GROUP = 5;
- private static final int LINE_NUMBER_GROUP = 6;
+diff -up eclipse-ptp-6.0.1/core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java.overrides eclipse-ptp-6.0.1/core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java
+--- eclipse-ptp-6.0.1/core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java.overrides 2012-06-29 14:19:36.000000000 -0600
++++ eclipse-ptp-6.0.1/core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java 2012-07-05 12:23:10.900093847 -0600
+@@ -29,7 +29,6 @@ public class LocalResource implements IR
+ *
+ * @see org.eclipse.ptp.remote.core.IRemoteResource#getDefaultLocationURI(org.eclipse.core.resources.IResource)
+ */
+- @Override
+ public URI getActiveLocationURI() {
+ return fResource.getLocationURI();
+ }
+@@ -39,7 +38,6 @@ public class LocalResource implements IR
+ *
+ * @see org.eclipse.ptp.remote.core.IRemoteResource#getResource()
+ */
+- @Override
+ public IResource getResource() {
+ return fResource;
+ }
+@@ -49,7 +47,6 @@ public class LocalResource implements IR
+ *
+ * @see org.eclipse.ptp.remote.core.IRemoteResource#refresh(org.eclipse.core.runtime.IProgressMonitor)
+ */
+- @Override
+ public void refresh(IProgressMonitor monitor) throws CoreException {
+ fResource.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ }
+@@ -59,7 +56,6 @@ public class LocalResource implements IR
+ *
+ * @see org.eclipse.ptp.remote.core.IRemoteResource#setResource(org.eclipse.core.resources.IResource)
+ */
+- @Override
+ public void setResource(IResource resource) {
+ fResource = resource;
+ }
+diff -up eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java.overrides eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java
+--- eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java.overrides 2012-06-29 08:36:26.000000000 -0600
++++ eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/CrayErrorParser.java 2012-07-05 12:23:55.731516420 -0600
+@@ -58,7 +58,6 @@ public class CrayErrorParser implements
+
+ private String previousLine = ""; //$NON-NLS-1$
- @Override
public boolean processLine(String currentLine, ErrorParserManager eoParser) {
- final Matcher matcher = matchErrorWarningLine(eoParser.getPreviousLine());
- if (matcher != null) {
-diff -up ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java.fix ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java
---- ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java.fix 2012-04-16 16:25:39.000000000 -0400
-+++ ./org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java 2012-04-16 16:25:56.000000000 -0400
-@@ -55,7 +55,6 @@ public class Open64ErrorParser implement
- // Capture groups in the above regexes
- private static final int ALT_DESCRIPTION_GROUP = 1;
+ final Matcher matcher = matchErrorWarningLine(previousLine); // eoParser.getPreviousLine() is broken?
+ previousLine = currentLine;
+diff -up eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java.overrides eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java
+--- eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java.overrides 2012-06-29 08:36:26.000000000 -0600
++++ eclipse-ptp-6.0.1/org.eclipse.photran.cdtinterface/src/org/eclipse/photran/internal/cdtinterface/errorparsers/Open64ErrorParser.java 2012-07-05 12:23:34.323269579 -0600
+@@ -57,7 +57,6 @@ public class Open64ErrorParser implement
+
+ private String previousLine = ""; //$NON-NLS-1$
- @Override
public boolean processLine(String currentLine, ErrorParserManager eoParser)
{
- Matcher matcher = matchErrorWarningLine(eoParser.getPreviousLine());
-diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java.fix ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java
---- ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java.fix 2012-04-16 13:31:34.000000000 -0400
-+++ ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java 2012-04-16 13:31:54.000000000 -0400
+ Matcher matcher = matchErrorWarningLine(previousLine); // eoParser.getPreviousLine() is broken?
+diff -up eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java.overrides eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java
+--- eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java.overrides 2012-06-29 08:36:26.000000000 -0600
++++ eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorName.java 2012-07-05 12:23:10.897093952 -0600
@@ -135,7 +135,6 @@ class ASTPreprocessorName extends ASTPre
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IASTNode#getOriginalNode()
@@ -31,9 +66,9 @@ diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/i
public IASTNode getOriginalNode()
{
// TODO Auto-generated method stub
-diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java.fix ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java
---- ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java.fix 2012-04-16 13:32:09.000000000 -0400
-+++ ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java 2012-04-16 13:32:55.000000000 -0400
+diff -up eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java.overrides eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java
+--- eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java.overrides 2012-06-29 08:36:26.000000000 -0600
++++ eclipse-ptp-6.0.1/org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/internal/core/preprocessor/c/ASTPreprocessorNode.java 2012-07-05 12:23:10.898093917 -0600
@@ -330,7 +330,6 @@ class ASTInclusionStatement extends ASTP
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IASTNode#getOriginalNode()
@@ -42,7 +77,7 @@ diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/i
public IASTNode getOriginalNode()
{
// TODO Auto-generated method stub
-@@ -661,7 +660,6 @@ class ASTMacroExpansion extends ASTPrepr
+@@ -711,7 +710,6 @@ class ASTMacroExpansion extends ASTPrepr
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IASTNode#getOriginalNode()
*/
@@ -50,10 +85,10 @@ diff -up ./org.eclipse.photran.core.vpg.preprocessor.c/src/org/eclipse/photran/i
public IASTNode getOriginalNode()
{
// TODO Auto-generated method stub
-diff -up ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java.fix ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java
---- ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java.fix 2012-04-16 16:32:31.000000000 -0400
-+++ ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java 2012-04-16 16:33:20.000000000 -0400
-@@ -576,9 +576,9 @@ public class FortranEditor extends CDTBa
+diff -up eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java.overrides eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java
+--- eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java.overrides 2012-06-29 08:36:26.000000000 -0600
++++ eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranEditor.java 2012-07-05 12:23:10.899093882 -0600
+@@ -600,9 +600,9 @@ public class FortranEditor extends CDTBa
private static class EntirePartitionDamager implements IPresentationDamager
{
@@ -65,9 +100,9 @@ diff -up ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/For
{
return partition;
}
-diff -up ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java.fix ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java
---- ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java.fix 2012-04-16 16:33:29.000000000 -0400
-+++ ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java 2012-04-16 16:34:28.000000000 -0400
+diff -up eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java.overrides eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java
+--- eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java.overrides 2012-06-29 08:36:26.000000000 -0600
++++ eclipse-ptp-6.0.1/org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/FortranStmtPartitionScanner.java 2012-07-05 12:23:10.899093882 -0600
@@ -70,7 +70,6 @@ public class FortranStmtPartitionScanner
this.editor = editor;
}
@@ -106,44 +141,9 @@ diff -up ./org.eclipse.photran.ui/src/org/eclipse/photran/internal/ui/editor/For
public int getTokenLength()
{
return tokenLength;
-diff -up ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java.fix ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java
---- ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java.fix 2012-04-16 17:16:38.000000000 -0400
-+++ ./core/org.eclipse.ptp.remote.core/src/org/eclipse/ptp/remote/internal/core/LocalResource.java 2012-04-16 17:16:38.000000000 -0400
-@@ -29,7 +29,6 @@ public class LocalResource implements IR
- *
- * @see org.eclipse.ptp.remote.core.IRemoteResource#getDefaultLocationURI(org.eclipse.core.resources.IResource)
- */
-- @Override
- public URI getActiveLocationURI() {
- return fResource.getLocationURI();
- }
-@@ -39,7 +38,6 @@ public class LocalResource implements IR
- *
- * @see org.eclipse.ptp.remote.core.IRemoteResource#getResource()
- */
-- @Override
- public IResource getResource() {
- return fResource;
- }
-@@ -49,7 +47,6 @@ public class LocalResource implements IR
- *
- * @see org.eclipse.ptp.remote.core.IRemoteResource#refresh(org.eclipse.core.runtime.IProgressMonitor)
- */
-- @Override
- public void refresh(IProgressMonitor monitor) throws CoreException {
- fResource.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- }
-@@ -59,7 +56,6 @@ public class LocalResource implements IR
- *
- * @see org.eclipse.ptp.remote.core.IRemoteResource#setResource(org.eclipse.core.resources.IResource)
- */
-- @Override
- public void setResource(IResource resource) {
- fResource = resource;
- }
-diff -up ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties.fix ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties
---- ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties.fix 2012-04-17 14:11:23.000000000 -0400
-+++ ./rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties 2012-04-17 14:11:38.000000000 -0400
+diff -up eclipse-ptp-6.0.1/rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties.overrides eclipse-ptp-6.0.1/rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties
+--- eclipse-ptp-6.0.1/rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties.overrides 2012-06-29 14:19:36.000000000 -0600
++++ eclipse-ptp-6.0.1/rms/org.eclipse.ptp.rm.jaxb.doc.isv/build.properties 2012-07-05 12:23:10.900093847 -0600
@@ -1,4 +1,3 @@
-source.. = src/
output.. = bin/
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 3609f93..f8c4dd2 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,5 +1,5 @@
-%global ptpver 6.0.0
-%global photranver 8.0.0
+%global ptpver 6.0.1
+%global photranver 8.0.1
%global eclipse_noarch_base %{_datadir}/eclipse
%global eclipse_arch_base %{_libdir}/eclipse
%global cdtreq 1:8.1.0
@@ -10,33 +10,48 @@
%else
%global pdebuild %{eclipse_arch_base}/buildscripts/pdebuild
%endif
-%global ptp_build_id 201203201256
-%global photran_build_id 201203151905
+%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
+
+# All arches line up except i386 -> x86
+%ifarch %{ix86}
+%define eclipse_arch x86
+%else
+%ifarch %{arm}
+%define eclipse_arch arm
+%else
+%define eclipse_arch %{_arch}
+%endif
+%endif
Summary: Eclipse Parallel Tools Platform
Name: eclipse-ptp
# Be sure to update photran version if needed
Version: %{ptpver}
-Release: 0.2.junom6%{?dist}
+Release: 1%{?dist}
License: EPL
Group: Development/Tools
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-015cebabbf5f3c114d6928883375de8b647c53bf.tar.gz
-Source1: http://git.eclipse.org/c/ptp/org.eclipse.photran.git/snapshot/org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068.tar.gz
+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
Source2: makesource.sh
# To help generate the needed Requires
Source3: finddeps.sh
-Patch0: %{name}-deps.patch
-
+# 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 some unneeded dependencies
BuildRequires: java-devel >= 1.5.0
-BuildRequires: eclipse-pde >= %{pdereq}
+#BuildRequires: eclipse-pde >= %{pdereq}
+BuildRequires: maven
+BuildRequires: tycho
BuildRequires: eclipse-cdt-parsers >= %{cdtreq}
#BuildRequires: eclipse-cdt-tests
# >= 1:6.0.2
@@ -82,8 +97,6 @@ Requires: %{name}-etfw-tau = %{version}-%{release}
Requires: %{name}-etfw-tau-fortran = %{version}-%{release}
Requires: %{name}-gem = %{version}-%{release}
Requires: %{name}-rm-contrib = %{version}-%{release}
-# This doesn't build yet
-#Requires: %{name}-rm-lsf = %{version}-%{release}
Requires: %{name}-pldt-fortran = %{version}-%{release}
Requires: %{name}-pldt-openacc = %{version}-%{release}
Requires: %{name}-pldt-upc = %{version}-%{release}
@@ -276,16 +289,6 @@ BuildArch: noarch
Adds resource managers for a number of different systems.
-#%package rm-lsf
-#Summary: PTP Support For LSF
-#Group: Development/Libraries
-#Requires: %{name} = %{version}-%{release}
-#BuildArch: noarch
-#
-#%description rm-lsf
-#Adds support for the LSF job scheduler.
-
-
%package sci
Summary: PTP Scalable Communication Infrastructure (SCI)
Group: Development/Libraries
@@ -356,18 +359,23 @@ Provides support for remote services using RSE.
# Move the commit snapshot contents up one directory so we can build
# as normal
-pushd org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068
-cp -r . ..
-popd
-pushd org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf
-cp -r . ..
+#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
+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
popd
-rm -rf org.eclipse.photran-f3decf9a5a9293d4f478e10b9f65e270ed08d068
-rm -rf org.eclipse.ptp-015cebabbf5f3c114d6928883375de8b647c53bf
-
-# Remove erroneous override statements
-%patch0
-%patch1
+cd org.eclipse.photran-%{photran_git_tag}
+#sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
# We need to rebuild this jar from the sources within it
pwd
@@ -387,7 +395,7 @@ find -name MANIFEST.MF -exec sed -i -e 's|\r||' {} +
export JAVA_HOME=%{java_home}
export PATH=%{java_bin}:/usr/bin:$PATH
# Build the helper jar first
-pushd cdtdb-4.0.3-eclipse
+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')
find -name \*java -exec javac -classpath $classpath '{}' +
jar cf ../org.eclipse.rephraserengine.core/cdtdb-4.0.3-eclipse.jar *
@@ -395,31 +403,39 @@ popd
#Interferes with feature build
rm -rf cdtdb-4.0.3-eclipse
+pushd org.eclipse.photran-%{photran_git_tag}
+mvn-rpmbuild install
+popd
+pushd org.eclipse.ptp-%{ptp_git_tag}
+mvn-rpmbuild 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.core 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}
-do
- %{pdebuild} -d "cdt cdt-parsers jgit rse" \
- -f $feature -a "-DjavacSource=1.6 -DjavacTarget=1.6 \
- -Dnoclean=true -DforceContextQualifier=%{ptp_build_id}"
-done
+#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
-# some features use a different timestamp qualifier
-for feature in org.eclipse.photran org.eclipse.photran.{intel,xlf}
-do
- %{pdebuild} -d "cdt cdt-parsers jgit rse" \
- -f $feature -a "-DjavacSource=1.6 -DjavacTarget=1.6 \
- -Dnoclean=true -DforceContextQualifier=%{photran_build_id}"
-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 -f $zip
+ rm $zip
done
#Install all of the remaining features
@@ -508,10 +524,6 @@ done
%doc releng/org.eclipse.ptp-feature/epl-v10.html
%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rm.jaxb.contrib
-#%files rm-lsf
-#%doc releng/org.eclipse.ptp-feature/epl-v10.html
-#%{eclipse_noarch_base}/dropins/org.eclipse.ptp.rm.lsf.contrib
-
%files sci
%doc releng/org.eclipse.ptp-feature/epl-v10.html
%{eclipse_noarch_base}/dropins/org.eclipse.ptp.sci
@@ -534,6 +546,9 @@ done
%changelog
+* 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
+
* Fri Apr 20 2012 Orion Poplawski <orion at cora.nwra.com> - 6.0.0-0.2.junom6
- Add some new features
- Rework buildid to avoid photran build duplication
More information about the scm-commits
mailing list