diff options
author | Krzysztof Daniel | 2013-04-30 13:52:14 +0000 |
---|---|---|
committer | John Arthorne | 2013-04-30 14:00:30 +0000 |
commit | 4145b85ef0caeb2c2e8887596bbf3a27ca7bbc04 (patch) | |
tree | e81b98cb59562ef25ffae00483272a852e3d6d83 | |
parent | edd0aae42c9b35faed444ad3034af9a7caee5c63 (diff) | |
download | eclipse.platform.team-4145b85ef0caeb2c2e8887596bbf3a27ca7bbc04.tar.gz eclipse.platform.team-4145b85ef0caeb2c2e8887596bbf3a27ca7bbc04.tar.xz eclipse.platform.team-4145b85ef0caeb2c2e8887596bbf3a27ca7bbc04.zip |
Bug 385030 - Build and consume the network native part
4 files changed, 127 insertions, 4 deletions
diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF index 8c64fb39e..9d9b86e53 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName Bundle-Localization: fragment Bundle-SymbolicName: org.eclipse.core.net.linux.x86;singleton:=true -Bundle-Version: 1.1.200.qualifier +Bundle-Version: 1.1.201.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86)) Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml index e56e7320e..36c38f468 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net.linux.x86</artifactId> - <version>1.1.200-SNAPSHOT</version> + <version>1.1.201-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> @@ -40,4 +40,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> diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF index b51cb676e..748b3acee 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %fragmentName Bundle-Vendor: %providerName Bundle-Localization: fragment Bundle-SymbolicName: org.eclipse.core.net.linux.x86_64;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.1.1.qualifier Fragment-Host: org.eclipse.core.net;bundle-version="1.1.0" Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64)) Bundle-RequiredExecutionEnvironment: J2SE-1.4 diff --git a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml index 9bcd101b4..9b3ed0e0b 100644 --- a/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml +++ b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.net.linux.x86_64</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> @@ -40,4 +40,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/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> |