Changeset 28043 for main/trunk/greenstone3

Timestamp:

2013-08-14T18:40:33+12:00 (11 years ago)

Author:

ak19

Message:

Shaoqun has confirmed with the Windows Server 2008 RT user that using the osfamily = windows test works for them when starting and stopping tomcat, so we can now avoid having to use the os = os.windows test, which required the list of OS names in os.windows to be updated whenever a new Windows version appeared. Will commit this fix separately for stopping and starting tomcat and in the next commit replace all exec tasks using an os=os.windows check to test using osfamily=windows instead.

File:

• main/trunk/greenstone3/build.xml (modified) (3 diffs)

main/trunk/greenstone3/build.xml

@@ -1390 +1390 @@
     <echo file="${catalina.home}/bin/setenv.bat">set CLASSPATH=${tomcat.classpath}</echo>
     <echo file="${catalina.home}/bin/setenv.sh">export CLASSPATH=${tomcat.classpath}</echo>
-    
+
+    <!-- using osfamily instead of testing os against os.windows list of recognised windows versions
+     so that future windows versions are included. See http://simonharrer.wordpress.com/tag/osfamily/ -->
+
     <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
       <!--<env key="GSDLOS" value="linux"/> do we need this?? -->
@@ -1403 +1406 @@
       <env key="FEDORA_HOME" path="${fedora.home}"/>
     </exec>
-    <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
+    <exec executable="${catalina.home}/bin/startup.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="true">
       <env key="GSDLOS" value="windows"/>
       <env key="GSDL3HOME" value="${basedir}"/>
@@ -1449 +1452 @@
       <arg line=">/dev/null 2>&amp;1"/>
     </exec>
-    <exec executable="${catalina.home}/bin/shutdown.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="false">
+    <exec executable="${catalina.home}/bin/shutdown.bat" osfamily="windows" dir="${catalina.home}/bin" spawn="false">
       <env key="FEDORA_HOME" path="${fedora.home}"/>
       <env key="CATALINA_HOME" value="${catalina.home}"/>