Attachment 218700 Details for Bug 385030 – Patch proposition

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch proposition

0001-Build-linux-part-of-the-network-natives.patch (text/plain), 6.11 KB, created by Krzysztof Daniel

on 2012-07-13 09:23:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2012-07-13 09:23:30 EDT

Size: 6.11 KB

patch

obsolete

>From ca034c27c3432257c1066fed92fcbfdf9fdf41e9 Mon Sep 17 00:00:00 2001
>From: Krzysztof Daniel <kdaniel@redhat.com>
>Date: Fri, 13 Jul 2012 15:22:22 +0200
>Subject: [PATCH] Build linux part of the network natives.
>
>---
> .../org.eclipse.core.net.linux.x86/pom.xml         |   61 +++++++++++++++++++
> .../org.eclipse.core.net.linux.x86_64/pom.xml      |   62 ++++++++++++++++++++
> .../natives/unix/linux/x86_64/makefile             |    4 +-
> 3 files changed, 125 insertions(+), 2 deletions(-)
>
>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 ffae0c1..6dc3bfa 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
>@@ -42,4 +42,65 @@
>     </plugins>
>   </build>
> 
>+  <profiles>
>+    <profile>
>+      <id>build-natives</id>
>+      <activation>
>+        <property>
>+          
>+          <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>
>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 0e5ea1d..40e5ca2 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
>@@ -43,4 +43,66 @@
>       </plugin>
>     </plugins>
>   </build>
>+
>+  <profiles>
>+    <profile>
>+      <id>build-natives</id>
>+      <activation>
>+        <property>
>+          
>+          <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>
>diff --git a/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile b/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
>index 407f9c5..163773b 100644
>--- a/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile
>+++ b/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
>@@ -45,4 +45,4 @@ link: compile
> 
> clean:
> 	-$(RM) $(GNOMEPROXY.O) $(LIB_NAME_FULL)
>-	-@echo " "
>\ No newline at end of file
>+	-@echo " "
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 385030: 218700 | 218702 | 221228 | 228261