2cf254c253
Move sytem.bundle to equinox package. Fix building of core.net on secondary arches. Removed recursive dependency to eclipse-rcp.
147 lines
5.0 KiB
Diff
147 lines
5.0 KiB
Diff
--- 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>
|
|
--- eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c 2012-04-06 05:37:03.000000000 -0400
|
|
+++ eclipse.platform.team/bundles/org.eclipse.core.net/natives/unix/gnomeproxy.c 2012-04-17 16:12:33.000000000 -0400
|
|
@@ -13,7 +13,6 @@
|
|
#include <jni.h>
|
|
|
|
#include <glib.h>
|
|
-#include <glib/gslist.h>
|
|
#include <gconf/gconf-value.h>
|
|
#include <gconf/gconf-client.h>
|