Attachment 228261 Details for Bug 385030 – git formatted patch

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

[patch] git formatted patch

clipboard.txt (text/plain), 5.21 KB, created by Krzysztof Daniel

on 2013-03-12 10:13:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2013-03-12 10:13:27 EDT

Size: 5.21 KB

patch

obsolete

>From fbc9662220d9c53757b3db78ddf9b4299e936ed9 Tue, 12 Mar 2013 15:13:06 +0100
>From: Krzysztof Daniel <kdaniel@redhat.com>
>Date: Tue, 12 Mar 2013 15:12:53 +0100
>Subject: [PATCH] 385030: Build and consume the network native part https://bugs.eclipse.org/bugs/show_bug.cgi?id=385030
>
>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 ae1e299..41f1fd8 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>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/pom.xml b/bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64/pom.xml
>index 371cf4e..fc5e722 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>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>

Actions: View | Diff

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