Author: jgallimore
Date: Mon May 25 15:57:17 2009
New Revision: 778444
URL: http://svn.apache.org/viewvc?rev=778444&view=rev
Log:
OEP-31 setting up Maven profile so build works on both 32 and 64 bit Linux
Modified:
openejb/trunk/sandbox/openejb-eclipse-plugin/eclipse/build.xml
openejb/trunk/sandbox/openejb-eclipse-plugin/pde-test/test.xml
openejb/trunk/sandbox/openejb-eclipse-plugin/pom.xml
Modified: openejb/trunk/sandbox/openejb-eclipse-plugin/eclipse/build.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/eclipse/build.xml?rev=778444&r1=778443&r2=778444&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-eclipse-plugin/eclipse/build.xml (original)
+++ openejb/trunk/sandbox/openejb-eclipse-plugin/eclipse/build.xml Mon May 25
15:57:17 2009
@@ -40,9 +40,11 @@
<property name="wtp_download_url"
value="${base_url}/webtools/downloads/drops/R3.0/${wtp_drop}/"/>
<property name="europa_jee_win32"
value="eclipse-SDK-3.4.1-win32.zip"/>
- <property name="europa_jee_linux"
value="eclipse-SDK-3.4.1-linux-gtk-x86_64.tar"/>
+ <property name="europa_jee_linux"
value="eclipse-SDK-3.4.1-linux-gtk.tar"/>
+ <property name="europa_jee_linux_x86_64"
value="eclipse-SDK-3.4.1-linux-gtk-x86_64.tar"/>
<property name="europa_jee_macos"
value="eclipse-SDK-3.4.1-macosx-carbon.tar"/>
<property name="europa_jee_linux_gz"
value="${europa_jee_linux}.gz"/>
+ <property name="europa_jee_linux_x86_64_gz"
value="${europa_jee_linux}.gz"/>
<property name="europa_jee_macos_gz"
value="${europa_jee_macos}.gz"/>
<property name="dtp_sdk" value="dtp-sdk_1.6.1.zip"/>
@@ -84,6 +86,22 @@
<untar
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.4/${europa_jee_linux}"
dest="${LOCAL_M2_REPO}/eclipse"/>
</target>
+
+ <target name="linux_x86_64" depends="init,common" description="Download
x86_64 Linux-specific artifact(s)">
+ <echo>-----------------------------------------------------</echo>
+ <echo>Downloading
${europa_linux_url}${europa_jee_linux_x86_64_gz}</echo>
+ <echo>-----------------------------------------------------</echo>
+ <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.4"/>
+ <get src="${europa_linux_url}${europa_jee_linux_x86_64_gz}${protocol}"
+
dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.4/${europa_jee_linux_x86_64_gz}"
+ verbose="true"
+ usetimestamp="true"/>
+ <echo>Unzipping ${europa_jee_linux_x86_64_gz} to the expected location
in ${LOCAL_M2_REPO}</echo>
+ <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+ <gunzip
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.4/${europa_jee_linux_x86_64_gz}"/>
+ <untar
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.4/${europa_jee_linux_x86_64}"
+ dest="${LOCAL_M2_REPO}/eclipse"/>
+ </target>
<target name="macos" depends="init,common" description="Download
Mac-specific artifact(s)">
<echo>-----------------------------------------------------</echo>
Modified: openejb/trunk/sandbox/openejb-eclipse-plugin/pde-test/test.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/pde-test/test.xml?rev=778444&r1=778443&r2=778444&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-eclipse-plugin/pde-test/test.xml (original)
+++ openejb/trunk/sandbox/openejb-eclipse-plugin/pde-test/test.xml Mon May 25
15:57:17 2009
@@ -35,7 +35,7 @@
<ant target="run" antfile="test.xml"/>
</target>
- <target name="linux">
+ <target name="linux_x86_64">
<property name="os" value="linux"/>
<property name="ws" value="gtk"/>
<property name="arch" value="x86_64"/>
@@ -43,6 +43,14 @@
<ant target="run" antfile="test.xml"/>
</target>
+ <target name="linux">
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
+ <property name="arch" value="x86"/>
+
+ <ant target="run" antfile="test.xml"/>
+ </target>
+
<target name="macos">
<property name="os" value="macosx"/>
<property name="ws" value="carbon"/>
Modified: openejb/trunk/sandbox/openejb-eclipse-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/sandbox/openejb-eclipse-plugin/pom.xml?rev=778444&r1=778443&r2=778444&view=diff
==============================================================================
--- openejb/trunk/sandbox/openejb-eclipse-plugin/pom.xml (original)
+++ openejb/trunk/sandbox/openejb-eclipse-plugin/pom.xml Mon May 25 15:57:17
2009
@@ -188,10 +188,11 @@
</properties>
</profile>
<profile>
- <id>unix</id>
+ <id>linux-x86</id>
<activation>
<os>
- <family>unix</family>
+ <name>Linux</name>
+ <arch>i386</arch>
</os>
</activation>
<properties>
@@ -199,6 +200,18 @@
</properties>
</profile>
<profile>
+ <id>linux-x86_64</id>
+ <activation>
+ <os>
+ <name>Linux</name>
+ <arch>amd64</arch>
+ </os>
+ </activation>
+ <properties>
+ <eclipsePlatformFamily>linux_x86_64</eclipsePlatformFamily>
+ </properties>
+ </profile>
+ <profile>
<id>mac</id>
<activation>
<os>
