Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 218685 Details for
Bug 385010
CBI should build and consume native filesystem libraries.
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Patch v2
0001-385010-CBI-should-build-and-consume-native-filesyste.patch (text/plain), 13.45 KB, created by
Krzysztof Daniel
on 2012-07-13 04:25:16 EDT
(
hide
)
Description:
Patch v2
Filename:
MIME Type:
Creator:
Krzysztof Daniel
Created:
2012-07-13 04:25:16 EDT
Size:
13.45 KB
patch
obsolete
>From 38e055a7e7625669a71f31c2ceaf0c041b8391b5 Mon Sep 17 00:00:00 2001 >From: Krzysztof Daniel <kdaniel@redhat.com> >Date: Fri, 13 Jul 2012 10:16:30 +0200 >Subject: [PATCH] 385010: CBI should build and consume native filesystem > libraries. > >The patch is supposed to: >* invoke make in an appropriate folder and copy results to an appropriate folder > in the fragment bundle using maven-antrun-plugin and exec tasks for all unix-like > systems. >* invoke bat scripts in appropriate folders and copy restuls to another appropriate > folders in fragment bundles using maven-antrun-plugin and exec tasks for windows > system. > >https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010 >--- > .../org.eclipse.core.filesystem.linux.x86/pom.xml | 62 +++++++++++++++++++ > .../pom.xml | 62 +++++++++++++++++++ > bundles/org.eclipse.core.filesystem.macosx/pom.xml | 64 +++++++++++++++++++- > .../org.eclipse.core.filesystem.win32.x86/pom.xml | 63 +++++++++++++++++++ > .../pom.xml | 62 +++++++++++++++++++ > 5 files changed, 312 insertions(+), 1 deletion(-) > >diff --git a/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml b/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml >index 9f23477..62e28a2 100644 >--- a/bundles/org.eclipse.core.filesystem.linux.x86/pom.xml >+++ b/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> >diff --git a/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml b/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml >index adbd83d..5fd65c2 100644 >--- a/bundles/org.eclipse.core.filesystem.linux.x86_64/pom.xml >+++ b/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="linunixfile_*.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.filesystem.macosx/pom.xml b/bundles/org.eclipse.core.filesystem.macosx/pom.xml >index 5a512a5..4fc2b4f 100644 >--- a/bundles/org.eclipse.core.filesystem.macosx/pom.xml >+++ b/bundles/org.eclipse.core.filesystem.macosx/pom.xml >@@ -38,11 +38,73 @@ > <environment> > <os>macosx</os> > <ws>cocoa</ws> >- <arch>x86</arch> >+ <arch>x86_64</arch> > </environment> > </environments> > </configuration> > </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>cocoa.macosx.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/macosx/"/> >+ <copy todir="os/macosx" > >+ <fileset dir="../org.eclipse.core.filesystem/natives/unix/macosx/"> >+ <include name="libunixfile_*.jnilib"/> >+ </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.filesystem.win32.x86/pom.xml b/bundles/org.eclipse.core.filesystem.win32.x86/pom.xml >index 18ff6aa..827e950 100644 >--- a/bundles/org.eclipse.core.filesystem.win32.x86/pom.xml >+++ b/bundles/org.eclipse.core.filesystem.win32.x86/pom.xml >@@ -45,4 +45,67 @@ > </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>win32.win32.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="setup.bat" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/win32/"/> >+ <exec executable="make.bat" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/win32/"/> >+ <copy todir="os/win32/x86/" > >+ <fileset dir="../org.eclipse.core.filesystem/natives/win32/"> >+ <include name="localfile_*.dll"/> >+ </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.filesystem.win32.x86_64/pom.xml b/bundles/org.eclipse.core.filesystem.win32.x86_64/pom.xml >index 537ad38..16bc8fa 100644 >--- a/bundles/org.eclipse.core.filesystem.win32.x86_64/pom.xml >+++ b/bundles/org.eclipse.core.filesystem.win32.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>win32.win32.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_x64.bat" newenvironment="false" dir="../org.eclipse.core.filesystem/natives/win32/x64/"/> >+ <copy todir="os/win32/x86_64/" > >+ <fileset dir="../org.eclipse.core.filesystem/natives/win32/x64/"> >+ <include name="localfile_*.dll"/> >+ </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 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=218685">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 385010
:
218684
|
218685
|
218831
|
221226
|
226316
|
228258
