Changeset 10189 for trunk/gsdl3

Timestamp:

2005-06-28T13:39:40+12:00 (19 years ago)

Author:

kjdon

Message:

some more stuff for the mac

File:

• trunk/gsdl3/build.xml (modified) (4 diffs)

trunk/gsdl3/build.xml

@@ -488 +488 @@
     <property name="tomcat.path" refid="local.tomcat.path"/>
     <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
-    <exec executable="${catalina.home}/bin/startup.sh" os="${os.linux}" dir="${catalina.home}/bin" spawn="false">
-      <env key="GSDLOS" value="linux"/>
+    <exec executable="${catalina.home}/bin/startup.sh" os="${os.linux},${os.mac}" dir="${catalina.home}/bin" spawn="false">
+      <!--<env key="GSDLOS" value="linux"/>-->
       <env key="GSDL3HOME" value="${basedir}"/>
       <env key="PATH" path="${tomcat.path}"/>
@@ -496 +496 @@
       <env key="CLASSPATH" path="${tomcat.classpath}"/>
       <env key="LD_LIBRARY_PATH" path="${env.LD_LIBRARY_PATH}:${lib.jni}:${mysql.home}/lib/mysql"/>
+      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${lib.jni}:${mysql.home}/lib/mysql"/>
     </exec>
     <exec executable="${catalina.home}/bin/startup.bat" os="${os.windows}" dir="${catalina.home}/bin" spawn="true">
@@ -515 +516 @@
   <!-- windows: do we want to launch a webrowser?? -->
   <target name="stop-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">
+    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux},${os.mac}" dir="${catalina.home}/bin" spawn="false">
       <env key="CATALINA_HOME" value="${catalina.home}"/>
     </exec>
@@ -903 +904 @@
     description="Clean only the packages">
     <!-- mg : just call the make target -->
-    <exec executable="make" os="${os.linux}"
+    <exec executable="make" os="${os.linux},${os.mac}"
       dir="${mg.home}">
       <arg value="clean"/>
     </exec>
     <!-- mgpp -->
-    <exec executable="make" os="${os.linux}"
+    <exec executable="make" os="${os.linux},${os.mac}"
       dir="${mg.home}">
       <arg value="clean"/>