Update to pre - SR2 - work in progress
This commit is contained in:
Krzysztof Daniel
parent
c19d091132
commit
ebb857413e
File diff suppressed because it is too large
Load Diff
|
|
@ -2,7 +2,7 @@
|
|||
+++ eclipse.jdt.debug/org.eclipse.jdt.launching/pom.xml 2012-09-19 14:36:29.035226726 +0200
|
||||
@@ -22,4 +22,50 @@
|
||||
<artifactId>org.eclipse.jdt.launching</artifactId>
|
||||
<version>3.6.100-SNAPSHOT</version>
|
||||
<version>3.6.101-SNAPSHOT</version>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
+
|
||||
+ <build>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- 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 @@
|
||||
@@ -49,6 +49,7 @@
|
||||
<module>rt.equinox.bundles</module>
|
||||
<module>rt.equinox.framework</module>
|
||||
<module>rt.equinox.p2</module>
|
||||
|
|
@ -8,15 +8,9 @@
|
|||
|
||||
<module>eclipse.platform.releng</module>
|
||||
<module>eclipse.platform.releng.tychoeclipsebuilder</module>
|
||||
|
||||
<module>eclipse.platform.repository</module>
|
||||
+ <module>TMP/jdtpde</module>
|
||||
<module>TMP/eclipse-junit-tests</module>
|
||||
</modules>
|
||||
</project>
|
||||
--- 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 @@
|
||||
@@ -45,10 +45,11 @@
|
||||
<profile>SDKProfile</profile>
|
||||
<products>
|
||||
<product>
|
||||
|
|
@ -25,6 +19,10 @@
|
|||
<rootFolder>eclipse</rootFolder>
|
||||
</product>
|
||||
</products>
|
||||
+ <!--source>repository</source-->
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
--- 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 @@
|
||||
|
|
@ -44,3 +42,12 @@
|
|||
</features>
|
||||
|
||||
<configurations>
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/pom.xml.bak 2012-12-17 15:03:11.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/pom.xml 2012-12-18 10:32:35.835825807 +0100
|
||||
@@ -37,5 +37,6 @@
|
||||
<module>rcp.config</module>
|
||||
<module>rcp.sdk</module>
|
||||
<module>sdk</module>
|
||||
+ <module>jdtpde</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -1,229 +1,47 @@
|
|||
--- eclipse.platform.releng/features/master-equinox/feature.xml.bak 2012-07-25 17:26:52.000000000 +0200
|
||||
+++ eclipse.platform.releng/features/master-equinox/feature.xml 2012-09-07 20:13:36.050319021 +0200
|
||||
@@ -7,173 +7,139 @@
|
||||
<includes
|
||||
id="org.eclipse.equinox.sdk"
|
||||
version="0.0.0"/>
|
||||
-
|
||||
- <plugin
|
||||
+
|
||||
+ <includes
|
||||
+ id="org.eclipse.equinox.starterkit.product.feature"
|
||||
+ version="0.0.0"/>
|
||||
+
|
||||
+ <includes
|
||||
+ id="org.eclipse.pde.build.product.feature"
|
||||
+ version="0.0.0"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.equinox.supplement"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.equinox.http.registry"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.equinox.http.jetty"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ version="0.0.0"
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.equinox.http.servlet"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.http.servletbridge"
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.http.servletbridge"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.eclipse.equinox.servletbridge"
|
||||
+
|
||||
+ <plugin
|
||||
+ id="org.eclipse.equinox.servletbridge"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+
|
||||
+ <plugin
|
||||
id="javax.servlet"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="javax.el"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.apache.commons.logging"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.continuation"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.http"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+ unpack="false"/>
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.io"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
+
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.security"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
- <plugin
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.server"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
-<plugin
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.servlet"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
-<plugin
|
||||
+ <plugin
|
||||
id="org.eclipse.jetty.util"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.felix.gogo.runtime"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
+
|
||||
--- eclipse.platform.releng/features/master-equinox/feature.xml.orig 2012-12-17 15:17:55.000000000 +0100
|
||||
+++ eclipse.platform.releng/features/master-equinox/feature.xml 2012-12-18 09:50:45.413972005 +0100
|
||||
@@ -128,13 +128,13 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.slf4j.api"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.mina.core"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="0.0.0"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.sshd.core"
|
||||
+ id="org.apache.felix.gogo.runtime"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
- id="org.apache.jasper.glassfish"
|
||||
+
|
||||
+ <plugin
|
||||
+ id="slf4j.api"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
-
|
||||
- <!-- see bug 368488 and bug 377314
|
||||
unpack="false"/>
|
||||
|
||||
- <plugin
|
||||
+ <!--plugin
|
||||
id="org.apache.mina.core"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
@@ -146,10 +146,10 @@
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
- unpack="false"/>
|
||||
+ unpack="false"/-->
|
||||
|
||||
<plugin
|
||||
- id="org.apache.jasper.glassfish"
|
||||
+ id="org.glassfish.web.javax.servlet.jsp"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
@@ -160,13 +160,13 @@
|
||||
id="master-equinox-p2"
|
||||
version="0.0.0"/>
|
||||
-->
|
||||
- <includes
|
||||
- id="master-equinox-p2"
|
||||
- version="0.0.0"/>
|
||||
- -->
|
||||
- <includes
|
||||
- id="master-equinox-weaving"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <includes
|
||||
- id="org.eclipse.equinox.weaving.sdk"
|
||||
+ <!--includes //no weaving for e-b
|
||||
id="master-equinox-weaving"
|
||||
version="0.0.0"/>
|
||||
|
||||
<includes
|
||||
id="org.eclipse.equinox.weaving.sdk"
|
||||
- version="0.0.0"/>
|
||||
+ version="0.0.0"/-->
|
||||
|
||||
- <includes
|
||||
- id="org.eclipse.equinox.starterkit.product.feature"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
- <includes
|
||||
- id="org.eclipse.pde.build.product.feature"
|
||||
- version="0.0.0"/>
|
||||
-
|
||||
</feature>
|
||||
<includes
|
||||
id="org.eclipse.equinox.starterkit.product.feature"
|
||||
|
|
|
|||
|
|
@ -1,22 +1,33 @@
|
|||
--- eclipse-parent/pom.xml.bak 2012-08-09 16:08:45.000000000 +0200
|
||||
+++ eclipse-parent/pom.xml 2012-08-09 16:10:22.504134998 +0200
|
||||
@@ -165,19 +165,9 @@
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
--- eclipse-parent/pom.xml.orig 2012-12-17 15:03:11.000000000 +0100
|
||||
+++ eclipse-parent/pom.xml 2012-12-18 10:01:03.641488185 +0100
|
||||
@@ -207,7 +207,7 @@
|
||||
<artifactId>tycho-packaging-plugin</artifactId>
|
||||
<version>${tycho.version}</version>
|
||||
- <dependencies>
|
||||
<dependencies>
|
||||
- <dependency>
|
||||
- <groupId>org.eclipse.tycho.extras</groupId>
|
||||
- <artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
- <version>${tycho-extras.version}</version>
|
||||
+ <!-- dependency>
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-buildtimestamp-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
@@ -216,18 +216,18 @@
|
||||
<groupId>org.eclipse.tycho.extras</groupId>
|
||||
<artifactId>tycho-sourceref-jgit</artifactId>
|
||||
<version>${tycho-extras.version}</version>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
+ </dependency -->
|
||||
</dependencies>
|
||||
<configuration>
|
||||
<strictBinIncludes>false</strictBinIncludes>
|
||||
<format>'v'yyyyMMdd-HHmm</format>
|
||||
- <timestampProvider>jgit</timestampProvider>
|
||||
- <jgit.ignore>
|
||||
- </jgit.ignore>
|
||||
+ <!--timestampProvider>jgit</timestampProvider>
|
||||
<jgit.ignore>
|
||||
pom.xml
|
||||
</jgit.ignore>
|
||||
<sourceReferences>
|
||||
<generate>true</generate>
|
||||
- </sourceReferences>
|
||||
+ </sourceReferences -->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
|||
|
|
@ -431,24 +431,14 @@
|
|||
<activation>
|
||||
--- rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh.bak 2012-11-20 07:45:12.580081610 -0500
|
||||
+++ rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/build.sh 2012-11-20 07:49:33.792018170 -0500
|
||||
@@ -94,6 +94,21 @@
|
||||
@@ -94,6 +94,11 @@
|
||||
defaultJava=DEFAULT_JAVA_EXEC
|
||||
OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
;;
|
||||
+ "armv7l")
|
||||
+ "armv*")
|
||||
+ defaultOSArch="arm"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
+ "armv7hl")
|
||||
+ defaultOSArch="arm"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
+ "armv5tel")
|
||||
+ defaultOSArch="arm"
|
||||
+ defaultJava=DEFAULT_JAVA_EXEC
|
||||
+ OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
|
||||
+ ;;
|
||||
*)
|
||||
echo "*** Unknown MODEL <${MODEL}>"
|
||||
|
|
|
|||
|
|
@ -1,89 +1,170 @@
|
|||
--- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-07-25 17:15:52.000000000 +0200
|
||||
+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-04 10:01:23.562816367 +0200
|
||||
@@ -90,65 +90,20 @@
|
||||
<antcall target="installTestPlugins" />
|
||||
</target>
|
||||
|
||||
- <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
|
||||
- <target name="setupPlatform">
|
||||
- <echo message="os.arch ${os.arch}" />
|
||||
- <property file="equinoxp2tests.properties" />
|
||||
- <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
|
||||
- <and>
|
||||
- <os family="unix" />
|
||||
- <not>
|
||||
- <or>
|
||||
- <os family="mac" />
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </not>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
|
||||
- <and>
|
||||
- <os family="mac" />
|
||||
- <os family="unix" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
|
||||
- <and>
|
||||
- <os family="windows" />
|
||||
- <os arch="x86" />
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
|
||||
- <and>
|
||||
- <os family="windows" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition property="platformArchive" value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
|
||||
- <and>
|
||||
- <os family="unix" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition property="platformTarget" value="platform-zip">
|
||||
- <contains string="${platformArchive}" substring=".zip" />
|
||||
- </condition>
|
||||
- <condition property="platformTarget" value="platform-tar.gz">
|
||||
- <contains string="${platformArchive}" substring=".tar.gz" />
|
||||
- </condition>
|
||||
- <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
|
||||
- <antcall target="${platformTarget}" />
|
||||
- </target>
|
||||
+ <!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
|
||||
+ <target name="setupPlatform">
|
||||
+ <echo message="os.arch ${os.arch}" />
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig 2012-12-17 15:03:11.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml 2012-12-18 11:08:09.033309587 +0100
|
||||
@@ -164,98 +164,14 @@
|
||||
<!--use an stable version of the director so that instability in the current build doesn't cause all the tests to fail -->
|
||||
<target name="setupPlatform">
|
||||
<echo message="os.arch ${os.arch}" />
|
||||
- <property file="equinoxp2tests.properties" />
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux}">
|
||||
- <and>
|
||||
- <os family="unix" />
|
||||
- <not>
|
||||
- <or>
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- <os family="mac" />
|
||||
- </or>
|
||||
- </not>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64}">
|
||||
- <and>
|
||||
- <os family="mac" />
|
||||
- <os family="unix" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx}">
|
||||
- <and>
|
||||
- <os family="mac" />
|
||||
- <os family="unix" />
|
||||
- <!-- should not need, as long as x86_64 rules (above) comes first
|
||||
- <os arch="i386" />
|
||||
- -->
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32}">
|
||||
- <and>
|
||||
- <os family="windows" />
|
||||
- <os arch="x86" />
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64}">
|
||||
- <and>
|
||||
- <os family="windows" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
- <condition
|
||||
- property="platformArchive"
|
||||
- value="${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64}">
|
||||
- <and>
|
||||
- <os family="unix" />
|
||||
- <or>
|
||||
- <os arch="x86_64" />
|
||||
- <os arch="amd64" />
|
||||
- </or>
|
||||
- </and>
|
||||
- </condition>
|
||||
-
|
||||
- <fail
|
||||
- unless="platformArchive"
|
||||
- message="platformArchive is not defined. Check that condidtions cover os arch ${os.arch}. May be VM dependent.)" />
|
||||
-
|
||||
- <condition
|
||||
- property="platformTarget"
|
||||
- value="platform-zip">
|
||||
- <contains
|
||||
- string="${platformArchive}"
|
||||
- substring=".zip" />
|
||||
+ <property name="platformArchive" value="${runtimeArchive}" />
|
||||
+
|
||||
+ <condition property="platformTarget" value="platform-zip">
|
||||
+ <contains string="${platformArchive}" substring=".zip" />
|
||||
+ </condition>
|
||||
</condition>
|
||||
- <condition
|
||||
- property="platformTarget"
|
||||
- value="platform-tar.gz">
|
||||
- <contains
|
||||
- string="${platformArchive}"
|
||||
- substring=".tar.gz" />
|
||||
+ <condition property="platformTarget" value="platform-tar.gz">
|
||||
+ <contains string="${platformArchive}" substring=".tar.gz" />
|
||||
</condition>
|
||||
- <fail
|
||||
- unless="platformTarget"
|
||||
- message="platformTarget is not defined. Check that platformArchive variable and value is defined correctly, such as in equinoxp2tests.properties in the appropriate testConfig" />
|
||||
<echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
|
||||
<antcall target="${platformTarget}" />
|
||||
</target>
|
||||
@@ -283,7 +199,7 @@
|
||||
<exec
|
||||
dir="${platformLocation}"
|
||||
executable="tar">
|
||||
- <arg line="-xzf ${platformArchive}" />
|
||||
+ <arg line="-xzf ../${platformArchive}" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
@@ -815,6 +731,17 @@
|
||||
arg2="" />
|
||||
</not>
|
||||
</condition>
|
||||
+
|
||||
+ <!-- swt needs this property to run tests -->
|
||||
+ <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
|
||||
+ <include name="${testPlugin}_*" />
|
||||
+ </dirset>
|
||||
+ <property name="testPluginFolder" refid="test.plugin.folder" />
|
||||
+ <echo>trying to find ${testPluginFolder}</echo>
|
||||
+ <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
|
||||
+ <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
|
||||
+ </condition>
|
||||
+ <echo message="platformTarget ${platformTarget} platformArchive ${platformArchive}" />
|
||||
+ <antcall target="${platformTarget}" />
|
||||
+ </target>
|
||||
+
|
||||
<antcall target="runSuite" />
|
||||
<antcall target="genResults" />
|
||||
</target>
|
||||
@@ -1252,7 +1179,7 @@
|
||||
|
||||
<target name="all">
|
||||
|
||||
<!--setup for platform zip archives-->
|
||||
--- TMP/eclipse-junit-tests/src/main/scripts/runtests.sh.bak 2012-07-25 17:15:52.000000000 +0200
|
||||
+++ TMP/eclipse-junit-tests/src/main/scripts/runtests.sh 2012-09-04 10:02:38.616352712 +0200
|
||||
@@ -1,4 +1,70 @@
|
||||
#!/bin/sh
|
||||
- <antcall target="markCurrentTime">
|
||||
+ <!-- antcall target="markCurrentTime">
|
||||
<param
|
||||
name="message"
|
||||
value="start relEng" />
|
||||
@@ -1262,7 +1189,7 @@
|
||||
<param
|
||||
name="message"
|
||||
value="end relEng" />
|
||||
- </antcall>
|
||||
+ </antcall -->
|
||||
|
||||
<antcall target="markCurrentTime">
|
||||
<param
|
||||
@@ -1374,7 +1301,7 @@
|
||||
hang, during performance testss
|
||||
-->
|
||||
<target name="platformLR">
|
||||
- <antcall target="teamcvs" />
|
||||
+ <!-- antcall target="teamcvs" / -->
|
||||
<antcall target="jface" />
|
||||
<antcall target="swt" />
|
||||
<antcall target="uiperformance" />
|
||||
--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh.orig 2012-12-17 15:03:11.000000000 +0100
|
||||
+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/runtests.sh 2012-12-18 11:21:53.867638480 +0100
|
||||
@@ -1,5 +1,74 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
+
|
||||
+function findXvncAndSetDisplay() {
|
||||
+# if [ ${headless} == 1 ]; then
|
||||
+ # Try to find Xvnc
|
||||
|
|
@ -150,97 +231,48 @@
|
|||
+ rm Xvnc.cfg
|
||||
+ fi
|
||||
+}
|
||||
|
||||
#set the DISPLAY for running tests on Linux
|
||||
#DISPLAY=`$HOST`:0.0;export DISPLAY
|
||||
@@ -66,24 +132,38 @@
|
||||
|
||||
+
|
||||
+
|
||||
# This file should never exist or be needed for production machine,
|
||||
# but allows an easy way for a "local user" to provide this file
|
||||
# somewhere on the search path ($HOME/bin is common),
|
||||
@@ -92,11 +161,18 @@
|
||||
#necessary when invoking this script through rsh
|
||||
cd $dir
|
||||
-
|
||||
+mkdir -p /tmp/eclipse-tests-directory
|
||||
+pushd /tmp/eclipse-tests-directory
|
||||
+rm -rf *
|
||||
# verify os, ws and arch values passed in are valid before running tests
|
||||
if [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc" ] || [ "$os-$ws-$arch" = "aix-gtk-ppc64" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "linux-gtk-ia64" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "hpux-gtk-ia64_32"]
|
||||
then
|
||||
- if [ ! -r eclipse ]
|
||||
- then
|
||||
- tar -xzf eclipse-SDK-*.tar.gz
|
||||
- unzip -qq -o -C eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/
|
||||
+ if [ ! -r eclipse ]
|
||||
+ then
|
||||
|
||||
+
|
||||
+ mkdir -p /tmp/eclipse-tests-directory
|
||||
+ pushd /tmp/eclipse-tests-directory
|
||||
+ rm -rf *
|
||||
+
|
||||
if [ ! -r eclipse ]
|
||||
then
|
||||
- tar -xzf eclipse-SDK-*.tar.gz
|
||||
- # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos.
|
||||
- unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/
|
||||
+ pushd @libdir@
|
||||
+ tar czf /tmp/eclipse-tests-directory/eclipse-SDK-v20120903-1347-linux-gtk-x86_64.tar.gz eclipse
|
||||
+ tar czf /tmp/eclipse-tests-directory/eclipse-SDK-v20120903-1347-linux-gtk-x86_64.tar.gz eclipse
|
||||
+ popd
|
||||
+ cp -rf @libdir@/eclipse eclipse
|
||||
+ unzip -o -C /usr/share/java/eclipse-tests/eclipse-junit-tests-*.zip */plugins/org.eclipse.test* -d eclipse/dropins/
|
||||
fi
|
||||
fi
|
||||
|
||||
+findXvncAndSetDisplay
|
||||
+setArch
|
||||
# run tests
|
||||
@@ -139,9 +215,15 @@
|
||||
echo "extdirproperty in runtest: ${extdirproperty}"
|
||||
|
||||
# -Dtimeout=300000 "${ANT_OPTS}"
|
||||
+
|
||||
+ if [[ ! -z "${testslocation}" ]]
|
||||
+ then
|
||||
+ testslocation="/usr/share/java/eclipse-tests/"
|
||||
+fi
|
||||
+
|
||||
# run tests
|
||||
-launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar`
|
||||
-$vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file `pwd`/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
+eclipse -nosplash -data workspace -application org.eclipse.ant.core.antRunner \
|
||||
+-file "/usr/share/java/eclipse-tests/test.xml" $tests \
|
||||
+-Dws=$ws -Dos=$os -Darch=$arch -Dos.arch=$arch \
|
||||
+-DbuildId=v20120903-1347 -Dbasedir="/tmp/eclipse-tests-directory" \
|
||||
+-DruntimeArchive="eclipse-SDK-v20120903-1347-linux-gtk-x86_64.tar.gz" \
|
||||
+-DrepoLocation="/usr/share/java/eclipse-tests" \
|
||||
+-Dorg.eclipse.test="3.3.100" \
|
||||
+-D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
|
||||
+cleanupXvnc
|
||||
# display message to user if os, ws and arch are invalid
|
||||
else
|
||||
echo "The os, ws and arch values are either invalid or are an invalid combination"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
-
|
||||
--- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-04 11:06:32.018103811 +0200
|
||||
+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-04 10:13:07.000000000 +0200
|
||||
@@ -120,7 +120,7 @@
|
||||
<delete dir="${platformLocation}" />
|
||||
<mkdir dir="${platformLocation}" />
|
||||
<exec dir="${platformLocation}" executable="tar">
|
||||
- <arg line="-xzf ${platformArchive}" />
|
||||
+ <arg line="-xzf ../${platformArchive}" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
--- 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 @@
|
||||
<antcall target="uadoc" />
|
||||
<antcall target="debug" />
|
||||
<antcall target="ui" />
|
||||
- <antcall target="relEng" />
|
||||
+ <!--antcall target="relEng" /-->
|
||||
<antcall target="swt" />
|
||||
- <antcall target="teamcvs" />
|
||||
+ <!--antcall target="teamcvs" /-->
|
||||
<antcall target="equinoxds" />
|
||||
<antcall target="equinoxp2discovery" />
|
||||
<antcall target="bidi" />
|
||||
--- TMP/eclipse-junit-tests/src/main/scripts/test.xml.bak 2012-09-06 09:14:04.000000000 +0200
|
||||
+++ TMP/eclipse-junit-tests/src/main/scripts/test.xml 2012-09-06 10:42:12.066027428 +0200
|
||||
@@ -390,6 +390,16 @@
|
||||
<equals arg1="${testPluginX}" arg2="" />
|
||||
</not>
|
||||
</condition>
|
||||
+
|
||||
+ <!-- swt needs this property to run tests -->
|
||||
+ <dirset id="test.plugin.folder" dir="${eclipse-home}/plugins/">
|
||||
+ <include name="${testPlugin}_*" />
|
||||
+ </dirset>
|
||||
+ <property name="testPluginFolder" refid="test.plugin.folder" />
|
||||
+ <echo>trying to find ${testPluginFolder}</echo>
|
||||
+ <condition property="org.eclipse.swt.tests" value="${testPluginFolder}">
|
||||
+ <equals arg1="${testPlugin}" arg2="org.eclipse.swt.tests"/>
|
||||
+ </condition>
|
||||
<antcall target="runSuite" />
|
||||
<antcall target="genResults" />
|
||||
</target>
|
||||
if [[ ! -z "${extdirproperty}" ]]
|
||||
then
|
||||
- $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
+ $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${testslocation}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
else
|
||||
- $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
+ $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${testslocation}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger
|
||||
fi
|
||||
|
|
|
|||
27
eclipse.spec
27
eclipse.spec
|
|
@ -5,7 +5,7 @@ Epoch: 1
|
|||
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
|
||||
%global eclipse_micro 1
|
||||
%global initialize 1
|
||||
%global eb_commit 094a56b8b1222d3535f5dada20290dc91f14d102
|
||||
%global eb_commit 7a327b17de5f606f47cba6b74e64619520186b7a
|
||||
%global build_id I20120608-1400
|
||||
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
|
||||
%global installation_loc %{_libdir}/%{name}
|
||||
|
|
@ -179,8 +179,6 @@ Patch26: %{name}-build-network-native-libs.patch
|
|||
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
|
||||
Patch27: %{name}-build-filesystem-native-libs.patch
|
||||
|
||||
Patch28: %{name}-build-help-contents.patch
|
||||
|
||||
Patch29: %{name}-test-support.patch
|
||||
|
||||
Patch30: %{name}-remove-tomcat6.patch
|
||||
|
|
@ -413,7 +411,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%patch25
|
||||
%patch26
|
||||
%patch27
|
||||
%patch28
|
||||
%patch29
|
||||
%patch30
|
||||
%patch31
|
||||
|
|
@ -424,16 +421,14 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%patch36
|
||||
%patch37
|
||||
|
||||
#p2.inf should be qualified (asked in the newsgroup and waiting for an answer)
|
||||
#http://dev.eclipse.org/mhonarc/lists/cbi-dev/msg00777.html
|
||||
cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
|
||||
cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.releng.tychoeclipsebuilder/platform/org.fedoraproject.eclipse.platform.p2.inf
|
||||
|
||||
#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
|
||||
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module osgistarter.config.launcher eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module eclipse.platform.repository
|
||||
|
||||
#we do not have dependencies for those tests
|
||||
%pom_disable_module bundles/org.eclipse.equinox.region.tests rt.equinox.bundles
|
||||
|
|
@ -446,6 +441,7 @@ cp eclipse.platform.releng.tychoeclipsebuilder/platform/p2.inf eclipse.platform.
|
|||
%pom_disable_module bundles/org.eclipse.equinox.cm.test rt.equinox.bundles
|
||||
%pom_disable_module bundles/org.eclipse.equinox.console.ssh rt.equinox.bundles
|
||||
|
||||
|
||||
#no idea what's that. Maybe later - sources seem to be hidden inside this additonal jar.
|
||||
%pom_disable_module bundles/org.eclipse.equinox.weaving.caching.j9 rt.equinox.bundles/
|
||||
|
||||
|
|
@ -534,6 +530,9 @@ sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launch
|
|||
#hack - there should be a patch providing a profile for each arch
|
||||
mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
|
||||
|
||||
sed -i -e "s/org.apache.jasper.glassfish/org.glassfish.web.javax.servlet.jsp/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
sed -i -e "s/javax.annotation/org.apache.geronimo.specs.geronimo-annotation_1.1_spec/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
|
||||
%build
|
||||
#This is the lowest value where the build succeeds. 512m is not enough.
|
||||
export MAVEN_OPTS="-Xmx640m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
|
||||
|
|
@ -554,8 +553,6 @@ ln -s /usr/share/java/emf/eclipse/plugins/* -t .
|
|||
for f in %{_libdir}/eclipse/dropins/sdk/plugins/* ; do ln -s $f || echo "$f exists"; done
|
||||
%endif
|
||||
|
||||
#ln -s %{_javadir}/hamcrest/core.jar
|
||||
|
||||
#create fake junit3
|
||||
pushd org.junit_3.8.2.v3_8_2_v20100427-1100
|
||||
ln -s %{_javadir}/junit.jar
|
||||
|
|
@ -613,7 +610,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/library/gtk/
|
||||
export JAVA_HOME=%{java_home}
|
||||
ant build_eclipse_cbi
|
||||
ant
|
||||
popd
|
||||
|
||||
mvn-rpmbuild clean install \
|
||||
|
|
@ -734,7 +731,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`/../../../../../../../../../TMP/jdtpde/target/repository \
|
||||
-repository file:/`pwd`/../../../../../../../../../eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository \
|
||||
-installIU org.eclipse.jdt.feature.group
|
||||
#exit backup
|
||||
popd
|
||||
|
|
@ -759,7 +756,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`/../../../../../../../../../TMP/jdtpde/target/repository \
|
||||
-repository file:/`pwd`/../../../../../../../../../eclipse.platform.releng.tychoeclipsebuilder/jdtpde/target/repository \
|
||||
-installIU org.eclipse.sdk.feature.group
|
||||
popd
|
||||
|
||||
|
|
@ -1021,7 +1018,7 @@ install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
|
|||
# Tests
|
||||
##############
|
||||
|
||||
unzip TMP/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests
|
||||
unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests
|
||||
unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/
|
||||
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/eclipse-junit-tests-*.zip
|
||||
rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-tests/runtests.bat
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
rm -rf R4_platform-aggregator
|
||||
rm eclipse-source.tar.bz2
|
||||
|
||||
git clone -b JunoSR1_RC1_R4 --recurse-submodules git://git.eclipse.org/gitroot/cbi/platform-aggregator.git R4_platform-aggregator
|
||||
git clone -b R4_2_maintenance --recurse-submodules git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git R4_platform-aggregator
|
||||
|
||||
|
||||
pushd R4_platform-aggregator
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
30164141fa99313969cdd32a11d7cf6d eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz
|
||||
e0410f4224b0e4390b553e092e400439 eclipse-source.tar.bz2
|
||||
841919f98ced4d5c7df6496d09761c37 eclipse-source.tar.bz2
|
||||
102b0b7d9be171c8402dbf315b5e01b4 eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz
|
||||
|
|
|
|||
Loading…
Reference in New Issue