rpms
/
eclipse
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to I20130605-2000.

This commit is contained in:
Krzysztof Daniel 2013-06-10 14:56:59 +02:00
parent ec3bf12c33
commit e3ff775455
5 changed files with 14 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
eclipse-build-filesystem-native-libs.patch
View File

@ -1,142 +0,0 @@
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml
@@ -45,4 +45,66 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>build-natives</id>
+ <activation>
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
+ <copy todir="os/linux/x86" >
+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
+ <include name="libunixfile_*.so"/>
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
--- eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml
+++ eclipse.platform.resources/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml
@@ -45,4 +45,67 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>build-natives</id>
+ <activation>
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+ <value>gtk.linux.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <exec executable="make" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/unix/linux/"/>
+ <mkdir dir="os/linux/x86_64/"/>
+ <copy todir="os/linux/x86_64/" >
+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/linux/">
+ <include name="libunixfile_*.so"/>
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
--
1.7.10.4

137
eclipse-build-network-native-libs.patch
View File

@ -1,137 +0,0 @@
--- eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml
+++ eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml
@@ -42,4 +42,65 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>build-natives</id>
+ <activation>
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+ <value>gtk.linux.x86</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+ <copy todir="." >
+ <fileset dir="../../natives/unix/linux/">
+ <include name="libgnomeproxy-*.so"/>
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
--- eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
+++ eclipse.platform.team/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
@@ -43,4 +43,66 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>build-natives</id>
+ <activation>
+ <property>
+ <!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
+ <name>native</name>
+ <value>gtk.linux.x86_64</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>natives</id>
+ <phase>process-resources</phase>
+ <configuration>
+ <target>
+ <exec executable="make" newenvironment="false" dir="../../natives/unix/linux/"/>
+ <copy todir="." >
+ <fileset dir="../../natives/unix/linux/">
+ <include name="libgnomeproxy-*.so"/>
+ </fileset>
+ </copy>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.7R2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-apache-bsf</artifactId>
+ <version>1.8.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>

30
eclipse.spec
View File

@ -10,8 +10,7 @@ Epoch: 1
%global eclipse_micro 0
%global initialize 1
%global eb_commit b963e34cbd5ead603a051b7d4b79fc91114ccd87
%global eclipse_tag 7bf3972a75228b74b91e1a9c4274d81bd43eab50
%global build_id I20130527-0800
%global eclipse_tag 84cba7bf43da88dc3f33bc113104eb680f12aa2d
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
%global installation_loc %{_libdir}/%{pkg_name}
@ -52,7 +51,7 @@ fi;
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.61.git7bf397%{?dist}
Release: 0.62.git84cba7%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -465,27 +464,19 @@ cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_* .m2/p2/rep
cp -rf %{_libdir}/eclipse/dropins/sdk/plugins/org.eclipse.pde.core_* .m2/p2/repo-sdk/plugins/
%pom_remove_plugin org.mortbay.jetty:jetty-jspc-maven-plugin eclipse.platform.ua/org.eclipse.help.webapp
%pom_remove_plugin org.eclipse.tycho:tycho-compiler-plugin rt.equinox.p2/org.eclipse.equinox.p2.releng/org.eclipse.equinox.p2-parent
find eclipse.platform.ua -name pom.xml -exec sed -i -e 's@org.apache.lucene<@org.apache.lucene.core<@g' {} \;
LOCALREPO="file://`pwd`/.m2/p2/repo"
find eclipse.platform.common/bundles -name pom.xml -exec sed -i -e "s@http://download.eclipse.org/eclipse/updates/4.2@${LOCALREPO}@g" {} \;
find eclipse.platform.swt/bundles -name pom.xml -exec sed -i -e "s@http://download.eclipse.org/eclipse/updates/4.2@${LOCALREPO}@g" {} \;
sed -i -e "s@http://download.eclipse.org/releases/juno@${LOCALREPO}@g" eclipse-platform-parent/pom.xml
%{_javadir}/tycho/copy-platform-all $(pwd)/.m2/p2/repo
%build
%{?scl:%scl_maven_opts}
#This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx900m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
#keep it here for secondary platforms.
mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \
-DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130501-2249 -Dpackaging=jar -DskipTychoVersionCheck \
-Dtycho.local.keepTarget
#mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \
# -DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130501-2249 -Dpackaging=jar -DskipTychoVersionCheck \
# -Dtycho.local.keepTarget
# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
@ -495,9 +486,9 @@ popd
pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}
#keep it here for secondary platforms.
mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \
-DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130501-2249 -Dpackaging=jar -DskipTychoVersionCheck \
-Dtycho.local.keepTarget
# mvn-rpmbuild install:install-file -Dfile=/usr/share/java/eclipse/jdt.core.jar -DgroupId=org.eclipse.jdt \
# -DartifactId=org.eclipse.jdt.core -Dversion=3.9.0.v20130501-2249 -Dpackaging=jar -DskipTychoVersionCheck \
# -Dtycho.local.keepTarget
mvn-rpmbuild clean verify \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
@ -1010,6 +1001,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
* Mon Jun 10 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.62.git84cba7
- Update to I20130605-2000.
* Thu Jun 6 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.61.git7bf397
- Fix the dropins reconciliation.

2
get-eclipse.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
TAG=7bf3972a75228b74b91e1a9c4274d81bd43eab50
TAG=84cba7bf43da88dc3f33bc113104eb680f12aa2d
#source http://www.linuxjournal.com/content/normalizing-path-names-bash
function normalize()

2
sources
View File

@ -1,2 +1,2 @@
4ebc240e0477b38b04f33ceb01fb71fc R4_platform-aggregator-7bf3972a75228b74b91e1a9c4274d81bd43eab50.tar.bz2
0aff7988c384ece2ac27e6abfe517e77 eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
3c59e76d97e8efbbcd650e83780e16e0 R4_platform-aggregator-84cba7bf43da88dc3f33bc113104eb680f12aa2d.tar.bz2