You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2011/01/11 23:23:59 UTC
svn commit: r1057894 - /directory/studio/trunk/application/pom.xml
Author: seelmann
Date: Tue Jan 11 22:23:59 2011
New Revision: 1057894
URL: http://svn.apache.org/viewvc?rev=1057894&view=rev
Log:
os.arch depends on JVM vendor
Modified:
directory/studio/trunk/application/pom.xml
Modified: directory/studio/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/pom.xml?rev=1057894&r1=1057893&r2=1057894&view=diff
==============================================================================
--- directory/studio/trunk/application/pom.xml (original)
+++ directory/studio/trunk/application/pom.xml Tue Jan 11 22:23:59 2011
@@ -55,9 +55,9 @@
<module>application-linux-x86</module>
</modules>
</profile>
- <!-- Linux 64 Bit -->
+ <!-- Linux 64 Bit, in Sun JDK/Oracle/OpenJDK os.arch is 'amd64' -->
<profile>
- <id>linux-x86_64</id>
+ <id>linux-amd64</id>
<activation>
<os>
<arch>amd64</arch>
@@ -69,6 +69,20 @@
<module>application-linux-x86_64</module>
</modules>
</profile>
+ <!-- Linux 64 Bit, in Harmony os.arch is 'x86_64' -->
+ <profile>
+ <id>linux-x86_64</id>
+ <activation>
+ <os>
+ <arch>x86_64</arch>
+ <family>unix</family>
+ <name>linux</name>
+ </os>
+ </activation>
+ <modules>
+ <module>application-linux-x86_64</module>
+ </modules>
+ </profile>
<!-- Mac OS X 32 Bit -->
<profile>
<id>macosx-x86</id>
@@ -110,7 +124,20 @@
<module>application-win32-x86</module>
</modules>
</profile>
- <!-- Windows 64 Bit -->
+ <!-- Windows 64 Bit, in Sun JDK/Oracle/OpenJDK os.arch is 'amd64' -->
+ <profile>
+ <id>win32-amd64</id>
+ <activation>
+ <os>
+ <arch>amd64</arch>
+ <family>windows</family>
+ </os>
+ </activation>
+ <modules>
+ <module>application-win32-x86_64</module>
+ </modules>
+ </profile>
+ <!-- Windows 64 Bit, in Harmony os.arch is 'x86_64' -->
<profile>
<id>win32-x86_64</id>
<activation>
Re: svn commit: r1057894 - /directory/studio/trunk/application/pom.xml
Posted by Pierre-Arnaud Marcelot <pa...@marcelot.net>.
Thanks Stefan for updating this to work with all JVMs.
I've just updated the "Developer Guide > Building" page [1] on the website accordingly.
Regards,
Pierre-Arnaud
[1] - http://directory.apache.org/studio/building.html
On 11 janv. 2011, at 23:23, seelmann@apache.org wrote:
> Author: seelmann
> Date: Tue Jan 11 22:23:59 2011
> New Revision: 1057894
>
> URL: http://svn.apache.org/viewvc?rev=1057894&view=rev
> Log:
> os.arch depends on JVM vendor
>
> Modified:
> directory/studio/trunk/application/pom.xml
>
> Modified: directory/studio/trunk/application/pom.xml
> URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/pom.xml?rev=1057894&r1=1057893&r2=1057894&view=diff
> ==============================================================================
> --- directory/studio/trunk/application/pom.xml (original)
> +++ directory/studio/trunk/application/pom.xml Tue Jan 11 22:23:59 2011
> @@ -55,9 +55,9 @@
> <module>application-linux-x86</module>
> </modules>
> </profile>
> - <!-- Linux 64 Bit -->
> + <!-- Linux 64 Bit, in Sun JDK/Oracle/OpenJDK os.arch is 'amd64' -->
> <profile>
> - <id>linux-x86_64</id>
> + <id>linux-amd64</id>
> <activation>
> <os>
> <arch>amd64</arch>
> @@ -69,6 +69,20 @@
> <module>application-linux-x86_64</module>
> </modules>
> </profile>
> + <!-- Linux 64 Bit, in Harmony os.arch is 'x86_64' -->
> + <profile>
> + <id>linux-x86_64</id>
> + <activation>
> + <os>
> + <arch>x86_64</arch>
> + <family>unix</family>
> + <name>linux</name>
> + </os>
> + </activation>
> + <modules>
> + <module>application-linux-x86_64</module>
> + </modules>
> + </profile>
> <!-- Mac OS X 32 Bit -->
> <profile>
> <id>macosx-x86</id>
> @@ -110,7 +124,20 @@
> <module>application-win32-x86</module>
> </modules>
> </profile>
> - <!-- Windows 64 Bit -->
> + <!-- Windows 64 Bit, in Sun JDK/Oracle/OpenJDK os.arch is 'amd64' -->
> + <profile>
> + <id>win32-amd64</id>
> + <activation>
> + <os>
> + <arch>amd64</arch>
> + <family>windows</family>
> + </os>
> + </activation>
> + <modules>
> + <module>application-win32-x86_64</module>
> + </modules>
> + </profile>
> + <!-- Windows 64 Bit, in Harmony os.arch is 'x86_64' -->
> <profile>
> <id>win32-x86_64</id>
> <activation>
>
>