[eclipse-dltk/f17] Update to dltk-4.0.0 release
swagiaal
swagiaal at fedoraproject.org
Mon Jul 16 18:39:19 UTC 2012
commit 78f0f1a26dbe9ed49b95363ce28d2f6d709cf921
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date: Mon Jul 16 14:14:29 2012 -0400
Update to dltk-4.0.0 release
correct-CommonImages-path.patch | 25 +++++++++++++
correct-mismatched-feature-and-artifactIds.patch | 38 ++++++++++++++++----
disable-javascript-and-python.patch | 21 ++++++++---
disable-specific-environment-settings.patch | 18 ++++++---
eclipse-dltk.spec | 7 +++-
get-dltk.sh | 9 ++---
remove-dependencies-on-empty-source-bundles.patch | 19 ++++++++--
...missing-files-from-build.properties-files.patch | 17 +++++++--
rename-tycho-plugins-to-0.14.0-names.patch | 22 +++++++-----
sources | 2 +-
10 files changed, 135 insertions(+), 43 deletions(-)
---
diff --git a/correct-CommonImages-path.patch b/correct-CommonImages-path.patch
new file mode 100644
index 0000000..a0ecd1d
--- /dev/null
+++ b/correct-CommonImages-path.patch
@@ -0,0 +1,25 @@
+From 74ef7d22916073f58273399468b2e762008f12ec Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 16:08:12 -0400
+Subject: [PATCH] correct-CommonImages-path
+
+---
+ .../dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java b/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
+index cddb5e8..3f94572 100644
+--- a/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
++++ b/mylyn/plugins/org.eclipse.dltk.mylyn/src/org/eclipse/dltk/internal/mylyn/editor/FocusedDLTKProposalProcessor.java
+@@ -24,7 +24,7 @@ import org.eclipse.dltk.ui.text.completion.ScriptCompletionProposal;
+ import org.eclipse.mylyn.commons.core.StatusHandler;
+ import org.eclipse.mylyn.context.core.ContextCore;
+ import org.eclipse.mylyn.context.core.IInteractionElement;
+-import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
++import org.eclipse.mylyn.commons.ui.CommonImages;
+
+ /**
+ * TODO: parametrize relevance levels (requires JDT changes, bug 119063)
+--
+1.7.10.4
+
diff --git a/correct-mismatched-feature-and-artifactIds.patch b/correct-mismatched-feature-and-artifactIds.patch
index 1ec0a56..eae87e0 100644
--- a/correct-mismatched-feature-and-artifactIds.patch
+++ b/correct-mismatched-feature-and-artifactIds.patch
@@ -1,11 +1,32 @@
-commit 4a73e1171d6374aacff006d4431b62c20c0117ac
-Author: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Mon Apr 23 15:51:04 2012 -0400
+From be9dcb34ed4fbc64f68ce1977b7f2e6862780f80 Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 10:46:12 -0400
+Subject: [PATCH 2/7] "correct-mismatched-feature-and-artifactIds"
- Make sure groupId matches bundle id
-
- Add -feature to the group id of all features for
- consistency
+---
+ core/features/org.eclipse.dltk.core-feature/pom.xml | 4 ++--
+ core/features/org.eclipse.dltk.core.index-feature/pom.xml | 4 ++--
+ core/features/org.eclipse.dltk.core.index.sdk/pom.xml | 2 +-
+ core/features/org.eclipse.dltk.core.sdk/pom.xml | 2 +-
+ core/features/org.eclipse.dltk.core.tests/pom.xml | 4 ++--
+ itcl/features/org.eclipse.dltk.itcl-feature/pom.xml | 4 ++--
+ itcl/features/org.eclipse.dltk.itcl.sdk/pom.xml | 2 +-
+ javascript/features/org.eclipse.dltk.javascript-feature/pom.xml | 2 +-
+ javascript/features/org.eclipse.dltk.javascript.sdk/pom.xml | 2 +-
+ javascript/features/org.eclipse.dltk.javascript.tests/pom.xml | 2 +-
+ mylyn/features/org.eclipse.dltk.mylyn-feature/pom.xml | 4 ++--
+ mylyn/features/org.eclipse.dltk.mylyn.sdk/pom.xml | 2 +-
+ python/features/org.eclipse.dltk.python-feature/pom.xml | 4 ++--
+ python/features/org.eclipse.dltk.python.sdk/pom.xml | 2 +-
+ rse/features/org.eclipse.dltk.rse-feature/pom.xml | 4 ++--
+ rse/features/org.eclipse.dltk.rse.sdk/pom.xml | 2 +-
+ ruby/features/org.eclipse.dltk.ruby-feature/pom.xml | 4 ++--
+ ruby/features/org.eclipse.dltk.ruby.sdk/pom.xml | 2 +-
+ tcl/features/org.eclipse.dltk.tcl-feature/pom.xml | 4 ++--
+ tcl/features/org.eclipse.dltk.tcl.sdk/pom.xml | 2 +-
+ xotcl/features/org.eclipse.dltk.xotcl-feature/pom.xml | 4 ++--
+ xotcl/features/org.eclipse.dltk.xotcl.sdk/pom.xml | 2 +-
+ 22 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/core/features/org.eclipse.dltk.core-feature/pom.xml b/core/features/org.eclipse.dltk.core-feature/pom.xml
index c2d4ae8..7e34e06 100644
@@ -313,3 +334,6 @@ index 7f141e9..aa730aa 100644
<artifactId>org.eclipse.dltk.xotcl.sdk</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
+--
+1.7.10.4
+
diff --git a/disable-javascript-and-python.patch b/disable-javascript-and-python.patch
index 1622c07..b041e68 100644
--- a/disable-javascript-and-python.patch
+++ b/disable-javascript-and-python.patch
@@ -1,14 +1,18 @@
-commit bed0a5f9c3c89a9f89c0d5ac487a40df4efd80a7
-Author: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Tue Apr 24 16:21:49 2012 -0400
+From 7763d05707c366f4274844321fb5169224aac93c Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 10:46:12 -0400
+Subject: [PATCH 6/7] disable-javascript-and-python
- Fedora: Disable javascript and python packages
+---
+ build/pom.xml | 8 ++++----
+ build/update.site/site.xml | 2 ++
+ 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
-index 6d680dd..77df341 100644
+index f088c15..5d20a0a 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -30,11 +30,13 @@
+@@ -30,13 +30,13 @@
<module>../xotcl</module>
<module>../itcl</module>
<module>../ruby</module>
@@ -17,6 +21,8 @@ index 6d680dd..77df341 100644
- <module>../python</module>
<module>../mylyn</module>
<module>update.site</module>
+- <module>testplatform</module>
+- <module>javascript.tests</module>
+ <!--
+ <module>../javascript</module>
+ <module>../python</module>
@@ -44,3 +50,6 @@ index 61ecc3b..8bcb33c 100644
<feature url="features/org.eclipse.dltk.xotcl_4.0.0.qualifier.jar" id="org.eclipse.dltk.xotcl" version="4.0.0.qualifier">
<category name="Dynamic Languages Toolkit (DLTK)"/>
</feature>
+--
+1.7.10.4
+
diff --git a/disable-specific-environment-settings.patch b/disable-specific-environment-settings.patch
index 1b11254..7d94cfb 100644
--- a/disable-specific-environment-settings.patch
+++ b/disable-specific-environment-settings.patch
@@ -1,14 +1,17 @@
-commit e3d2326c040fc07681998ba31de63df83b90c0e5
-Author: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Mon Apr 23 16:35:47 2012 -0400
+From 0f5896e097b7a6c834d8059c1acf20c7f99b3d76 Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 10:46:12 -0400
+Subject: [PATCH 5/7] "disable-specific-environment-settings"
- Fedora: disable specific environment settings
+---
+ build/pom.xml | 36 ------------------------------------
+ 1 file changed, 36 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
-index 653ae58..0ef0f4a 100644
+index 4e26659..f088c15 100644
--- a/build/pom.xml
+++ b/build/pom.xml
-@@ -76,42 +76,6 @@
+@@ -78,42 +78,6 @@
</execution>
</executions>
</plugin>
@@ -51,3 +54,6 @@ index 653ae58..0ef0f4a 100644
</plugins>
</build>
</project>
+--
+1.7.10.4
+
diff --git a/eclipse-dltk.spec b/eclipse-dltk.spec
index f39d730..e2132ee 100644
--- a/eclipse-dltk.spec
+++ b/eclipse-dltk.spec
@@ -2,7 +2,7 @@
Name: eclipse-dltk
Version: 4.0.0
-Release: 0.5.201201070225cvs%{?dist}
+Release: 1%{?dist}
Summary: Dynamic Languages Toolkit (DLTK) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -21,6 +21,7 @@ Patch4: correct-required-version-of-org.eclipse.rse.services.ssh.patch
Patch5: disable-specific-environment-settings.patch
Patch6: disable-javascript-and-python.patch
Patch7: rename-tycho-plugins-to-0.14.0-names.patch
+Patch8: correct-CommonImages-path.patch
BuildArch: noarch
@@ -141,6 +142,7 @@ Documentation and source for the Eclipse Dynamic Languages Toolkit (DLTK).
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
@@ -251,6 +253,9 @@ popd
%doc core/features/org.eclipse.dltk.core.sdk/rootfiles/*
%changelog
+* Mon Jul 16 2012 Sami Wagiaalla <swagiaal at redhat.com> - 4.0.0-1
+- Update to 4.0.0 release.
+
* Thu Jun 14 2012 Roland Grunberg <rgrunber at redhat.com> - 4.0.0-0.5.201201070225cvs
- Remove patches that bump BREE to JavaSE-1.6 (done by Tycho).
- Remove patch and %%prep lines that create p2 repository (done by Tycho).
diff --git a/get-dltk.sh b/get-dltk.sh
index 2e7882f..55982cf 100644
--- a/get-dltk.sh
+++ b/get-dltk.sh
@@ -1,17 +1,16 @@
#!/bin/bash
NAME="dltk"
VERSION=4.0.0
-TAG=""
-DATE="2012-01-07 02:25"
+TAG="Root_R4_0_maintenance"
+DATE=""
if [ -n "$DATE" ]
then
- CHECKOUT="-D $DATE"
+ cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -D "$DATE" org.eclipse.dltk
else
- CHECKOUT="-r $TAG"
+ cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export -r $TAG org.eclipse.dltk
fi
-cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/technology export "$CHECKOUT" org.eclipse.dltk
mv org.eclipse.dltk $NAME-$VERSION
#Remove any commited jars
diff --git a/remove-dependencies-on-empty-source-bundles.patch b/remove-dependencies-on-empty-source-bundles.patch
index af8faa0..abb2665 100644
--- a/remove-dependencies-on-empty-source-bundles.patch
+++ b/remove-dependencies-on-empty-source-bundles.patch
@@ -1,8 +1,16 @@
-commit 23752fdef858fdf973d53dfe0a3446df81aa4234
-Author: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Mon Apr 23 16:31:51 2012 -0400
+From 6abe3d7fa876db9a9fe6f2138b8b71537c85b53f Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 10:46:12 -0400
+Subject: [PATCH 1/7] "remove-dependencies-on-empty-source-bundles"
- Remove feature requirement on empty source bundles
+---
+ core/features/org.eclipse.dltk.core.index.sdk/feature.xml | 6 ------
+ core/features/org.eclipse.dltk.core.sdk/feature.xml | 7 -------
+ itcl/features/org.eclipse.dltk.itcl.sdk/feature.xml | 6 ------
+ ruby/features/org.eclipse.dltk.ruby.sdk/feature.xml | 7 -------
+ tcl/features/org.eclipse.dltk.tcl.sdk/feature.xml | 13 -------------
+ xotcl/features/org.eclipse.dltk.xotcl.sdk/feature.xml | 7 -------
+ 6 files changed, 46 deletions(-)
diff --git a/core/features/org.eclipse.dltk.core.index.sdk/feature.xml b/core/features/org.eclipse.dltk.core.index.sdk/feature.xml
index a837a13..2a455d2 100644
@@ -117,3 +125,6 @@ index ddc65f6..f2f59e5 100644
- unpack="false"/>
-
</feature>
+--
+1.7.10.4
+
diff --git a/remove-missing-files-from-build.properties-files.patch b/remove-missing-files-from-build.properties-files.patch
index 855e4f8..c5dddc2 100644
--- a/remove-missing-files-from-build.properties-files.patch
+++ b/remove-missing-files-from-build.properties-files.patch
@@ -1,8 +1,14 @@
-commit 58ff7f817889aff27bc28cc75f64c88f82a788ba
-Author: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Mon Apr 23 16:33:23 2012 -0400
+From 57f085e32dc5e667af65fd01b26567eb721fc07f Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 10:46:12 -0400
+Subject: [PATCH 3/7] "remove-missing-files-from-build.properties-files"
- Remove missing files from build.properties
+---
+ ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties | 1 -
+ tcl/docs/org.eclipse.dltk.tcl.doc.user/build.properties | 9 ---------
+ tcl/plugins/org.eclipse.dltk.tcl.launching/build.properties | 1 -
+ tcl/plugins/org.eclipse.dltk.tcl.tclchecker/build.properties | 1 -
+ 4 files changed, 12 deletions(-)
diff --git a/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties b/ruby/plugins/org.eclipse.dltk.ruby.debug/build.properties
index bdcf028..3531e32 100644
@@ -65,3 +71,6 @@ index 3fc6549..342192d 100644
resources/,\
about.html
src.includes = models/,\
+--
+1.7.10.4
+
diff --git a/rename-tycho-plugins-to-0.14.0-names.patch b/rename-tycho-plugins-to-0.14.0-names.patch
index 5b726d3..6628e22 100644
--- a/rename-tycho-plugins-to-0.14.0-names.patch
+++ b/rename-tycho-plugins-to-0.14.0-names.patch
@@ -1,13 +1,14 @@
-commit eaf13a50e0b48f375bf45593d3dc2940803da009
-Author: Sami Wagiaalla <swagiaal at redhat.com>
-Date: Mon Apr 23 15:23:41 2012 -0400
+From 8ec74bf4fcad2183afa6128aa4113a4dc945bdc2 Mon Sep 17 00:00:00 2001
+From: Sami Wagiaalla <swagiaal at redhat.com>
+Date: Thu, 12 Jul 2012 10:46:12 -0400
+Subject: [PATCH 7/7] "rename-tycho-plugins-to-0.14.0-names"
- Update tycho version to 0.14
-
- and rename plugins with their 0.14 names
+---
+ build/pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/pom.xml b/build/pom.xml
-index 0bae91b..034ea3d 100644
+index 5d20a0a..3fba580 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -9,7 +9,7 @@
@@ -19,7 +20,7 @@ index 0bae91b..034ea3d 100644
<tycho-groupid>org.eclipse.tycho</tycho-groupid>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<eclipse-repository-url>http://download.eclipse.org/releases/indigo/</eclipse-repository-url>
-@@ -42,7 +42,7 @@
+@@ -44,7 +44,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -28,7 +29,7 @@ index 0bae91b..034ea3d 100644
<version>${tycho-version}</version>
</plugin>
-@@ -59,7 +59,7 @@
+@@ -61,7 +61,7 @@
</plugin>
<plugin>
<groupId>${tycho-groupid}</groupId>
@@ -37,3 +38,6 @@ index 0bae91b..034ea3d 100644
<version>${tycho-version}</version>
</plugin>
+--
+1.7.10.4
+
diff --git a/sources b/sources
index 8cd0110..ae7b0ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9409d69730a6037ddcf5b102f80268e dltk-4.0.0.tar.xz
+d778c984f5d48aa4bb7b5723fd3c3414 dltk-4.0.0.tar.xz
More information about the scm-commits
mailing list