| [Arakhnę-Dev] [310] * Use the new cross-compilers from Ubuntu 11.10. |
[ Thread Index |
Date Index
| More arakhne.org/dev Archives
]
Revision: 310
Author: galland
Date: 2011-11-05 12:42:14 +0100 (Sat, 05 Nov 2011)
Log Message:
-----------
* Use the new cross-compilers from Ubuntu 11.10.
* Make arakhneVmutils a runnable jar
* Deploy the sources of arakhneVmutils
Modified Paths:
--------------
trunk/arakhneVmutils/java/pom.xml
trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml
trunk/arakhneVmutils/native/josuuid/mingw64/pom.xml
trunk/arakhneVmutils/pom.xml
Added Paths:
-----------
trunk/arakhneVmutils/sources.xml
Modified: trunk/arakhneVmutils/java/pom.xml
===================================================================
--- trunk/arakhneVmutils/java/pom.xml 2011-11-05 10:33:38 UTC (rev 309)
+++ trunk/arakhneVmutils/java/pom.xml 2011-11-05 11:42:14 UTC (rev 310)
@@ -31,17 +31,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${manifest.file}</manifestFile>
- <manifest>
- <mainClass>org.arakhne.vmutil.OperatingSystemInfo</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -64,6 +53,9 @@
<archive>
<manifestFile>${manifest.file}</manifestFile>
+ <manifest>
+ <mainClass>org.arakhne.vmutil.OperatingSystemInfo</mainClass>
+ </manifest>
</archive>
<instructions>
@@ -79,6 +71,17 @@
</configuration>
</plugin>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${manifest.file}</manifestFile>
+ <manifest>
+ <mainClass>org.arakhne.vmutil.OperatingSystemInfo</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Modified: trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml
===================================================================
--- trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml 2011-11-05 10:33:38 UTC (rev 309)
+++ trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml 2011-11-05 11:42:14 UTC (rev 310)
@@ -42,7 +42,7 @@
String[] parts = path.split(File.pathSeparator);
boolean ok = false;
for(int i=0; !ok && i<parts.length; i++) {
- ok = new File(parts[i],"i586-mingw32msvc-gcc").canExecute();
+ ok = new File(parts[i],"i686-w64-mingw32-gcc").canExecute();
}
ok
</condition>
@@ -64,9 +64,9 @@
<extensions>true</extensions>
<configuration>
<compilerProvider>generic</compilerProvider>
- <compilerExecutable>i586-mingw32msvc-gcc</compilerExecutable>
+ <compilerExecutable>i686-w64-mingw32-gcc</compilerExecutable>
<compilerStartOptions>
- <compilerStartOption>-O0 -Wall -Werror -fmessage-length=0</compilerStartOption>
+ <compilerStartOption>-m32 -O0 -Wall -Werror -fmessage-length=0</compilerStartOption>
</compilerStartOptions>
<javahOS>linux</javahOS> <!-- not 'windows' to retreive the jni_md.h file -->
@@ -82,7 +82,7 @@
</source>
</sources>
- <linkerExecutable>i586-mingw32msvc-gcc</linkerExecutable>
+ <linkerExecutable>i686-w64-mingw32-gcc</linkerExecutable>
<linkerStartOptions>
<linkerStartOption>-shared</linkerStartOption>
</linkerStartOptions>
Modified: trunk/arakhneVmutils/native/josuuid/mingw64/pom.xml
===================================================================
--- trunk/arakhneVmutils/native/josuuid/mingw64/pom.xml 2011-11-05 10:33:38 UTC (rev 309)
+++ trunk/arakhneVmutils/native/josuuid/mingw64/pom.xml 2011-11-05 11:42:14 UTC (rev 310)
@@ -42,7 +42,7 @@
String[] parts = path.split(File.pathSeparator);
boolean ok = false;
for(int i=0; !ok && i<parts.length; i++) {
- ok = new File(parts[i],"amd64-mingw32msvc-gcc").canExecute();
+ ok = new File(parts[i],"x86_64-w64-mingw32-gcc").canExecute();
}
ok
</condition>
@@ -64,9 +64,9 @@
<extensions>true</extensions>
<configuration>
<compilerProvider>generic</compilerProvider>
- <compilerExecutable>amd64-mingw32msvc-gcc</compilerExecutable>
+ <compilerExecutable>x86_64-w64-mingw32-gcc</compilerExecutable>
<compilerStartOptions>
- <compilerStartOption>-O0 -Wall -Werror -fmessage-length=0</compilerStartOption>
+ <compilerStartOption>-m64 -O0 -Wall -Werror -fmessage-length=0</compilerStartOption>
</compilerStartOptions>
<javahOS>linux</javahOS> <!-- not 'windows' to retreive the jni_md.h file -->
@@ -82,9 +82,9 @@
</source>
</sources>
- <linkerExecutable>amd64-mingw32msvc-gcc</linkerExecutable>
+ <linkerExecutable>x86_64-w64-mingw32-gcc</linkerExecutable>
<linkerStartOptions>
- <linkerStartOption>-L/usr/lib/gcc/i586-mingw32msvc/4.4.2/ -shared</linkerStartOption>
+ <linkerStartOption>-shared</linkerStartOption>
</linkerStartOptions>
</configuration>
Modified: trunk/arakhneVmutils/pom.xml
===================================================================
--- trunk/arakhneVmutils/pom.xml 2011-11-05 10:33:38 UTC (rev 309)
+++ trunk/arakhneVmutils/pom.xml 2011-11-05 11:42:14 UTC (rev 310)
@@ -27,7 +27,7 @@
</modules>
<!-- ======================================= -->
- <!-- ==== Project Information === -->
+ <!-- ==== Project Information === -->
<!-- ======================================= -->
<build>
@@ -35,23 +35,39 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>bin.xml</descriptor>
- </descriptors>
- <archive>
- <manifestFile>${manifest.file}</manifestFile>
- </archive>
- </configuration>
<executions>
<execution>
- <id>make-assembly</id>
+ <id>make-bin-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestFile>${manifest.file}</manifestFile>
+ </archive>
+ </configuration>
</execution>
+ <execution>
+ <id>make-source-assembly</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>sources.xml</descriptor>
+ </descriptors>
+ <archive>
+ <manifestFile>${manifest.file}</manifestFile>
+ </archive>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
Added: trunk/arakhneVmutils/sources.xml
===================================================================
--- trunk/arakhneVmutils/sources.xml (rev 0)
+++ trunk/arakhneVmutils/sources.xml 2011-11-05 11:42:14 UTC (rev 310)
@@ -0,0 +1,22 @@
+<assembly>
+ <id>sources</id>
+ <formats>
+ <format>dir</format>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <includeSubModules>false</includeSubModules>
+ <includes>
+ <include>org.arakhne.afc:arakhneVmutils-java</include>
+ </includes>
+ <binaries>
+ <outputDirectory></outputDirectory>
+ <attachmentClassifier>sources</attachmentClassifier>
+ <includeDependencies>false</includeDependencies>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
Property changes on: trunk/arakhneVmutils/sources.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain