Changeset 9736 for branches/ant-install-branch

Timestamp:

2005-04-22T15:33:28+12:00 (19 years ago)

Author:

kjdon

Message:

some changes for windows and axis

File:

• branches/ant-install-branch/gsdl3/build.xml (modified) (4 diffs)

branches/ant-install-branch/gsdl3/build.xml

@@ -453 +453 @@
     </waitfor>
   </target>
-  <!-- windows:
-  set CATALINA_HOME=%GSDL3HOME%\comms\jakarta\tomcat
-set CATALINA_OPTS="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=%GSDL3HOME% -DGSDLOS=%GSDLOS% -DPATH=%PATH%"
-    call "%GSDL3HOME%\comms\jakarta\tomcat\bin\startup.bat"
-  # launch a web browser
-    start http://localhost:8080/gsdl3
-
--->
+  <!-- windows: do we want to launch a webrowser?? -->
   <target name="shutdown-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false"/>
-    <!-- windows:
-
-    call "%GSDL3HOME%\comms\jakarta\tomcat\bin\shutdown.bat"
--->
+    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false"/>
   </target>
 
@@ -552 +542 @@
       dest="${packages.home}"/>
     <move todir="${packages.home}/mysql">
-      <fileset dir="${packages.home}/mysql-noinstall-4.1.11-win32"/>
+      <fileset dir="${packages.home}/mysql-4.1.11-win32"/>
     </move>
   </target>
@@ -666 +656 @@
   </target>
 
-  <target name="get-sitename">
+  <target name="get-sitename" unless="axis.sitename">
     <input addproperty="axis.sitename" message="What site? (press enter for default:localsite)" defaultvalue="localsite"/>
+  </target>
+
+  <target name="get-siteuri" depends="get-sitename" unless="axis.siteuri">
+    <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.sitename})" defaultvalue="${axis.sitename}"/>
+    <echo>${axis.sitename}, ${axis.siteuri}</echo>
+  </target>
+  <target name="check-deployment-files" depends="get-sitename">
     <condition property="deploy.exists">
       <available file="${basedir}/resources/soap/${axis.sitename}.wsdd"/>
@@ -675 +672 @@
     </condition>
     <echo>${axis.sitename}, ${deploy.exists}, ${undeploy.exists}</echo>
-  </target>
-
-  <target name="get-siteuri" depends="get-sitename">
-    <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.sitename})" defaultvalue="${axis.sitename}"/>
-    <echo>${axis.sitename}, ${axis.siteuri}</echo>
-  </target>
-  <target name="create-deployment-files" depends="get-sitename" 
+  </target> 
+  <target name="create-deployment-files" depends="get-sitename,check-deployment-files" 
     if="axis.sitename" unless="deploy.exists">
     <filter token="sitename" value="${axis.sitename}"/>