geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r826576 - in /geronimo/devtools/eclipse-plugin/trunk: eclipse/build.xml eclipse/pom.xml plugins/org.apache.geronimo.runtime.v11/.classpath testsuite/eclipse/build.xml testsuite/eclipse/pom.xml
Date Mon, 19 Oct 2009 01:47:03 GMT
Author: delos
Date: Mon Oct 19 01:47:03 2009
New Revision: 826576

URL: http://svn.apache.org/viewvc?rev=826576&view=rev
Log:
GERONIMODEVTOOLS-598 add support for Linux x86_64 based systems with 64-bit jdk. Thanks Johannes
for the patch!

Modified:
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=826576&r1=826575&r2=826576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Mon Oct 19 01:47:03 2009
@@ -29,8 +29,10 @@
         <property name="galileo_url"            value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/galileo/R/"/>
         <property name="galileo_jee_win32"      value="eclipse-jee-galileo-win32.zip"/>
         <property name="galileo_jee_linux"      value="eclipse-jee-galileo-linux-gtk.tar"/>
+        <property name="galileo_jee_linux-x86_64" value="eclipse-jee-galileo-linux-gtk-x86_64.tar"/>
         <property name="galileo_jee_macos"      value="eclipse-jee-galileo-macosx-carbon.tar"/>
         <property name="galileo_jee_linux_gz"   value="${galileo_jee_linux}.gz"/>
+        <property name="galileo_jee_linux-x86_64_gz" value="${galileo_jee_linux-x86_64}.gz"/>
         <property name="galileo_jee_macos_gz"   value="${galileo_jee_macos}.gz"/>
         <property name="protocol"               value="&amp;r=1&amp;protocol=http"/>
         
@@ -116,6 +118,34 @@
                 overwrite="true"/>
     </target>
 
+    <target name="linux-x86_64" depends="init" description="Download Linux-specific artifact(s)">
+        <echo>#################################################################################</echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## Downloading: ${galileo_jee_linux-x86_64_gz}                      
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## From: ${galileo_url}                                             
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>#################################################################################</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
+        <get src="${galileo_url}${galileo_jee_linux-x86_64_gz}${protocol}"
+             dest="${LOCAL_M2_REPO}/eclipse-downloads/${galileo_jee_linux-x86_64_gz}"
+             verbose="true"
+             ignoreerrors="true"
+             usetimestamp="true"/>
+        <echo>#################################################################################</echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## Unzipping: ${galileo_jee_linux-x86_64_gz}                        
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+        <mkdir  dir="${LOCAL_M2_REPO}/eclipse"/>
+        <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${galileo_jee_linux-x86_64_gz}"/>
+        <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${galileo_jee_linux-x86_64}"
+                dest="${LOCAL_M2_REPO}/eclipse"
+                overwrite="true"/>
+    </target>
+
+
     <target name="macos" depends="init" description="Download Mac-specific artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=826576&r1=826575&r2=826576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Mon Oct 19 01:47:03 2009
@@ -70,10 +70,11 @@
             </properties>
         </profile>
         <profile>
-            <id>unix</id>
+            <id>unix-x86</id>
             <activation>
                 <os>
                     <family>unix</family>
+                    <arch>i386</arch>
                 </os>
             </activation>
             <properties>
@@ -81,6 +82,18 @@
             </properties>
         </profile>
         <profile>
+            <id>unix-x86_64</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                    <arch>amd64</arch>
+                </os>
+            </activation>
+            <properties>
+                <eclipsePlatformFamily>linux-x86_64</eclipsePlatformFamily>
+            </properties>
+        </profile>
+        <profile>
             <id>mac</id>
             <activation>
                 <os>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath?rev=826576&r1=826575&r2=826576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/.classpath
Mon Oct 19 01:47:03 2009
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 
-<!-- $Rev: 471551 $ $Date: 2006-11-06 06:47:11 +0800 (Mon, 06 Nov 2006) $ -->
+<!-- $Rev: 471551 $ $Date: 2006-11-05 23:47:11 +0100 (Sun, 05 Nov 2006) $ -->
 
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-1.1.1.jar"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml?rev=826576&r1=826575&r2=826576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Mon Oct 19 01:47:03
2009
@@ -32,13 +32,15 @@
         <property name="galileo_url"            value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/galileo/R/"/>
         <property name="galileo_jee_win32"      value="eclipse-jee-galileo-win32.zip"/>
         <property name="galileo_jee_linux"      value="eclipse-jee-galileo-linux-gtk.tar"/>
+        <property name="galileo_jee_linux-x86_64" value="eclipse-jee-galileo-linux-gtk-x86_64.tar"/>
         <property name="galileo_jee_macos"      value="eclipse-jee-galileo-macosx-carbon.tar"/>
         <property name="galileo_jee_linux_gz"   value="${galileo_jee_linux}.gz"/>
+        <property name="galileo_jee_linux-x86_64_gz" value="${galileo_jee_linux-x86_64}.gz"/>
         <property name="galileo_jee_macos_gz"   value="${galileo_jee_macos}.gz"/>
         <property name="protocol"               value="&amp;r=1&amp;protocol=http"/>
         <property name="test_eclipse"           value="${basedir}/../launcher/eclipse/"/>
-        <property name="test_framework_url"     value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.4-200806172000/"/>
-        <property name="test_framework"         value="eclipse-test-framework-3.4.zip"/>
+        <property name="test_framework_url"     value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.5-200906111540/"/>
+        <property name="test_framework"         value="eclipse-test-framework-3.5.zip"/>
         <property name="abbot_swt_url"          value="http://downloads.sourceforge.net/abbot/"/>
         <property name="abbot_swt_version"      value="0.1.0.20080305_1254"/>
         <property name="abbot_swt"              value="abbot.swt-${abbot_swt_version}.zip"/>
@@ -101,6 +103,34 @@
                 overwrite="true"/>
     </target>
 
+    <target name="linux-x86_64" depends="init" description="Download Linux-specific artifact(s)">
+        <echo>#################################################################################</echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## Downloading: ${galileo_jee_linux-x86_64_gz}                      
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## From: ${galileo_url}                                             
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>#################################################################################</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
+        <get src="${galileo_url}${galileo_jee_linux-x86_64_gz}${protocol}"
+             dest="${LOCAL_M2_REPO}/eclipse-downloads/${galileo_jee_linux-x86_64_gz}"
+             verbose="true"
+             ignoreerrors="true"
+             usetimestamp="true"/>
+        <echo>#################################################################################</echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## Unzipping: ${galileo_jee_linux-x86_64_gz}                        
            </echo>
+	<echo>##                                                                         
     </echo>
+        <echo>## To: ${test_eclipse}                                              
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>#################################################################################</echo>
+	<mkdir  dir="${test_eclipse}"/>
+        <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${galileo_jee_linux-x86_64_gz}"/>
+        <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${galileo_jee_linux-x86_64}"
+		dest="${test_eclipse}"
+                overwrite="true"/>
+    </target>
+
     <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml?rev=826576&r1=826575&r2=826576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml Mon Oct 19 01:47:03 2009
@@ -73,10 +73,11 @@
             </properties>
         </profile>
         <profile>
-            <id>unix</id>
+            <id>unix-x86</id>
             <activation>
                 <os>
                     <family>unix</family>
+                    <arch>i386</arch>
                 </os>
             </activation>
             <properties>
@@ -84,6 +85,18 @@
             </properties>
         </profile>
         <profile>
+            <id>unix-x86_64</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                    <arch>amd64</arch>
+                </os>
+            </activation>
+            <properties>
+                <eclipsePlatformFamily>linux-x86_64</eclipsePlatformFamily>
+            </properties>
+        </profile>
+        <profile>
             <id>mac</id>
             <activation>
                 <os>



Mime
View raw message