geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r964727 - in /geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse: build.xml pom.xml
Date Fri, 16 Jul 2010 09:29:33 GMT
Author: delos
Date: Fri Jul 16 09:29:32 2010
New Revision: 964727

URL: http://svn.apache.org/viewvc?rev=964727&view=rev
Log:
GERONIMODEVTOOLS-600 2.1 branch can build with 64-bit JDK now

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/build.xml?rev=964727&r1=964726&r2=964727&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/build.xml Fri Jul 16 09:29:32
2010
@@ -18,15 +18,20 @@
 
 <!--
  |  
- | Download helios artifacts and unzip them into the user's local maven repo     
+ | Download Helios artifacts and unzip them into the user's local maven repo     
  |                                                                                      
      
  |                                                                                      
      
  | @version $Rev$ $Date$
  -->
-<project name="heliosArtifacts">
+<project name="HeliosArtifacts">   
 
-   <target name="init">
-        <property name="helios_url"                     value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/R/"/>
+    <condition property="is64bitJDK">
+        <!--We only check JVM bit model here.It works fine even 32-bit JVM is used on
64-bit OS -->
+        <equals arg1="${sun.arch.data.model}" arg2="64" />
+    </condition>
+
+    <target name="init">
+        <property name="helios_url"                     value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/R"/>
         <property name="helios_jee_win32"               value="eclipse-jee-helios-win32.zip"/>
         <property name="helios_jee_win64"               value="eclipse-jee-helios-win32_64.zip"/>
         <property name="helios_jee_linux"               value="eclipse-jee-helios-linux-gtk.tar"/>
@@ -35,84 +40,121 @@
         <property name="helios_jee_linux_gz"            value="${helios_jee_linux}.gz"/>
         <property name="helios_jee_linux-x86_64_gz"     value="${helios_jee_linux-x86_64}.gz"/>
         <property name="helios_jee_macos_gz"            value="${helios_jee_macos}.gz"/>
-        <property name="protocol"               value="&amp;r=1&amp;protocol=http"/>
-        
-        <property name="tptp-version"	 value="4.7.0"/>
-        <property name="tptp"		value="tptp.runtime-TPTP-${tptp-version}.zip"/>
-        <property name="tptp-runtime-url"		value="http://archive.eclipse.org/tptp/${tptp-version}/TPTP-${tptp-version}/${tptp}"/>
      
-      
-    </target>
-
-	<target name="tptp" description="Download and extract TPTP runtime package">
-		 	<echo>#################################################################################</echo>
-	        <echo>##                                                                 
             </echo>
-	        <echo>## Downloading: ${tptp}                                            
</echo>
-	        <echo>##                                                                 
             </echo>
-	        <echo>## From: ${tptp-runtime-url}                                       
                  </echo>
-	        <echo>##                                                                 
             </echo>
-	        <echo>#################################################################################</echo>
-	        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-	        <get src="${tptp-runtime-url}"
-	             dest="${LOCAL_M2_REPO}/eclipse-downloads/${tptp}" 
-	             verbose="true"
-	             ignoreerrors="true"
-	             usetimestamp="true"/>
-	        <echo>#################################################################################</echo>
-	        <echo>##                                                                 
             </echo>
-	        <echo>## Unzipping: ${tptp}                                              
</echo>
-	        <echo>##                                                                 
             </echo>
-	        <echo>#################################################################################</echo>
-	        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${tptp}" 
-	               dest="${LOCAL_M2_REPO}/eclipse"
-	               overwrite="true"/>
-	</target>
 
-    <target name="win32" depends="init" description="Download Windows-specific artifact(s)">
+        <property name="tptp-version"                   value="4.7.0"/>
+        <property name="tptp"                           value="tptp.runtime-TPTP-${tptp-version}.zip"/>
+        <property name="tptp-runtime-url"               value="http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0"/>
+
+        <property name="protocol"                       value="&amp;r=1&amp;protocol=http"/>
+    </target>
+
+    <target name="tptp" depends="init" description="Download and extract TPTP runtime
package">
+            <echo>#################################################################################</echo>
+            <echo>##                                                              
                </echo>
+            <echo>## Downloading: ${tptp}                                         
                </echo>
+            <echo>##                                                              
                </echo>
+            <echo>## From: ${tptp-runtime-url}                                    
                </echo>
+            <echo>##                                                              
                </echo>
+            <echo>#################################################################################</echo>
+            <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
+            <get src="${tptp-runtime-url}/${tptp}${protocol}"
+                 dest="${LOCAL_M2_REPO}/eclipse-downloads/${tptp}" 
+                 verbose="true"
+                 ignoreerrors="true"
+                 usetimestamp="true"/>
+            <echo>#################################################################################</echo>
+            <echo>##                                                              
                </echo>
+            <echo>## Unzipping: ${tptp}                                           
                </echo>
+            <echo>##                                                              
                </echo>
+            <echo>#################################################################################</echo>
+            <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${tptp}" 
+                   dest="${LOCAL_M2_REPO}/eclipse"
+                   overwrite="true"/>
+    </target>
+
+    <target name="win" depends="init" description="Download Windows-specific artifact(s)">
+           <antcall target="win64"></antcall>
+           <antcall target="win32"></antcall>
+    </target>
+
+    <target name="win32" unless="is64bitJDK" description="Download Windows 32-bit-specific
artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_win32}                                 
           </echo>
+        <echo>## Downloading: ${helios_jee_win32}                                 
            </echo>
         <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
           </echo>
+        <echo>## From: ${helios_url}                                              
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}${helios_jee_win32}${protocol}"
+        <get src="${helios_url}/${helios_jee_win32}${protocol}"
              dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win32}" 
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_win32}                                   
           </echo>
+        <echo>## Unzipping: ${helios_jee_win32}                                   
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
-        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> 
         <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win32}" 
                dest="${LOCAL_M2_REPO}/eclipse"
                overwrite="true"/>
     </target>
 
+    <target name="win64" if="is64bitJDK" description="Download Windows 64-bit-specific
artifact(s)">
+        <echo>#################################################################################</echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## Downloading: ${helios_jee_win64}                                 
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## From: ${helios_url}                                              
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>#################################################################################</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
+        <get src="${helios_url}/${helios_jee_win64}${protocol}"
+             dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win64}" 
+             verbose="true"
+             ignoreerrors="true"
+             usetimestamp="true"/>
+        <echo>#################################################################################</echo>
+        <echo>##                                                                  
            </echo>
+        <echo>## Unzipping: ${helios_jee_win64}                                   
            </echo>
+        <echo>##                                                                  
            </echo>
+        <echo>#################################################################################</echo>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> 
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win64}" 
+               dest="${LOCAL_M2_REPO}/eclipse"
+               overwrite="true"/>
+    </target>
+
     <target name="linux" depends="init" description="Download Linux-specific artifact(s)">
+        <antcall target="linux_x86"></antcall>
+        <antcall target="linux-x86_64"></antcall>
+    </target>
+
+    <target name="linux_x86" unless="is64bitJDK" description="Download Linux 32-bit-specific
artifact(s)">
+	
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_linux_gz}                              
           </echo>
+        <echo>## Downloading: ${helios_jee_linux_gz}                              
            </echo>
         <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
           </echo>
+        <echo>## From: ${helios_url}                                              
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}${helios_jee_linux_gz}${protocol}"
+        <get src="${helios_url}/${helios_jee_linux_gz}${protocol}"
              dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux_gz}" 
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_linux_gz}                                
           </echo>
+        <echo>## Unzipping: ${helios_jee_linux_gz}                                
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
-        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> 
         <mkdir  dir="${LOCAL_M2_REPO}/eclipse"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux}" 
@@ -120,26 +162,26 @@
                 overwrite="true"/>
     </target>
 
-    <target name="linux-x86_64" depends="init" description="Download Linux-specific artifact(s)">
+    <target name="linux-x86_64" if="is64bitJDK" description="Download Linux 64-bit-specific
artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_linux-x86_64_gz}                       
           </echo>
+        <echo>## Downloading: ${helios_jee_linux-x86_64_gz}                       
            </echo>
         <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
           </echo>
+        <echo>## From: ${helios_url}                                              
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}${helios_jee_linux-x86_64_gz}${protocol}"
+        <get src="${helios_url}/${helios_jee_linux-x86_64_gz}${protocol}"
              dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64_gz}"
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_linux-x86_64_gz}                         
           </echo>
+        <echo>## Unzipping: ${helios_jee_linux-x86_64_gz}                         
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
-        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> 
         <mkdir  dir="${LOCAL_M2_REPO}/eclipse"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64}"
@@ -147,27 +189,26 @@
                 overwrite="true"/>
     </target>
 
-
     <target name="macos" depends="init" description="Download Mac-specific artifact(s)">
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Downloading: ${helios_jee_macos_gz}                              
           </echo>
+        <echo>## Downloading: ${helios_jee_macos_gz}                              
            </echo>
         <echo>##                                                                  
            </echo>
-        <echo>## From: ${helios_url}                                              
           </echo>
+        <echo>## From: ${helios_url}                                              
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${helios_url}${helios_jee_macos_gz}${protocol}"
+        <get src="${helios_url}/${helios_jee_macos_gz}${protocol}"
              dest="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos_gz}" 
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                  
            </echo>
-        <echo>## Unzipping: ${helios_jee_macos_gz}                                
           </echo>
+        <echo>## Unzipping: ${helios_jee_macos_gz}                                
            </echo>
         <echo>##                                                                  
            </echo>
         <echo>#################################################################################</echo>
-        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+        <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> 
         <mkdir  dir="${LOCAL_M2_REPO}/eclipse"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos}" 

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml?rev=964727&r1=964726&r2=964727&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.6/eclipse/pom.xml Fri Jul 16 09:29:32 2010
@@ -18,16 +18,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
                                                 
     <modelVersion>4.0.0</modelVersion>
+                                                
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>eclipse</artifactId>
-    <version>2.1.7</version>
+    <version>3.0.0</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Eclipse</name>
                                                 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
-        <version>2.1.7-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
                                                 
@@ -57,7 +58,6 @@
             </plugin>
         </plugins>
 
-
         <pluginManagement>
             <plugins>
                <!-- skip deploy child artifacts in release process-->
@@ -68,7 +68,7 @@
                   </configuration>
                </plugin>
             </plugins>
-        </pluginManagement> 
+        </pluginManagement>
     </build>
                                                 
     <profiles>
@@ -80,7 +80,7 @@
                 </os>
             </activation>
             <properties>
-                <eclipsePlatformFamily>win32</eclipsePlatformFamily>
+                <eclipsePlatformFamily>win</eclipsePlatformFamily>
             </properties>
         </profile>
         <profile>
@@ -88,7 +88,6 @@
             <activation>
                 <os>
                     <family>unix</family>
-                    <arch>i386</arch>
                 </os>
             </activation>
             <properties>
@@ -96,18 +95,6 @@
             </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