[eclipse] Update to SR1 RC4.
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed Sep 19 11:20:41 UTC 2012
commit 0548478c0f5062b459961720b8c107eac3610048
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed Sep 19 13:20:23 2012 +0200
Update to SR1 RC4.
eclipse-adjust-p2-server-dependencies.patch | 60 +++++++
eclipse-build-filesystem-native-libs.patch | 4 +-
eclipse-build-help-contents.patch | 220 ++++++++++++++----------
eclipse-build-network-native-libs.patch | 4 +-
eclipse-change-build-packagings.patch | 40 ++---
eclipse-help-feature-adjust-dependencies.patch | 46 ++----
eclipse-no-source-for-dependencies.patch | 6 +-
eclipse-test-support.patch | 11 --
eclipse.spec | 49 +++--
get-eclipse.sh | 9 +-
sources | 2 +-
11 files changed, 266 insertions(+), 185 deletions(-)
---
diff --git a/eclipse-adjust-p2-server-dependencies.patch b/eclipse-adjust-p2-server-dependencies.patch
new file mode 100644
index 0000000..a200f66
--- /dev/null
+++ b/eclipse-adjust-p2-server-dependencies.patch
@@ -0,0 +1,60 @@
+--- rt.equinox.bundles/features/org.eclipse.equinox.server.p2/pom.xml.bak 2012-09-18 12:45:36.000000000 +0200
++++ rt.equinox.bundles/features/org.eclipse.equinox.server.p2/pom.xml 2012-09-18 13:01:43.713664595 +0200
+@@ -35,7 +35,7 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-09-18 13:04:30.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-09-18 13:11:40.625276740 +0200
+@@ -36,7 +36,7 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/pom.xml.bak 2012-09-18 13:13:25.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/pom.xml 2012-09-18 13:29:57.556939493 +0200
+@@ -35,12 +35,7 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
+- </requirement>
+- <requirement>
+- <type>eclipse-plugin</type>
+- <id>org.apache.commons.logging.source</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+--- eclipse.platform.releng/features/master-equinox/pom.xml.bak 2012-09-18 13:31:23.000000000 +0200
++++ eclipse.platform.releng/features/master-equinox/pom.xml 2012-09-18 13:46:19.266892018 +0200
+@@ -38,7 +38,7 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-09-18 13:47:20.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-09-18 13:54:41.142892715 +0200
+@@ -48,7 +48,7 @@
+ <requirement>
+ <type>eclipse-plugin</type>
+ <id>org.apache.commons.logging</id>
+- <versionRange>[1.0,1.1)</versionRange>
++ <versionRange>[1.0,1.2)</versionRange>
+ </requirement>
+ </extraRequirements>
+ </dependency-resolution>
diff --git a/eclipse-build-filesystem-native-libs.patch b/eclipse-build-filesystem-native-libs.patch
index f3fb963..f1ce441 100644
--- a/eclipse-build-filesystem-native-libs.patch
+++ b/eclipse-build-filesystem-native-libs.patch
@@ -12,7 +12,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
-+ <value>linux.gtk.x86</value>
++ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <build>
@@ -81,7 +81,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
-+ <value>linux.gtk.x86_64</value>
++ <value>gtk.linux.x86_64</value>
+ </property>
+ </activation>
+ <build>
diff --git a/eclipse-build-help-contents.patch b/eclipse-build-help-contents.patch
index 7b56ea1..33c0f90 100644
--- a/eclipse-build-help-contents.patch
+++ b/eclipse-build-help-contents.patch
@@ -2,7 +2,7 @@
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml 2012-08-31 12:50:03.000000000 +0200
@@ -23,4 +23,52 @@
<artifactId>org.eclipse.jdt.doc.isv</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.8.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
@@ -57,7 +57,7 @@
+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml 2012-08-31 13:23:19.361168197 +0200
@@ -23,4 +23,57 @@
<artifactId>org.eclipse.platform.doc.isv</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.2.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+
@@ -252,9 +252,9 @@
</fileset>
</copy>
</target>
---- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt.bak 2012-09-05 11:23:13.000000000 +0200
-+++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-09-05 13:26:39.330138801 +0200
-@@ -2,117 +2,117 @@
+--- eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-09-17 15:29:48.000000000 +0200
++++ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt 2012-09-18 11:02:07.580141687 +0200
+@@ -2,133 +2,133 @@
-encoding "iso-8859-1"
-charset "iso-8859-1"
-sourcepath "
@@ -280,12 +280,27 @@
-;../org.eclipse.debug.core/core
-;../org.eclipse.debug.ui/ui
-;../org.eclipse.equinox.app/src
+-;../org.eclipse.e4.core.commands/src
+-;../org.eclipse.e4.core.contexts/src
+-;../org.eclipse.e4.core.di/src
+-;../org.eclipse.e4.core.services/src
+-;../org.eclipse.e4.ui.bindings/src
+-;../org.eclipse.e4.ui.css.core/src
+-;../org.eclipse.e4.ui.css.swt/src
+-;../org.eclipse.e4.ui.css.swt.theme/src
+-;../org.eclipse.e4.ui.di/src
+-;../org.eclipse.e4.ui.model.workbench/src
+-;../org.eclipse.e4.ui.services/src
+-;../org.eclipse.e4.ui.widgets/src
+-;../org.eclipse.e4.ui.workbench.renderers.swt/src
+-;../org.eclipse.e4.ui.workbench.swt/src
-;../org.eclipse.e4.ui.workbench/src
+-;../org.eclipse.e4.ui.workbench3/src
-;../org.eclipse.equinox.bidi/src
-;../org.eclipse.equinox.ds/src
-;../org.eclipse.equinox.common/src
-;../org.eclipse.equinox.frameworkadmin/src
--;../org.eclipse.equinox.http.jetty_3.0.0/src
+-;../org.eclipse.equinox.http.jetty_*/src
-;../org.eclipse.equinox.http.registry/src
-;../org.eclipse.equinox.http.servlet/src
-;../org.eclipse.equinox.jsp.jasper.registry/src
@@ -303,56 +318,11 @@
-;../org.eclipse.equinox.p2.ui/src
-;../org.eclipse.equinox.registry/src
-;../org.eclipse.equinox.security/src
-+;../../../eclipse.platform/ant/org.eclipse.ant.core/src
-+;../../../eclipse.platform.team/bundles/org.eclipse.compare.core/src
-+;../../../eclipse.platform.team/bundles/org.eclipse.compare/compare
-+;../../../eclipse.platform.ui/bundles/org.eclipse.core.commands/src
-+;../../../eclipse.platform.runtime/bundles/org.eclipse.core.contenttype/src
-+;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding.beans/src
-+;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding.observable/src
-+;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding.property/src
-+;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding/src
-+;../../../eclipse.platform.runtime/bundles/org.eclipse.core.expressions/src
-+;../../../eclipse.platform.text/org.eclipse.core.filebuffers/src
-+;../../../eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src
-+;../../../eclipse.platform.runtime/bundles/org.eclipse.core.jobs/src
-+;../../../eclipse.platform.team/bundles/org.eclipse.core.net/src
-+;../../../eclipse.platform.resources/bundles/org.eclipse.core.resources/src
-+;../../../eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-model
-+;../../../eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-runtime
-+;../../../eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src
-+;../../../eclipse.platform.debug/org.eclipse.core.variables/src
-+;../../../eclipse.platform.debug/org.eclipse.debug.core/core
-+;../../../eclipse.platform.debug/org.eclipse.debug.ui/ui
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.app/src
-+;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.workbench/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.ds/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.common/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.frameworkadmin/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty8/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.http.registry/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper.registry/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.preferences/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.director/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.operations/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.ql/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src
-+;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.registry/src
-+;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.security/src
- ;../org.eclipse.help.base/src
- ;../org.eclipse.help.base/src_demo
- ;../org.eclipse.help.ui/src
- ;../org.eclipse.help.webapp/src
- ;../org.eclipse.help/src
+-;../org.eclipse.help.base/src
+-;../org.eclipse.help.base/src_demo
+-;../org.eclipse.help.ui/src
+-;../org.eclipse.help.webapp/src
+-;../org.eclipse.help/src
-;../org.eclipse.jface.databinding/src
-;../org.eclipse.jface.text/projection
-;../org.eclipse.jface.text/src
@@ -398,6 +368,89 @@
-;../org.eclipse.team.ui/src
-;../org.eclipse.text/projection
-;../org.eclipse.text/src
+-;../org.eclipse.ui.cheatsheets/src
+-;../org.eclipse.ui.console/src
+-;../org.eclipse.ui.editors/src
+-;../org.eclipse.ui.forms/src
+-;../org.eclipse.ui.ide/extensions
+-;../org.eclipse.ui.ide/src
+-;../org.eclipse.ui.intro.universal/src
+-;../org.eclipse.ui.intro/src
+-;../org.eclipse.ui.navigator.resources/src
+-;../org.eclipse.ui.navigator/src
+-;../org.eclipse.ui.views.properties.tabbed/src
+-;../org.eclipse.ui.views/src
+-;../org.eclipse.ui.workbench.texteditor/src
+-;../org.eclipse.ui.workbench/Eclipse UI
+-;../org.eclipse.ui.workbench/Eclipse UI Editor Support
+-;../org.eclipse.ui/src
+-;../org.eclipse.update.configurator/src
++;../../../eclipse.platform/ant/org.eclipse.ant.core/src
++;../../../eclipse.platform.team/bundles/org.eclipse.compare.core/src
++;../../../eclipse.platform.team/bundles/org.eclipse.compare/compare
++;../../../eclipse.platform.ui/bundles/org.eclipse.core.commands/src
++;../../../eclipse.platform.runtime/bundles/org.eclipse.core.contenttype/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding.beans/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding.observable/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding.property/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.core.databinding/src
++;../../../eclipse.platform.runtime/bundles/org.eclipse.core.expressions/src
++;../../../eclipse.platform.text/org.eclipse.core.filebuffers/src
++;../../../eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src
++;../../../eclipse.platform.runtime/bundles/org.eclipse.core.jobs/src
++;../../../eclipse.platform.team/bundles/org.eclipse.core.net/src
++;../../../eclipse.platform.resources/bundles/org.eclipse.core.resources/src
++;../../../eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-model
++;../../../eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility/src-runtime
++;../../../eclipse.platform.runtime/bundles/org.eclipse.core.runtime/src
++;../../../eclipse.platform.debug/org.eclipse.core.variables/src
++;../../../eclipse.platform.debug/org.eclipse.debug.core/core
++;../../../eclipse.platform.debug/org.eclipse.debug.ui/ui
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.app/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.workbench/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.commands/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.contexts/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.di/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.core.services/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.bindings/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.core/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.swt/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.css.swt.theme/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.di/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.model.workbench/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.services/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.widgets/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.workbench.swt/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.workbench/src
++;../../../eclipse.platform.ui/bundles/org.eclipse.e4.ui.workbench3/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.ds/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.common/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.frameworkadmin/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.http.jetty_*/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.http.registry/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.http.servlet/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper.registry/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.jsp.jasper/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.preferences/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.director/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.operations/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.ql/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src
++;../../../rt.equinox.p2/bundles/org.eclipse.equinox.p2.ui/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.registry/src
++;../../../rt.equinox.bundles/bundles/org.eclipse.equinox.security/src
++;../../../eclipse.platform.ua/org.eclipse.help.base/src
++;../../../eclipse.platform.ua/org.eclipse.help.base/src_demo
++;../../../eclipse.platform.ua/org.eclipse.help.ui/src
++;../../../eclipse.platform.ua/org.eclipse.help.webapp/src
++;../../../eclipse.platform.ua/org.eclipse.help/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.jface.databinding/src
+;../../../eclipse.platform.text/org.eclipse.jface.text/projection
+;../../../eclipse.platform.text/org.eclipse.jface.text/src
@@ -443,27 +496,14 @@
+;../../../eclipse.platform.team/bundles/org.eclipse.team.ui/src
+;../../../eclipse.platform.text/org.eclipse.text/projection
+;../../../eclipse.platform.text/org.eclipse.text/src
- ;../org.eclipse.ui.cheatsheets/src
--;../org.eclipse.ui.console/src
--;../org.eclipse.ui.editors/src
--;../org.eclipse.ui.forms/src
--;../org.eclipse.ui.ide/extensions
--;../org.eclipse.ui.ide/src
++;../../../eclipse.platform.ua/org.eclipse.ui.cheatsheets/src
+;../../../eclipse.platform.debug/org.eclipse.ui.console/src
+;../../../eclipse.platform.text/org.eclipse.ui.editors/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.forms/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.ide/extensions
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.ide/src
- ;../org.eclipse.ui.intro.universal/src
- ;../org.eclipse.ui.intro/src
--;../org.eclipse.ui.navigator.resources/src
--;../org.eclipse.ui.navigator/src
--;../org.eclipse.ui.views.properties.tabbed/src
--;../org.eclipse.ui.views/src
--;../org.eclipse.ui.workbench.texteditor/src
--;../org.eclipse.ui.workbench/Eclipse UI
--;../org.eclipse.ui.workbench/Eclipse UI Editor Support
--;../org.eclipse.ui/src
++;../../../eclipse.platform.ua/org.eclipse.ui.intro.universal/src
++;../../../eclipse.platform.ua/org.eclipse.ui.intro/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.navigator.resources/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.navigator/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.views.properties.tabbed/src
@@ -471,12 +511,12 @@
+;../../../eclipse.platform.text/org.eclipse.ui.workbench.texteditor/src
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.workbench/Eclipse UI
+;../../../eclipse.platform.ui/bundles/org.eclipse.ui.workbench/Eclipse UI Editor Support
-+;../../../eclipse.platform.ui/bundles/org.eclipse.ui/src
- ;../org.eclipse.update.configurator/src
++;../../../eclipse.platform/update/org.eclipse.update.configurator/src
-d reference/api
-classpath @rt@
-@@ -174,7 +174,7 @@
- -link http://www.osgi.org/javadoc/r4v43
+ ;../com.ibm.icu_*.jar
+@@ -193,7 +193,7 @@
+ -link http://www.osgi.org/javadoc/r5/core
-link http://www.osgi.org/javadoc/r4v42
-../org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/adaptor/EclipseStarter.java
@@ -488,7 +528,7 @@
+++ eclipse.platform.common/bundles/org.eclipse.jdt.doc.user/pom.xml 2012-09-05 13:52:13.000000000 +0200
@@ -23,4 +23,41 @@
<artifactId>org.eclipse.jdt.doc.user</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.8.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
@@ -590,6 +630,10 @@
-encoding "iso-8859-1"
-charset "iso-8859-1"
--sourcepath "../org.eclipse.jdt.annotation/src
+-;../org.eclipse.ant.launching/src
+-;../org.eclipse.ant.ui/Ant Editor
+-;../org.eclipse.ant.ui/Ant Tools Support
+-;../org.eclipse.jdt.apt.core/src
-;../org.eclipse.jdt.core/antadapter
-;../org.eclipse.jdt.core/batch
-;../org.eclipse.jdt.core/codeassist
@@ -599,25 +643,21 @@
-;../org.eclipse.jdt.core/formatter
-;../org.eclipse.jdt.core/model
-;../org.eclipse.jdt.core/search
--;../org.eclipse.jdt.debug/model
--;../org.eclipse.jdt.debug/jdi
+-;../org.eclipse.jdt.core.manipulation/common
+-;../org.eclipse.jdt.core.manipulation/refactoring
-;../org.eclipse.jdt.debug/eval
+-;../org.eclipse.jdt.debug/jdi
+-;../org.eclipse.jdt.debug/model
-;../org.eclipse.jdt.debug.ui/ui
-;../org.eclipse.jdt.junit/src
-;../org.eclipse.jdt.junit.core/src
-;../org.eclipse.jdt.junit.runtime/src
-;../org.eclipse.jdt.launching/launching
--;../org.eclipse.jdt.ui/ui
--;../org.eclipse.jdt.ui/core refactoring
--;../org.eclipse.jdt.ui/ui refactoring
-;../org.eclipse.jdt.ui/core extension
+-;../org.eclipse.jdt.ui/core refactoring
-;../org.eclipse.jdt.ui/internal compatibility
--;../org.eclipse.jdt.core.manipulation/refactoring
--;../org.eclipse.jdt.core.manipulation/common
--;../org.eclipse.ant.launching/src
--;../org.eclipse.ant.ui/Ant Tools Support
--;../org.eclipse.ant.ui/Ant Editor
--;../org.eclipse.jdt.apt.core/src"
+-;../org.eclipse.jdt.ui/ui
+-;../org.eclipse.jdt.ui/ui refactoring"
+-sourcepath "../../../eclipse.jdt.core/org.eclipse.jdt.annotation/src
+;../../../eclipse.jdt.core/org.eclipse.jdt.core/antadapter
+;../../../eclipse.jdt.core/org.eclipse.jdt.core/batch
@@ -649,12 +689,12 @@
+;../../../eclipse.jdt.core/org.eclipse.jdt.apt.core/src"
-d reference/api
-classpath @rt@
- ;../com.ibm.icu_4.4.2.v20110823.jar
+ ;../com.ibm.icu_*.jar
--- eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml.bak 2012-09-05 11:23:16.000000000 +0200
+++ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pom.xml 2012-09-05 15:02:01.125672146 +0200
@@ -23,4 +23,49 @@
<artifactId>org.eclipse.pde.doc.user</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.8.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
diff --git a/eclipse-build-network-native-libs.patch b/eclipse-build-network-native-libs.patch
index 1ac2024..a80c6f7 100644
--- a/eclipse-build-network-native-libs.patch
+++ b/eclipse-build-network-native-libs.patch
@@ -11,7 +11,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
-+ <value>linux.gtk.x86</value>
++ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <build>
@@ -80,7 +80,7 @@
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
-+ <value>linux.gtk.x86_64</value>
++ <value>gtk.linux.x86_64</value>
+ </property>
+ </activation>
+ <build>
diff --git a/eclipse-change-build-packagings.patch b/eclipse-change-build-packagings.patch
index 487e60a..731c6d9 100644
--- a/eclipse-change-build-packagings.patch
+++ b/eclipse-change-build-packagings.patch
@@ -1,48 +1,46 @@
---- pom.xml.bak 2012-08-28 09:57:16.432181359 +0200
-+++ pom.xml 2012-08-28 09:58:00.791440793 +0200
-@@ -49,10 +49,13 @@
+--- pom.xml.orig 2012-09-17 16:49:47.931902759 +0200
++++ pom.xml 2012-09-17 16:44:21.694938495 +0200
+@@ -49,11 +49,13 @@
<module>rt.equinox.bundles</module>
<module>rt.equinox.framework</module>
<module>rt.equinox.p2</module>
+ <module>rt.equinox.incubator</module>
<module>eclipse.platform.releng</module>
+ <module>eclipse.platform.releng.tychoeclipsebuilder</module>
- <module>TMP/org.eclipse.sdk.epp</module>
+ <module>eclipse.platform.repository</module>
+ <module>TMP/jdtpde</module>
-+
<module>TMP/eclipse-junit-tests</module>
</modules>
</project>
---- TMP/org.eclipse.sdk.epp/pom.xml.bak 2012-08-28 09:35:00.000000000 +0200
-+++ TMP/org.eclipse.sdk.epp/pom.xml 2012-08-28 10:02:35.739112336 +0200
-@@ -46,7 +46,7 @@
+--- eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml.bak 2012-08-28 09:35:00.000000000 +0200
++++ eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml 2012-08-28 10:02:35.739112336 +0200
+@@ -45,7 +45,7 @@
<profile>SDKProfile</profile>
<products>
<product>
-- <id>org.eclipse.sdk.epp</id>
+- <id>org.eclipse.platform.ide</id>
+ <id>org.fedoraproject.eclipse.platform</id>
<rootFolder>eclipse</rootFolder>
</product>
</products>
---- TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product.bak 2012-08-28 10:04:10.214701605 +0200
-+++ TMP/org.eclipse.sdk.epp/org.eclipse.sdk.epp.product 2012-08-28 10:04:29.568822865 +0200
+--- eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product.bak 2012-08-28 10:04:10.214701605 +0200
++++ eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product 2012-08-28 10:04:29.568822865 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
--<product uid="org.eclipse.sdk.epp" name="Eclipse SDK" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
-+<product uid="org.fedoraproject.eclipse.platform" name="Eclipse SDK" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
+-<product uid="org.eclipse.platform.ide" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="false">
++<product uid="org.fedoraproject.eclipse.platform" name="Eclipse Platform" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.2.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
-@@ -159,7 +159,8 @@
- </plugins>
-
- <features>
-- <feature id="org.eclipse.sdk"/>
-+ <feature id="org.eclipse.platform"/>
-+ <feature id="org.eclipse.cvs"/>
+@@ -159,6 +159,7 @@
+ <feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
- <!--
<feature id="org.eclipse.rcp.configuration"/>
++ <feature id="org.eclipse.cvs"/>
+ </features>
+
+ <configurations>
diff --git a/eclipse-help-feature-adjust-dependencies.patch b/eclipse-help-feature-adjust-dependencies.patch
index ed42c55..044e846 100644
--- a/eclipse-help-feature-adjust-dependencies.patch
+++ b/eclipse-help-feature-adjust-dependencies.patch
@@ -52,54 +52,36 @@ diff -r -Nu eclipse-3.8.0-M1-src/plugins/org.eclipse.help.base/META-INF/MANIFEST
org.eclipse.ant.core;bundle-version="3.2.200";resolution:=optional,
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.help;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
---- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak 2012-07-25 17:39:10.000000000 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/pom.xml 2012-07-26 14:34:22.971863419 +0200
-@@ -33,7 +33,7 @@
- <extraRequirements>
- <requirement>
- <type>eclipse-plugin</type>
-- <id>org.apache.lucene</id>
-+ <id>org.apache.lucene.core</id>
- <versionRange>[2.9,3.0)</versionRange>
- </requirement>
- <requirement>
---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-07-25 17:26:52.000000000 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-07-27 14:39:44.824536490 +0200
-@@ -37,7 +37,7 @@
+--- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.orig 2012-09-17 15:30:40.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-09-18 11:49:09.843325313 +0200
+@@ -37,13 +37,13 @@
<extraRequirements>
<requirement>
<type>eclipse-plugin</type>
- <id>org.apache.lucene</id>
+- <versionRange>[2.9,3.0)</versionRange>
+ <id>org.apache.lucene.core</id>
- <versionRange>[2.9,3.0)</versionRange>
++ <versionRange>[3.0,4.0)</versionRange>
</requirement>
<requirement>
---- eclipse.platform.ua/org.eclipse.help.base/pom.xml.bak 2012-08-28 09:32:59.754115174 +0200
-+++ eclipse.platform.ua/org.eclipse.help.base/pom.xml 2012-08-28 09:28:24.281350613 +0200
-@@ -34,12 +34,12 @@
- <requirement>
<type>eclipse-plugin</type>
- <id>org.apache.lucene.core</id>
+ <id>org.apache.lucene.analysis</id>
- <versionRange>[2.9,3.0)</versionRange>
+ <versionRange>[3.0,4.0)</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
- <id>org.apache.lucene.analysis</id>
+--- eclipse.platform.ua/pom.xml.bak 2012-09-18 12:21:35.000000000 +0200
++++ eclipse.platform.ua/pom.xml 2012-09-18 12:35:35.157870857 +0200
+@@ -49,13 +49,13 @@
+ <extraRequirements>
+ <requirement>
+ <type>eclipse-plugin</type>
+- <id>org.apache.lucene</id>
- <versionRange>[2.9,3.0)</versionRange>
++ <id>org.apache.lucene.core</id>
+ <versionRange>[3.0,4.0)</versionRange>
</requirement>
- </extraRequirements>
- </dependency-resolution>
---- eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml.bak 2012-08-28 09:30:36.530197639 +0200
-+++ eclipse.platform.releng/features/org.eclipse.help-feature/pom.xml 2012-08-28 09:28:24.276350580 +0200
-@@ -38,12 +38,12 @@
- <requirement>
- <type>eclipse-plugin</type>
- <id>org.apache.lucene.core</id>
-- <versionRange>[2.9,3.0)</versionRange>
-+ <versionRange>[3.0,4.0)</versionRange>
- </requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.apache.lucene.analysis</id>
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 59d14a2..65e9d18 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -443,9 +443,9 @@
--- eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml.bak 2012-07-25 17:40:44.000000000 +0200
+++ eclipse.platform.ui/features/org.eclipse.e4.rcp/pom.xml 2012-07-30 16:28:44.017838079 +0200
@@ -67,6 +67,12 @@
- <plugin id="org.eclipse.swt.gtk.aix.ppc" />
- <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
- <plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
+ <plugin id="org.w3c.css.sac" />
+ <plugin id="org.w3c.dom.smil" />
+ <plugin id="org.w3c.dom.svg" />
+
+ <plugin id="org.w3c.dom.svg" /><plugin id="org.apache.batik.css"/><plugin id="org.apache.batik.util"/>
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 606a7b3..d37d550 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -211,17 +211,6 @@
</exec>
</target>
---- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-04 11:45:10.000000000 +0200
-+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-05 11:21:20.379946308 +0200
-@@ -914,7 +914,7 @@
- <antcall target="coreresources" />
- <antcall target="osgi" />
- <antcall target="coreexpressions" />
-- <antcall target="update" />
-+ <!--antcall target="update" /-->
- <antcall target="teamcore" />
- <antcall target="jdtcoreperf" />
- <antcall target="jdtcorebuilder" />
--- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-06 09:11:00.000000000 +0200
+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-06 09:12:14.131863056 +0200
@@ -949,9 +949,9 @@
diff --git a/eclipse.spec b/eclipse.spec
index d23f214..794cdf8 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,9 +1,13 @@
Epoch: 1
+# had to disable debug package
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=389862
+%define debug_package %{nil}
+
%global eclipse_major 4
%global eclipse_minor 2
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
-%global eclipse_micro 0
+%global eclipse_micro 1
%global initialize 1
%global eb_commit 701400b0ca475ea73bd828c66b00fb63c5ec2c8c
%global build_id I20120608-1400
@@ -33,7 +37,7 @@ ln -s %{_javadir}/%{2} ${_f}
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 19%{?dist}
+Release: 0.1%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -181,6 +185,9 @@ Patch30: %{name}-remove-tomcat6.patch
Patch31: %{name}-explicit-jdt-in-platform.patch
+Patch32: %{name}-adjust-p2-server-dependencies.patch
+
+
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -404,10 +411,13 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch29
%patch30
%patch31
+%patch32
-#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
-%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
-%pom_disable_module bundles/org.eclipse.equinox.http.jetty6 rt.equinox.bundles .
+#To save build hdd space (it took more than 10GB to build everything)
+%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
+%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder
#we do not have dependencies for those tests
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
@@ -504,7 +514,7 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
# pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
mvn-rpmbuild clean install \
- -Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH} \
+ -Dmaven.test.skip=true -Dnative=gtk.linux.${ARCH} \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
# popd
@@ -527,12 +537,13 @@ mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.${ARCH} \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Demf-repo.url=file:/`pwd`/repo
-pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}
+pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}
######################
# Extract jdt and pde to dropins
######################
-# do the initializer magic
+# do the initializer magic - initialize dropins just in case
+mkdir -p eclipse/dropins
cp ../../../../../../../../rt.equinox.incubator/framework/bundles/org.eclipse.equinox.initializer/target/org.eclipse.equinox.initializer-1.0.0-SNAPSHOT.jar eclipse/dropins
pushd eclipse
./eclipse -application org.eclipse.equinox.initializer.configInitializer -justThisArchOSWS -fileInitializer ../../../../../../../../../extract_patterns.txt
@@ -632,12 +643,6 @@ cd org.apache.ant_*
popd
popd
-#enf of platform symlinking
-#Install the jdt bundle right into the master Eclipse
-#./eclipse -application org.eclipse.equinox.p2.director \
-# -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
-# -installIU org.eclipse.jdt.core
-#quit the eclipse folder
popd
#make a backup
@@ -645,7 +650,7 @@ cp -rf eclipse eclipse-backup-with-jdt
# go into backup
pushd eclipse-backup-with-jdt
./eclipse -application org.eclipse.equinox.p2.director \
- -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
+ -repository file:/`pwd`/../../../../../../../../../TMP/jdtpde/target/repository \
-installIU org.eclipse.jdt.feature.group
#exit backup
popd
@@ -670,7 +675,7 @@ cp -rf eclipse-backup-with-jdt eclipse-backup-with-jdt-pde
pushd eclipse-backup-with-jdt-pde
./eclipse -application org.eclipse.equinox.p2.director \
- -repository file:/`pwd`/../../../../../../../../jdtpde/target/repository \
+ -repository file:/`pwd`/../../../../../../../../../TMP/jdtpde/target/repository \
-installIU org.eclipse.sdk.feature.group
popd
@@ -763,11 +768,11 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
#################################
LOCAL_PWD=`pwd`
#change the installation p2 files
-pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/
+pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/
for i in `ls | grep "profile.gz"` ; do \
echo $i ; \
gunzip $i ; \
- sed -i -e "s@${LOCAL_PWD}/TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse@%{_libdir}/eclipse at g" *.profile ; \
+ sed -i -e "s@${LOCAL_PWD}/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse@%{_libdir}/eclipse at g" *.profile ; \
gzip *.profile ; \
done
@@ -775,7 +780,7 @@ for i in `ls | grep "profile.gz"` ; do \
popd
#installation itself - copy it into right location
-rsync -vrpl TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse \
+rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse \
$RPM_BUILD_ROOT%{_libdir}
#desktop file
@@ -785,7 +790,7 @@ install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applicat
chmod ugo+rx jdtcompilatorscript/efj.sh
mkdir -p $RPM_BUILD_ROOT/usr/bin
install jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT/usr/bin/efj
-TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/plugins | grep launcher_[0-9]*`
+TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/plugins | grep launcher_[0-9]*`
sed -i -e "s, at LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT/usr/bin/efj
#eclipse binary
@@ -1004,6 +1009,7 @@ rm -rf %{_bindir}/efj/
%{_libdir}/%{name}/features/org.eclipse.rcp_*
%{_libdir}/%{name}/features/org.eclipse.emf.common_*
%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
+%{_libdir}/%{name}/features/org.eclipse.rcp.configuration_*
%{_libdir}/%{name}/plugins/com.ibm.icu_*
%{_libdir}/%{name}/plugins/com.jcraft.jsch_*
%{_libdir}/%{name}/plugins/javax.servlet_*
@@ -1229,6 +1235,9 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Wed Sep 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-0.1
+- Update to SR1 RC4.
+
* Mon Sep 17 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-19
- Add BR/R tomcat-jsp-2.2-api tp platform.
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 61dff1e..16470e4 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,9 +1,12 @@
#!/bin/bash
rm -rf R4_platform-aggregator
+rm eclipse-source.tar.bz2
-git clone -b Juno_RC4_R4 --recurse-submodules git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
+git clone -b JunoSR1_RC1_R4 --recurse-submodules git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
+
+pushd R4_platform-aggregator
find . -type d -name ".git" -exec rm -rf {} \;
find . -type f -name "*.class" -exec rm -rf {} \;
@@ -13,5 +16,5 @@ find . -name *.jar -exec rm -rf {} \;
find . -type f -name *.so -exec rm -rf {} \;
find . -type f -name *.dll -exec rm -rf {} \;
find . -type f -name *.jnilib -exec rm -rf {} \;
-
-tar cjf eclipse-source.tar.bz R4_platform-aggregator
+popd
+tar cjf eclipse-source.tar.bz2 R4_platform-aggregator
diff --git a/sources b/sources
index 801d76d..59bea22 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cb058e425a067773e648a78d4e3ada27 eclipse-source.tar.bz2
+6e95a7917c772ae2f9c283806f233ab9 eclipse-source.tar.bz2
0caade338914415a37f767b7758148ea org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
More information about the scm-commits
mailing list