[eclipse-ptp] Update to PTP 5.0.4, photran 7.0.4 Update makesource.sh/spec/finddeps.sh to use git archive Unpack c
Orion Poplawski
orion at fedoraproject.org
Thu Dec 29 18:26:16 UTC 2011
commit 983517a8d0a2c39418348413ff00beb249ea7378
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Wed Dec 28 16:41:59 2011 -0700
Update to PTP 5.0.4, photran 7.0.4
Update makesource.sh/spec/finddeps.sh to use git archive
Unpack cdtdb-4.0.3-eclipse.jar from tar archive
Remove orbitDeps usage, not needed
Remove license feature hack, not needed
.gitignore | 2 ++
eclipse-ptp.spec | 42 +++++++++++++++++++++++-------------------
finddeps.sh | 11 ++++++++++-
makesource.sh | 28 +++++++++++++++++-----------
sources | 4 ++--
5 files changed, 54 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 306a2c1..a150231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
/org.eclipse.ptp-v201107131351.tar.gz
/org.eclipse.ptp-v201109141657.tar.gz
/org.eclipse.ptp-v201110141146.tar.gz
+/org.eclipse.ptp-5.0.4-a3efe7a2a670e1bb8cbb3b8c34a4998a75fb7889.tar.xz
+/org.eclipse.photran-7.0.4-0afa02baf34e4f253eabf14097fde9dc8088aa3d.tar.xz
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index a9a73ff..1161b23 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -1,7 +1,7 @@
-%global ptpver 5.0.3
-%global photranver 7.0.3
-#global reltag ptp_4_0
-%global reltag v201110141146
+%global ptpver 5.0.4
+%global ptptag a3efe7a2a670e1bb8cbb3b8c34a4998a75fb7889
+%global photranver 7.0.4
+%global photrantag 0afa02baf34e4f253eabf14097fde9dc8088aa3d
%global eclipse_noarch_base %{_datadir}/eclipse
%global eclipse_arch_base %{_libdir}/eclipse
%global cdtreq 1:8.0.1
@@ -17,10 +17,10 @@ License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/ptp
-# The following tarball was generated by the makesource.sh script
-Source0: org.eclipse.ptp-%{reltag}.tar.gz
-Source1: makesource.sh
-Source2: cdtdb-4.0.3-eclipse.jar
+# The following tarballs were generated by the makesource.sh script
+Source0: org.eclipse.ptp-%{ptpver}-%{ptptag}.tar.xz
+Source1: org.eclipse.photran-%{photranver}-%{photrantag}.tar.xz
+Source2: makesource.sh
# To help generate the needed Requires
Source3: finddeps.sh
# Remove some unneeded dependencies
@@ -259,23 +259,20 @@ Provides support for remote services using RSE.
%prep
-%setup -q -n org.eclipse.ptp-%{reltag}
+%setup -q -c -a 0 -a 1
%patch0 -p1 -b .deps
-find -name \*.jar -exec rm {} +
+# We need to rebuild this jar from the sources within it
mkdir cdtdb-4.0.3-eclipse
pushd cdtdb-4.0.3-eclipse
-unzip -q %SOURCE2
+unzip -q ../org.eclipse.rephraserengine.core.vpg/cdtdb-4.0.3-eclipse.jar
find -name \*.class -exec rm {} +
popd
+# Delete any other jars in the project
+find -name \*.jar -exec rm {} +
# This prevents the Photran Intel feature from building
-sed -i -e 's/os="linux"//' photran/org.eclipse.photran.intel-feature/feature.xml
+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||' {} +
-mkdir orbitDeps
-#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/
%build
@@ -285,7 +282,7 @@ export PATH=%{java_bin}:/usr/bin:$PATH
pushd 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 ../photran/org.eclipse.rephraserengine.core.vpg/cdtdb-4.0.3-eclipse.jar *
+jar cf ../org.eclipse.rephraserengine.core.vpg/cdtdb-4.0.3-eclipse.jar *
popd
#Interferes with feature build
rm -rf cdtdb-4.0.3-eclipse
@@ -297,7 +294,7 @@ rm -rf cdtdb-4.0.3-eclipse
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
+ -f $feature -a "-DjavacSource=1.5 -DjavacTarget=1.5 -Dnoclean=true"
done
@@ -408,6 +405,13 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
+* Wed Dec 28 2011 Orion Poplawski <orion at cora.nwra.com> - 5.0.4-1
+- Update to PTP 5.0.4, photran 7.0.4
+- Update makesource.sh/spec/finddeps.sh to use git archive
+- Unpack cdtdb-4.0.3-eclipse.jar from tar archive
+- Remove orbitDeps usage, not needed
+- Remove license feature hack, not needed
+
* Tue Oct 25 2011 Orion Poplawski <orion at cora.nwra.com> - 5.0.3-1
- Update to PTP 5.0.3, photran 7.0.3
diff --git a/finddeps.sh b/finddeps.sh
index bdcf8c7..3b880b9 100755
--- a/finddeps.sh
+++ b/finddeps.sh
@@ -1,4 +1,13 @@
-find org.eclipse.ptp-v* -name feature.xml | sort | while read f
+#!/bin/sh
+# Figures out where the various features end up.
+# Make sure you've done a fedpkg prep as well as installed
+# the packages
+
+# Get some variables from the specfile
+eval `awk '$1 == "%global" { print $2 "=" $3 }' eclipse-ptp.spec`
+
+# Go through all of the features
+find eclipse-ptp-${ptpver} -name feature.xml | sort | while read f
do
#fname=$(echo $f | sed -e 's,.*org.,,' -e 's,-feature.*,,' -e 's,\.,-,g')
fname=$(echo $f | sed -e 's,.*org.,org.,' -e 's,-feature.*,,')
diff --git a/makesource.sh b/makesource.sh
index 08b96c8..8dafda5 100755
--- a/makesource.sh
+++ b/makesource.sh
@@ -1,13 +1,19 @@
#!/bin/sh
+# Build the ptp and photran source tarballs.
+#
+# Get some variables from the specfile
+eval `awk '$1 == "%global" { print $2 "=" $3 }' eclipse-ptp.spec`
-if [ -z "$1" ]
-then
- echo "usage: $0 <tag>" 1>&2
- exit 1
-fi
-rel="$1"
-rm -rf org.eclipse.ptp-$rel
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools -z3 export -r $rel -d org.eclipse.ptp-$rel org.eclipse.ptp
-find org.eclipse.ptp-$rel -name old -exec rm -rf '{}' +
-find org.eclipse.ptp-$rel -name \*.jar | xargs -I'{}' mv '{}' .
-tar czf org.eclipse.ptp-$rel.tar.gz org.eclipse.ptp-$rel
+# Checkout and create ptp tarball
+[ ! -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}-${ptptag}.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 $photrantag | xz -c > ../org.eclipse.photran-${photranver}-${photrantag}.tar.xz
+popd
diff --git a/sources b/sources
index 1863ee3..78fca4f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bf55fcfb24bbc519bb737add2c2bff72 cdtdb-4.0.3-eclipse.jar
-ab20ba46cfe67db6fbdb362cddb01871 org.eclipse.ptp-v201110141146.tar.gz
+d8034dcb55ad93e072d6121ac64aaaf2 org.eclipse.ptp-5.0.4-a3efe7a2a670e1bb8cbb3b8c34a4998a75fb7889.tar.xz
+9e2bbf3a80b77f9af663c571630c69b4 org.eclipse.photran-7.0.4-0afa02baf34e4f253eabf14097fde9dc8088aa3d.tar.xz
More information about the scm-commits
mailing list