You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/11/04 04:20:11 UTC

svn commit: r711164 - /geronimo/sandbox/dwoods/devstudio/build.xml

Author: dwoods
Date: Mon Nov  3 19:20:11 2008
New Revision: 711164

URL: http://svn.apache.org/viewvc?rev=711164&view=rev
Log:
now downloads Eclipse, Server and GEP and extracts to current dir

Modified:
    geronimo/sandbox/dwoods/devstudio/build.xml

Modified: geronimo/sandbox/dwoods/devstudio/build.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/dwoods/devstudio/build.xml?rev=711164&r1=711163&r2=711164&view=diff
==============================================================================
--- geronimo/sandbox/dwoods/devstudio/build.xml (original)
+++ geronimo/sandbox/dwoods/devstudio/build.xml Mon Nov  3 19:20:11 2008
@@ -41,9 +41,9 @@
     <record name="${basedir}/install.log"/>
 
 
-    <!-------------------------------->
+    <!--============================-->
     <!--  Initialization targets    -->
-    <!-------------------------------->
+    <!--============================-->
     <target name="init:platform"
             description="Discover what platform we are running on">
         <condition property="isWindows">
@@ -77,8 +77,9 @@
         <property name="geronimo_version"       value="2.1.3"/>
         <property name="geronimo_assembly"      value="tomcat6-javaee5"/>
         <property name="geronimo_url"           value="http://www.apache.org/dist/geronimo/${geronimo_version}/"/>
-        <property name="geronimo_server_tar"    value="geronimo-${geronimo_assembly}-${geronimo_version}-bin.tar"/>
-        <property name="geronimo_server_zip"    value="geronimo-${geronimo_assembly}-${geronimo_version}-bin.zip"/>
+        <property name="geronimo_server"        value="geronimo-${geronimo_assembly}-${geronimo_version}"/>
+        <property name="geronimo_server_tar"    value="${geronimo_server}-bin.tar"/>
+        <property name="geronimo_server_zip"    value="${geronimo_server}-bin.zip"/>
         <property name="geronimo_server_tar_gz" value="${geronimo_server_tar}.gz"/>
         <!-- Properties for the Apache Geronimo Server Eclipse Plugin (GEP) -->
         <property name="gep_version"            value="2.1.3"/>
@@ -95,9 +96,9 @@
     </target>
 
 
-    <!-------------------------------->
+    <!--============================-->
     <!--  Download artifact targets -->
-    <!-------------------------------->
+    <!--============================-->
     <target name="download:windows" depends="init" if="isWindows"
             description="Download Windows i386 specific artifact(s)">
         <echo>################################################################################</echo>
@@ -161,7 +162,7 @@
         <echo>################################################################################</echo>
     </target>
 
-    <target name="download" depends="init, download:linux, download:macosx, download:windows" description="Download artifact(s)">
+    <target name="download:common" depends="init" description="Download common artifact(s)">
         <echo>################################################################################</echo>
         <echo>## Downloading: ${gep_zip}                                                      </echo>
         <echo>## From: ${gep_url}                                                        </echo>
@@ -173,10 +174,13 @@
         <echo>################################################################################</echo>
     </target>
 
+    <target name="download" depends="init, download:linux, download:macosx, download:windows, download:common" description="Download artifact(s)">
+    </target>
+
 
-    <!-------------------------------->
+    <!--============================-->
     <!--  Extract artifact targets  -->
-    <!-------------------------------->
+    <!--============================-->
     <target name="extract:windows" depends="init" if="isWindows"
             description="Extract Windows i386 specific artifact(s)">
         <echo>################################################################################</echo>
@@ -186,6 +190,13 @@
                dest="${root_dir}"
                overwrite="true"/>
         <echo>################################################################################</echo>
+        <echo>## Extracting: ${geronimo_server_zip}                                           </echo>
+        <delete dir="${root_dir}/${geronimo_server}" quiet="true"/>
+        <delete dir="${root_dir}/server" quiet="true"/>
+        <unzip src="${image_dir}/${geronimo_server_zip}" 
+               dest="${root_dir}"
+               overwrite="true"/>
+        <echo>################################################################################</echo>
     </target>
 
     <target name="extract:linux" depends="init" if="isLinux"
@@ -198,6 +209,14 @@
                 dest="${root_dir}"
                 overwrite="true"/>
         <echo>################################################################################</echo>
+        <echo>## Extracting: ${geronimo_server_tar_gz}                                        </echo>
+        <delete dir="${root_dir}/${geronimo_server}" quiet="true"/>
+        <delete dir="${root_dir}/server" quiet="true"/>
+        <gunzip src="${image_dir}/${geronimo_server_tar_gz}"/>
+        <untar  src="${image_dir}/${geronimo_server_tar}" 
+                dest="${root_dir}"
+                overwrite="true"/>
+        <echo>################################################################################</echo>
     </target>
 
     <target name="extract:macosx" depends="init" if="isMacOSX"
@@ -210,17 +229,38 @@
                 dest="${root_dir}"
                 overwrite="true"/>
         <echo>################################################################################</echo>
+        <echo>## Extracting: ${geronimo_server_tar_gz}                                        </echo>
+        <delete dir="${root_dir}/${geronimo_server}" quiet="true"/>
+        <delete dir="${root_dir}/server" quiet="true"/>
+        <gunzip src="${image_dir}/${geronimo_server_tar_gz}"/>
+        <untar  src="${image_dir}/${geronimo_server_tar}" 
+                dest="${root_dir}"
+                overwrite="true"/>
+        <echo>################################################################################</echo>
     </target>
 
-    <target name="extract" depends="init, extract:linux, extract:macosx, extract:windows" description="Extract artifact(s)">
+    <target name="extract:common" depends="init" description="Extract common artifact(s)">
+        <echo>################################################################################</echo>
+        <echo>## Renaming: ${geronimo_server} to server                                       </echo>
+        <move todir="${root_dir}/server">
+            <fileset dir="${root_dir}/${geronimo_server}"/>
+        </move>
+        <echo>################################################################################</echo>
+        <echo>## Extracting: ${gep_zip}                                                       </echo>
+        <unzip src="${image_dir}/${gep_zip}" 
+               dest="${root_dir}"
+               overwrite="true"/>
+        <echo>################################################################################</echo>
+    </target>
+
+    <target name="extract" depends="init, extract:linux, extract:macosx, extract:windows, extract:common" description="Extract artifact(s)">
     </target>
 
 
-    <!-------------------------------->
+    <!--============================-->
     <!--  Top-level user targets    -->
-    <!-------------------------------->
-    <target name="default" depends="init">
-        <echo>################################################################################</echo>
+    <!--============================-->
+    <target name="default" depends="init, download, extract">
     </target>