[eclipse-gef] 808994: Update eclipse-gef to a recent version https://bugzilla.redhat.com/show_bug.cgi?id=808994
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon Apr 2 14:59:42 UTC 2012
commit cdb7b9783df5a1e3d8e333d43d02ea5eebb145e8
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon Apr 2 16:59:25 2012 +0200
808994: Update eclipse-gef to a recent version
https://bugzilla.redhat.com/show_bug.cgi?id=808994
.gitignore | 2 +
eclipse-gef-generateSourceForDraw2dFeature.patch | 8 +++
eclipse-gef-generateSourceForExamples.patch | 18 ++++++++
eclipse-gef-generateSourceForGefFeature.patch | 11 +++++
eclipse-gef-generateSourceForZestFeature.patch | 11 +++++
...e-gef-removeExamplesSourceSelfContainment.patch | 13 ++++++
eclipse-gef.spec | 42 +++++++++++++-----
get-gef.sh | 46 ++++++--------------
sources | 2 +-
9 files changed, 108 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57d7405..202b5ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ gef-3.6.0.tar.gz
/gef-3.6.1.tar.gz
gef-3.6.2.tar.gz
gef-3.7.0.tar.gz
+/gef-3.8.0
+/gef-3.8.0.tar.gz
diff --git a/eclipse-gef-generateSourceForDraw2dFeature.patch b/eclipse-gef-generateSourceForDraw2dFeature.patch
new file mode 100644
index 0000000..396f2e0
--- /dev/null
+++ b/eclipse-gef-generateSourceForDraw2dFeature.patch
@@ -0,0 +1,8 @@
+--- gef-3.8.0/org.eclipse.draw2d.source-feature/build.properties.bak 2012-04-02 12:44:29.000000000 +0200
++++ gef-3.8.0/org.eclipse.draw2d.source-feature/build.properties 2012-04-02 13:09:21.690738231 +0200
+@@ -19,3 +19,4 @@
+ eclipse_update_120.jpg,\
+ license.html
+
++generate.plugin at org.eclipse.draw2d.source=org.eclipse.draw2d
+\ No newline at end of file
diff --git a/eclipse-gef-generateSourceForExamples.patch b/eclipse-gef-generateSourceForExamples.patch
new file mode 100644
index 0000000..a32a226
--- /dev/null
+++ b/eclipse-gef-generateSourceForExamples.patch
@@ -0,0 +1,18 @@
+--- gef-3.8.0/org.eclipse.gef.examples-feature/build.properties.bak 2012-04-02 15:18:50.000000000 +0200
++++ gef-3.8.0/org.eclipse.gef.examples-feature/build.properties 2012-04-02 16:31:21.547643754 +0200
+@@ -13,3 +13,14 @@
+ feature.properties,\
+ eclipse_update_120.jpg,\
+ license.html
++
++generate.feature at org.eclipse.gef.examples.source=org.eclipse.gef.examples, \
++ plugin at org.eclipse.gef.examples.logic.source=org.eclipse.gef.examples.logic, \
++ plugin at org.eclipse.gef.examples.flow.source=org.eclipse.gef.examples.flow, \
++ plugin at org.eclipse.gef.examples.text.source=org.eclipse.gef.examples.text, \
++ plugin at org.eclipse.gef.examples.shapes.source=org.eclipse.gef.examples.shapes
++
++
++
++
++
+\ No newline at end of file
diff --git a/eclipse-gef-generateSourceForGefFeature.patch b/eclipse-gef-generateSourceForGefFeature.patch
new file mode 100644
index 0000000..eaaaca6
--- /dev/null
+++ b/eclipse-gef-generateSourceForGefFeature.patch
@@ -0,0 +1,11 @@
+--- gef-3.8.0/org.eclipse.gef.source-feature/build.properties.bak 2012-04-02 12:44:29.000000000 +0200
++++ gef-3.8.0/org.eclipse.gef.source-feature/build.properties 2012-04-02 13:16:25.205880821 +0200
+@@ -18,4 +18,5 @@
+ feature.properties,\
+ eclipse_update_120.jpg,\
+ license.html
+-
+\ No newline at end of file
++
++generate.plugin at org.eclipse.gef.source=org.eclipse.gef
+\ No newline at end of file
diff --git a/eclipse-gef-generateSourceForZestFeature.patch b/eclipse-gef-generateSourceForZestFeature.patch
new file mode 100644
index 0000000..b27f8fc
--- /dev/null
+++ b/eclipse-gef-generateSourceForZestFeature.patch
@@ -0,0 +1,11 @@
+--- gef-3.8.0/org.eclipse.zest.sdk-feature/build.properties.bak 2012-04-02 14:47:11.000000000 +0200
++++ gef-3.8.0/org.eclipse.zest.sdk-feature/build.properties 2012-04-02 15:12:19.749471383 +0200
+@@ -13,4 +13,5 @@
+ feature.properties,\
+ feature.xml,\
+ license.html
+-
+\ No newline at end of file
++
++generate.feature at org.eclipse.zest.source=org.eclipse.zest
+\ No newline at end of file
diff --git a/eclipse-gef-removeExamplesSourceSelfContainment.patch b/eclipse-gef-removeExamplesSourceSelfContainment.patch
new file mode 100644
index 0000000..573a82f
--- /dev/null
+++ b/eclipse-gef-removeExamplesSourceSelfContainment.patch
@@ -0,0 +1,13 @@
+--- gef-3.8.0/org.eclipse.gef.examples.source-feature/feature.xml.bak 2012-04-02 15:18:50.000000000 +0200
++++ gef-3.8.0/org.eclipse.gef.examples.source-feature/feature.xml 2012-04-02 16:18:52.346994484 +0200
+@@ -22,9 +22,7 @@
+ <discovery label="%updateSiteName" url="http://download.eclipse.org/tools/gef/updates/releases/"/>
+ </url>
+
+- <includes
+- id="org.eclipse.gef.examples.source"
+- version="0.0.0"/>
++
+
+ <requires>
+ <import plugin="org.eclipse.gef" version="3.6.0" match="compatible"/>
diff --git a/eclipse-gef.spec b/eclipse-gef.spec
index 8fce517..9c7eda3 100644
--- a/eclipse-gef.spec
+++ b/eclipse-gef.spec
@@ -2,8 +2,9 @@
%global eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-gef
-Version: 3.7.0
-Release: 2%{?dist}
+Version: 3.8.0
+#no tag in the repository, HEAD checked out
+Release: 0.1.20120402%{?dist}
Summary: Graphical Editing Framework (GEF) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -15,6 +16,12 @@ URL: http://www.eclipse.org/gef/
Source0: gef-%{version}.tar.gz
Source1: get-gef.sh
+Patch0: %{name}-generateSourceForDraw2dFeature.patch
+Patch1: %{name}-generateSourceForGefFeature.patch
+Patch2: %{name}-generateSourceForZestFeature.patch
+Patch3: %{name}-removeExamplesSourceSelfContainment.patch
+Patch4: %{name}-generateSourceForExamples.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -22,7 +29,7 @@ BuildArch: noarch
BuildRequires: java-devel
BuildRequires: java-javadoc
BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:3.6.0
+BuildRequires: eclipse-pde >= 1:4.2.0-0.4
Requires: java
Requires: jpackage-utils
Requires: eclipse-platform >= 1:3.6.0
@@ -55,6 +62,11 @@ to use the Eclipse Graphical Editing Framework (GEF) plugin.
%prep
%setup -q -n gef-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# make sure upstream hasn't snuck in any jars we don't know about
JARS=""
@@ -78,15 +90,15 @@ fi
OPTIONS="-DforceContextQualifier=v20110622-0958"
# build gef features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.zest -a "$OPTIONS"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.sdk \
- -a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin"
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.zest.sdk \
+eclipse-pdebuild -f org.eclipse.gef -a "$OPTIONS"
+eclipse-pdebuild -f org.eclipse.zest -a " $OPTIONS "
+eclipse-pdebuild -f org.eclipse.gef.sdk \
-a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin"
+eclipse-pdebuild -f org.eclipse.zest.sdk \
+ -a "$OPTIONS -DJAVADOC14_HOME=%{java_home}/bin -DindividualSourceBundles=true"
# build examples features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.examples
+eclipse-pdebuild -f org.eclipse.gef.examples -a "-DindividualSourceBundles=true"
%install
rm -rf %{buildroot}
@@ -107,19 +119,25 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{eclipse_dropin}/gef
-%doc org.eclipse.gef-feature/rootfiles/*
+%doc org.eclipse.gef-feature/license.html
+%doc org.eclipse.gef-feature/epl-v10.html
%files sdk
%defattr(-,root,root,-)
%{eclipse_dropin}/gef-sdk
-%doc org.eclipse.gef.sdk-feature/rootfiles/*
+%doc org.eclipse.gef.sdk-feature/license.html
+%doc org.eclipse.gef.sdk-feature/epl-v10.html
%files examples
%defattr(-,root,root,-)
%{eclipse_dropin}/gef-examples
-%doc org.eclipse.gef.examples-feature/rootfiles/*
+%doc org.eclipse.gef.examples-feature/license.html
+%doc org.eclipse.gef.examples-feature/epl-v10.html
%changelog
+* Mon Apr 2 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.8.0-0.1.20120402
+- Update to 3.8.0 post M6 build.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/get-gef.sh b/get-gef.sh
old mode 100644
new mode 100755
index 4589cac..750f8cf
--- a/get-gef.sh
+++ b/get-gef.sh
@@ -1,41 +1,23 @@
#!/bin/bash
NAME="gef"
-VERSION=3.7.0
-TAG="R201106220958"
+VERSION=3.8.0
+TAG="master"
-echo "Exporting from CVS..."
-mkdir $NAME-$VERSION
-pushd $NAME-$VERSION >/dev/null
+rm -rf org.eclipse.gef
+rm -rf gef-$VERSION/
-MAPFILE=$NAME.map
-TEMPMAPFILE=temp.map
-wget "http://download.eclipse.org/tools/gef/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
-dos2unix $MAPFILE
-grep ^[a-z] $MAPFILE > $TEMPMAPFILE
+git clone git://git.eclipse.org/gitroot/gef/org.eclipse.gef.git
-gawk 'BEGIN {
- FS=","
-}
-{
-if (NF < 4) {
+pushd org.eclipse.gef
+ git checkout $TAG
+popd
- split($1, version, "=");
- split(version[1], directory, "@");
- cvsdir=split($2, dirName, ":");
- printf("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]) | "/bin/bash";
-}
-else {
+mkdir gef-$VERSION/
+mv org.eclipse.gef/org.eclipse.{draw2d,gef,zest}*/ gef-$VERSION/
- split($1, version, "=");
- total=split($4, directory, "/");
- cvsdir=split($2, dirName, ":");
- printf("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[total], $4) | "/bin/bash";
-}
+rm -rf gef-$VERSION/org.eclipse.gef.baseline
-}' $TEMPMAPFILE
+tar czf gef-$VERSION.tar.gz gef-$VERSION
-rm $TEMPMAPFILE $MAPFILE
-popd >/dev/null
-
-echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
-tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION
+rm -rf org.eclipse.gef
+rm -rf gef-$VERSION
diff --git a/sources b/sources
index cfa3fa8..cb0b0d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-455382de72907ce28b483dcf81088a69 gef-3.7.0.tar.gz
+2a6cd0cbc96ee189500540dc3c208573 gef-3.8.0.tar.gz
More information about the scm-commits
mailing list