[eclipse] - Native network support added. - Native filesystem support added.
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu Sep 6 15:03:30 UTC 2012
commit 2d2e1c3aa670b36e948e2a119362656808a21aff
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Aug 31 11:59:11 2012 +0200
- Native network support added.
- Native filesystem support added.
.gitignore | 1 -
eclipse-build-filesystem-native-libs.patch | 141 ++++++++++++++++++++++++++
eclipse-build-network-native-libs.patch | 151 ++++++++++++++++++++++++++++
eclipse.spec | 13 ++-
4 files changed, 304 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 95a8d76..6e11fad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
eclipse-*-src.tar.bz2
-eclipse-build-*
*.rpm
eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz
eclipse-build-eb76edf3fb5bbeb115c59d1b076f4821a6d47d74.tar.xz
diff --git a/eclipse-build-filesystem-native-libs.patch b/eclipse-build-filesystem-native-libs.patch
new file mode 100644
index 0000000..f3fb963
--- /dev/null
+++ b/eclipse-build-filesystem-native-libs.patch
@@ -0,0 +1,141 @@
+--- 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>linux.gtk.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,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>linux.gtk.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/"/>
++ <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
+
diff --git a/eclipse-build-network-native-libs.patch b/eclipse-build-network-native-libs.patch
new file mode 100644
index 0000000..1ac2024
--- /dev/null
+++ b/eclipse-build-network-native-libs.patch
@@ -0,0 +1,151 @@
+--- 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>linux.gtk.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>linux.gtk.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/x86_64/"/>
++ <copy todir="." >
++ <fileset dir="../../natives/unix/linux/x86_64/">
++ <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/natives/unix/linux/x86_64/makefile
++++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
+@@ -19,7 +19,7 @@ GNOMEPROXY.O = gnomeproxy.o
+ LIB_NAME = gnomeproxy.so
+ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
+
+-OS_TYPE =
++OS_TYPE = linux
+ JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
+ INCLUDE = `pkg-config --cflags gconf-2.0`
+ COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64
+--
+1.7.10.4
+
diff --git a/eclipse.spec b/eclipse.spec
index 647a32f..5a5b686 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -33,7 +33,7 @@ ln -s %{_javadir}/%{2} ${_f}
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 13%{?dist}
+Release: 14%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -167,6 +167,11 @@ Patch24: %{name}-pdebuild-add-target.patch
# additional poms are a part of e-b
Patch25: %{name}-change-build-packagings.patch
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385410
+Patch26: %{name}-build-network-native-libs.patch
+
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
+Patch27: %{name}-build-filesystem-native-libs.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -365,6 +370,8 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch23
%patch24
%patch25
+%patch26
+%patch27
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
%pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
@@ -1141,6 +1148,10 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Fri Aug 31 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-14
+- Native network support added.
+- Native filesystem support added.
+
* Fri Aug 24 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-12
- Fix eclipse-pdebuild script to have proper path to pde bundle.
- Ensure there are right R dependencies between subpackages.
More information about the scm-commits
mailing list