You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/05/10 09:03:43 UTC
svn commit: r942675 - in /geronimo/devtools/eclipse-plugin/trunk/eclipse:
build.xml pom.xml
Author: delos
Date: Mon May 10 07:03:42 2010
New Revision: 942675
URL: http://svn.apache.org/viewvc?rev=942675&view=rev
Log:
GERONIMODEVTOOLS-600 Check JDK data model in build.xml
Modified:
geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/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=942675&r1=942674&r2=942675&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Mon May 10 07:03:42 2010
@@ -23,11 +23,17 @@
|
| @version $Rev$ $Date$
-->
-<project name="HeliosArtifacts">
+<project name="HeliosArtifacts">
+ <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/M6"/>
<property name="helios_jee_win32" value="eclipse-jee-helios-M6-win32.zip"/>
+ <property name="helios_jee_win64" value="eclipse-jee-helios-M6-win32_64.zip"/>
<property name="helios_jee_linux" value="eclipse-jee-helios-M6-linux-gtk.tar"/>
<property name="helios_jee_linux-x86_64" value="eclipse-jee-helios-M6-linux-gtk-x86_64.tar"/>
<property name="helios_jee_macos" value="eclipse-jee-helios-M6-macosx-carbon.tar"/>
@@ -40,6 +46,9 @@
<property name="tptp-runtime-url" value="http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0M6-201003152345"/>
<property name="protocol" value="&r=1&protocol=http"/>
+
+
+
</target>
<target name="tptp" depends="init" description="Download and extract TPTP runtime package">
@@ -66,7 +75,12 @@
overwrite="true"/>
</target>
- <target name="win32" depends="init" description="Download Windows-specific artifact(s)">
+ <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>
@@ -92,7 +106,40 @@
overwrite="true"/>
</target>
- <target name="linux" depends="init" description="Download Linux-specific artifact(s)">
+ <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>
@@ -119,7 +166,7 @@
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>
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=942675&r1=942674&r2=942675&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Mon May 10 07:03:42 2010
@@ -1,110 +1,98 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<!-- $Rev: 529767 $ $Date: 2007-04-17 17:21:24 -0400 (Tue, 17 Apr 2007) $ -->
-<project>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>eclipse</artifactId>
- <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>3.0.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>create-eclipse-target</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <property name="LOCAL_M2_REPO" value="${settings.localRepository}"/>
- <ant antfile="${basedir}/build.xml">
- <target name="${eclipsePlatformFamily}"></target>
- <target name="tptp"></target>
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>windows</id>
- <activation>
- <os>
- <family>windows</family>
- </os>
- </activation>
- <properties>
- <eclipsePlatformFamily>win32</eclipsePlatformFamily>
- </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>unix-x86</id>
- <activation>
- <os>
- <family>unix</family>
- </os>
- </activation>
- <properties>
- <eclipsePlatformFamily>linux</eclipsePlatformFamily>
- </properties>
- </profile>
- <profile>
- <id>mac</id>
- <activation>
- <os>
- <family>mac</family>
- </os>
- </activation>
- <properties>
- <eclipsePlatformFamily>macos</eclipsePlatformFamily>
- </properties>
- </profile>
- </profiles>
-
-</project>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<!-- $Rev: 529767 $ $Date: 2007-04-17 17:21:24 -0400 (Tue, 17 Apr 2007) $ -->
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>eclipse</artifactId>
+ <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>3.0.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-eclipse-target</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <property name="LOCAL_M2_REPO" value="${settings.localRepository}"/>
+ <ant antfile="${basedir}/build.xml">
+ <target name="${eclipsePlatformFamily}"></target>
+ <target name="tptp"></target>
+ </ant>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>windows</id>
+ <activation>
+ <os>
+ <family>windows</family>
+ </os>
+ </activation>
+ <properties>
+ <eclipsePlatformFamily>win</eclipsePlatformFamily>
+ </properties>
+ </profile>
+ <profile>
+ <id>unix-x86</id>
+ <activation>
+ <os>
+ <family>unix</family>
+ </os>
+ </activation>
+ <properties>
+ <eclipsePlatformFamily>linux</eclipsePlatformFamily>
+ </properties>
+ </profile>
+ <profile>
+ <id>mac</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <eclipsePlatformFamily>macos</eclipsePlatformFamily>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>