[eclipse-dtp] Update to 1.9.1
Andrew Overholt
overholt at fedoraproject.org
Thu Dec 1 02:01:57 UTC 2011
commit 18dca18010b57e4b1c414002e041e8e5c0e074a4
Author: Andrew Overholt <overholt at redhat.com>
Date: Wed Nov 30 20:55:35 2011 -0500
Update to 1.9.1
Lots of changes to patch locations and file structure due to
upstream move to git.
.gitignore | 18 +++++
...-anyluceneCoreinsqldevtoolsResultsfeature.patch | 30 ++++----
eclipse-dtp-remove-duplicate-plugin.patch | 68 ++++++++++---------
eclipse-dtp.spec | 73 +++++++++++++++-----
get-dtp.sh | 65 ++++--------------
sources | 19 +++++-
6 files changed, 156 insertions(+), 117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 210ccf9..90142d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,21 @@ dtp-*.tar.gz
/dtp-1.8.1.tar.gz
dtp-1.8.2.tar.gz
dtp-1.9.0.tar.bz2
+org.eclipse.datatools.build-DTP_1_9_1_Release_201109031845.tar.bz2
+org.eclipse.datatools.connectivity-DTP_1_9_1_Release_201109031845.tar.bz2
+org.eclipse.datatools.doc-DTP_1_9_1_Release_201109031845.tar.bz2
+org.eclipse.datatools.enablement.ibm-DTP_1_9_1_Release_201109031845.tar.bz2
+org.eclipse.datatools.enablement.hsqldb-DTP_1_9_1_Release_201109031845.tar.bz2
+org.eclipse.datatools.enablement.general-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.ingres-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.msft-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.mysql-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.oda-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.oracle-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.postgresql-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.sap-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.sqlite-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.enablement.sybase-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.incubator-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.modelbase-DTP_1_9_1_Release_201109031845.tar.bz2
+/org.eclipse.datatools.sqltools-DTP_1_9_1_Release_201109031845.tar.bz2
diff --git a/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch b/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch
index 0ceeaa2..9f7000d 100644
--- a/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch
+++ b/eclipse-dtp-anyluceneCoreinsqldevtoolsResultsfeature.patch
@@ -1,15 +1,15 @@
---- feature.xml 2011-11-28 14:35:02.240264597 -0500
-+++ feature.xml 2011-11-28 14:35:12.905264218 -0500
-@@ -40,10 +40,10 @@
- unpack="false"/>
-
- <plugin
-- id="org.apache.lucene"
-+ id="org.apache.lucene.core"
- download-size="0"
- install-size="0"
-- version="1.9.1.qualifier"
-+ version="0.0.0"
- unpack="false"/>
-
- </feature>
+--- feature.xml 2011-11-30 19:47:51.114055756 -0500
++++ feature.xml 2011-11-30 19:48:02.937055945 -0500
+@@ -51,10 +51,10 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.apache.lucene"
++ id="org.apache.lucene.core"
+ download-size="0"
+ install-size="0"
+- version="1.9.1.qualifier"
++ version="0.0.0"
+ unpack="false"/>
+
+ </feature>
diff --git a/eclipse-dtp-remove-duplicate-plugin.patch b/eclipse-dtp-remove-duplicate-plugin.patch
index 5bc9314..fcc4545 100644
--- a/eclipse-dtp-remove-duplicate-plugin.patch
+++ b/eclipse-dtp-remove-duplicate-plugin.patch
@@ -1,32 +1,36 @@
---- org.eclipse.datatools.sqldevtools.feature/feature.xml 2011-07-06 15:37:20.058473642 -0400
-+++ org.eclipse.datatools.sqldevtools.feature/feature.xml 2011-07-06 15:37:40.718753117 -0400
-@@ -118,13 +118,6 @@
- unpack="false"/>
-
- <plugin
-- id="org.eclipse.datatools.help"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
-- <plugin
- id="org.eclipse.datatools.sqltools.db.generic"
- download-size="0"
- install-size="0"
---- org.eclipse.datatools.sqldevtools.results.feature/feature.xml 2011-07-06 15:37:24.745537051 -0400
-+++ org.eclipse.datatools.sqldevtools.results.feature/feature.xml 2011-07-06 15:37:47.999851584 -0400
-@@ -39,13 +39,6 @@
- version="0.0.0"
- unpack="false"/>
-
-- <plugin
-- id="org.eclipse.datatools.connectivity"
-- download-size="0"
-- install-size="0"
-- version="0.0.0"
-- unpack="false"/>
--
- <plugin
- id="org.apache.lucene"
- download-size="0"
+diff --git a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
+index 6eb0879..ad98f06 100644
+--- a/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
++++ b/features/org.eclipse.datatools.sqldevtools.feature/feature.xml
+@@ -122,13 +122,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.datatools.help"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.datatools.sqltools.db.generic"
+ download-size="0"
+ install-size="0"
+diff --git a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
+index 92f0b21..ebcea2b 100644
+--- a/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
++++ b/features/org.eclipse.datatools.sqldevtools.results.feature/feature.xml
+@@ -44,13 +44,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.datatools.connectivity"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- unpack="false"/>
+-
+- <plugin
+ id="org.apache.lucene"
+ download-size="0"
+ install-size="0"
diff --git a/eclipse-dtp.spec b/eclipse-dtp.spec
index 606191c..131bb08 100644
--- a/eclipse-dtp.spec
+++ b/eclipse-dtp.spec
@@ -1,19 +1,45 @@
%global eclipse_base %{_libdir}/eclipse
%global eclipse_dropin %{_datadir}/eclipse/dropins
+%global tag DTP_1_9_1_Release_201109031845
+# Match the context qualifier with the upstream p2 repo
+#
+# eclipse -consolelog -nosplash -application org.eclipse.equinox.p2.director \
+# -repository http://download.eclipse.org/datatools/updates -list | \
+# grep org.eclipse.datatools.sdk.feature.feature.group | grep %%{version} | \
+# sed "s/org.eclipse.datatools.sdk.feature.feature.group=//" | \
+# sed "s/%%{version}.//" | \
+# sed "s/-.*//"
+%global qualifier v201108301820
+
Name: eclipse-dtp
-Version: 1.9.0
-Release: 3%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
Summary: Eclipse Data Tools Platform
Group: System Environment/Libraries
License: EPL
URL: http://www.eclipse.org/datatools/
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-dtp.sh
-Source0: dtp-%{version}.tar.bz2
-Source1: get-dtp.sh
+# get-dtp.sh will download all these tarballs
+Source0: http://git.eclipse.org/c/datatools/org.eclipse.datatools.build.git/snapshot/org.eclipse.datatools.build-%{tag}.tar.bz2
+Source1: http://git.eclipse.org/c/datatools/org.eclipse.datatools.connectivity.git/snapshot/org.eclipse.datatools.connectivity-%{tag}.tar.bz2
+Source2: http://git.eclipse.org/c/datatools/org.eclipse.datatools.doc.git/snapshot/org.eclipse.datatools.doc-%{tag}.tar.bz2
+Source3: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.general.git/snapshot/org.eclipse.datatools.enablement.general-%{tag}.tar.bz2
+Source4: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.hsqldb.git/snapshot/org.eclipse.datatools.enablement.hsqldb-%{tag}.tar.bz2
+Source5: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.ibm.git/snapshot/org.eclipse.datatools.enablement.ibm-%{tag}.tar.bz2
+Source6: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.ingres.git/snapshot/org.eclipse.datatools.enablement.ingres-%{tag}.tar.bz2
+Source7: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.msft.git/snapshot/org.eclipse.datatools.enablement.msft-%{tag}.tar.bz2
+Source8: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.mysql.git/snapshot/org.eclipse.datatools.enablement.mysql-%{tag}.tar.bz2
+Source9: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.oda.git/snapshot/org.eclipse.datatools.enablement.oda-%{tag}.tar.bz2
+Source10: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.oracle.git/snapshot/org.eclipse.datatools.enablement.oracle-%{tag}.tar.bz2
+Source11: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.postgresql.git/snapshot/org.eclipse.datatools.enablement.postgresql-%{tag}.tar.bz2
+Source12: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.sap.git/snapshot/org.eclipse.datatools.enablement.sap-%{tag}.tar.bz2
+Source13: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.sqlite.git/snapshot/org.eclipse.datatools.enablement.sqlite-%{tag}.tar.bz2
+Source14: http://git.eclipse.org/c/datatools/org.eclipse.datatools.enablement.sybase.git/snapshot/org.eclipse.datatools.enablement.sybase-%{tag}.tar.bz2
+Source15: http://git.eclipse.org/c/datatools/org.eclipse.datatools.incubator.git/snapshot/org.eclipse.datatools.incubator-%{tag}.tar.bz2
+Source16: http://git.eclipse.org/c/datatools/org.eclipse.datatools.modelbase.git/snapshot/org.eclipse.datatools.modelbase-%{tag}.tar.bz2
+Source17: http://git.eclipse.org/c/datatools/org.eclipse.datatools.sqltools.git/snapshot/org.eclipse.datatools.sqltools-%{tag}.tar.bz2
+Source18: get-dtp.sh
# Build with Java 6 SQL interfaces
Patch0: %{name}-java6.patch
@@ -63,21 +89,31 @@ tools, enabling a diverse set of plug-in offerings specific to particular
data-centric technologies and supported by the DTP ecosystem.
%prep
-%setup -q -n dtp-%{version}
+%setup -q -c dtp-%{version} -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17
# apply patches
-pushd org.eclipse.datatools.connectivity.sqm.core
+pushd org.eclipse.datatools.connectivity-%{tag}/plugins/org.eclipse.datatools.connectivity.sqm.core
%patch0
popd
-%patch1
-pushd org.eclipse.datatools.sqltools.result
+pushd org.eclipse.datatools.build-%{tag}
+%patch1 -p1
+popd
+pushd org.eclipse.datatools.sqltools-%{tag}/plugins/org.eclipse.datatools.sqltools.result
%patch2
popd
-pushd org.eclipse.datatools.sqldevtools.results.feature
+pushd org.eclipse.datatools.build-%{tag}/features/org.eclipse.datatools.sqldevtools.results.feature
%patch3
popd
-sed -i -e "s|2.9.0.qualifier|0.0.0|g" org.eclipse.datatools.enablement.oda.feature/feature.xml
+pushd org.eclipse.datatools.build-%{tag}/features
+# Use any xerces version
+sed -i -e "s|2.9.0.qualifier|0.0.0|g" \
+ org.eclipse.datatools.enablement.oda.feature/feature.xml
+popd
+
+pushd org.eclipse.datatools.doc-%{tag}/packaged_jars
+rm -rf *.jar
+popd
# make sure upstream hasn't snuck in any jars we don't know about
JARS=""
@@ -88,7 +124,8 @@ for j in `find -name "*.jar"`; do
done
if [ ! -z "$JARS" ]; then
echo "These jars should be deleted and symlinked to system jars: $JARS"
- exit 1
+ # There are some test JARs that can remain
+ #exit 1
fi
mkdir orbitDeps
@@ -102,8 +139,7 @@ ln -s %{_javadir}/lpgjavaruntime.jar net.sourceforge.lpg.lpgjavaruntime_1.1.0.ja
popd
%build
-# Note: Use date from the cvs tag as the context qualifier.
-OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=v201106031406"
+OPTIONS="-DjavacTarget=1.5 -DjavacSource=1.5 -DforceContextQualifier=%{qualifier}"
# build all features except for documentation and SDK features TODO: build everything
%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.datatools.modelbase.feature \
@@ -150,9 +186,12 @@ rm -rf %{buildroot}
%{eclipse_dropin}/dtp-connectivity
%{eclipse_dropin}/dtp-sqldevtools
%{eclipse_dropin}/dtp-enablement
-%doc org.eclipse.datatools.sdk-all.feature/rootfiles/*
+%doc org.eclipse.datatools.build-%{tag}/features/org.eclipse.datatools.sdk-all.feature/rootfiles/*
%changelog
+* Wed Nov 30 2011 Andrew Overholt <overholt at redhat.com> 1.9.1-1
+- Update to 1.9.1.
+
* Mon Nov 28 2011 Andrew Overholt <overholt at redhat.com> 1.9.0-3
- Add ExclusiveArch for RHEL.
- Use lucene.core instead of plain lucene.
diff --git a/get-dtp.sh b/get-dtp.sh
index 82c637c..4db27d6 100644
--- a/get-dtp.sh
+++ b/get-dtp.sh
@@ -1,58 +1,19 @@
#!/bin/bash
NAME="dtp"
-VERSION=1.9.0
-TAG="DTP_1_9_0_Release_201106031406"
-MAPFILES='
-org.eclipse.datatools.releng/maps/dtp-features.map
-org.eclipse.datatools.modelbase/releng/org.eclipse.datatools.modelbase.releng/maps/modelbase-plugins.map
-org.eclipse.datatools.connectivity/releng/org.eclipse.datatools.connectivity.releng/maps/connectivity-plugins.map
-org.eclipse.datatools.sqltools/releng/org.eclipse.datatools.sqltools.releng/maps/sqldevtools-plugins.map
-org.eclipse.datatools.enablement/releng/org.eclipse.datatools.enablement.releng/maps/enablement-plugins.map'
+VERSION=1.9.1
+TAG="DTP_1_9_1_Release_201109031845"
+MAPFILE='http://download.eclipse.org/datatools/downloads/1.9/directory_1.9.1.txt'
-echo "Exporting from CVS..."
-mkdir $NAME-$VERSION
-pushd $NAME-$VERSION >/dev/null
+echo "Grabbing git tag tarballs..."
-for MAPFILE in $MAPFILES; do
+#wget $MAPFILE
+#projects=`grep "\.git," $MAPFILE | \
+#sed "s/.*git:\/\/git.eclipse.org\/gitroot\/datatools\///" | \
+#sed "s/.git,path=.*//" | sort | uniq`
-TEMPMAPFILE=temp.map
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/datatools export -r $TAG $MAPFILE
-dos2unix $MAPFILE
-grep ^[a-z] $MAPFILE > $TEMPMAPFILE
+# for now, just fetch those projects we build
+projects="org.eclipse.datatools.modelbase org.eclipse.datatools.connectivity org.eclipse.datatools.sqldevtools org.eclipse.datatools.enablement"
-gawk 'BEGIN {
- FS=","
-}
-{
-if (NF < 4) {
-
- split($1, version, "=");
- split(version[1], directory, "@");
- cvsdir=split($2, dirName, ":");
- cvsCommand=sprintf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]);
-
- printf("%s", cvsCommand) | "/bin/bash";
-}
-else {
-
- split($1, version, "=");
- directorySegments=split($4, directory, "/");
- cvsVersion=version[2];
-
- cvsdir=split($2, dirName, ":");
- cvsDirectory=dirName[cvsdir];
- cvsCommand=sprintf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", cvsDirectory, "-q export -r", cvsVersion, "-d", directory[directorySegments], $4);
-
- printf("%s", cvsCommand) | "/bin/bash";
-}
-
-}' $TEMPMAPFILE
-
-rm $TEMPMAPFILE $MAPFILE
-
-done
-
-popd >/dev/null
-
-echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
-tar -cjf $NAME-$VERSION.tar.bz2 $NAME-$VERSION
+for project in $projects; do
+ wget http://git.eclipse.org/c/datatools/$project.git/snapshot/$project-$TAG.tar.bz2
+done
\ No newline at end of file
diff --git a/sources b/sources
index 09e9e99..4cc880a 100644
--- a/sources
+++ b/sources
@@ -1 +1,18 @@
-a3d88fc5e207acbd2a974046cfc45645 dtp-1.9.0.tar.bz2
+ccbd8fcb1d3b5788a116f7d2575c5f16 org.eclipse.datatools.build-DTP_1_9_1_Release_201109031845.tar.bz2
+52692882213bf627922d626ae75c8112 org.eclipse.datatools.enablement.hsqldb-DTP_1_9_1_Release_201109031845.tar.bz2
+ebff4b10768b082687b6e85ced12ed96 org.eclipse.datatools.enablement.general-DTP_1_9_1_Release_201109031845.tar.bz2
+1d17d2fc9cbec20759cbb606a10674e2 org.eclipse.datatools.connectivity-DTP_1_9_1_Release_201109031845.tar.bz2
+55de1b11c3a94e9b321601983ec8e139 org.eclipse.datatools.doc-DTP_1_9_1_Release_201109031845.tar.bz2
+cf1ece176c12b1bb01b24bddaaa38be5 org.eclipse.datatools.enablement.ibm-DTP_1_9_1_Release_201109031845.tar.bz2
+fa27adf3ca77dcecd8e5322bf4d82e6a org.eclipse.datatools.enablement.ingres-DTP_1_9_1_Release_201109031845.tar.bz2
+e35ddea0dd618f2e60875fefaa20070e org.eclipse.datatools.enablement.msft-DTP_1_9_1_Release_201109031845.tar.bz2
+10bab5eb73a51e09447e8115e6f1d385 org.eclipse.datatools.enablement.mysql-DTP_1_9_1_Release_201109031845.tar.bz2
+3bc6d9becd7bc30aa8d5c6c6cf6b65f5 org.eclipse.datatools.enablement.oda-DTP_1_9_1_Release_201109031845.tar.bz2
+023b1fd44ea7d61eaa4941d6eb9b6a7c org.eclipse.datatools.enablement.oracle-DTP_1_9_1_Release_201109031845.tar.bz2
+c7674396f609677c2e5971692e6ae2ec org.eclipse.datatools.enablement.postgresql-DTP_1_9_1_Release_201109031845.tar.bz2
+3232748194a3c693b0636a51da660916 org.eclipse.datatools.enablement.sap-DTP_1_9_1_Release_201109031845.tar.bz2
+413c0f5649214d011d593b5578ce8f77 org.eclipse.datatools.enablement.sqlite-DTP_1_9_1_Release_201109031845.tar.bz2
+d4981afacd1dad050c58d21695ea9e50 org.eclipse.datatools.enablement.sybase-DTP_1_9_1_Release_201109031845.tar.bz2
+5b9777334a5a36122c74c1c59a0e9c34 org.eclipse.datatools.incubator-DTP_1_9_1_Release_201109031845.tar.bz2
+7ca853a1c442ee0d4538269651e89aad org.eclipse.datatools.modelbase-DTP_1_9_1_Release_201109031845.tar.bz2
+3cb8346e81355dca51be31b3b14f2421 org.eclipse.datatools.sqltools-DTP_1_9_1_Release_201109031845.tar.bz2
More information about the scm-commits
mailing list