[Yanel-commits] rev 21454 - public/yanel/trunk/src/build

[michi at wyona.com]

Author: michi
Date: 2007-01-05 10:23:44 +0100 (Fri, 05 Jan 2007)
New Revision: 21454

Modified:
   public/yanel/trunk/src/build/build.xml
Log:
slashes fixed such that it also works on Windows

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2007-01-04 22:37:51 UTC (rev 21453)
+++ public/yanel/trunk/src/build/build.xml	2007-01-05 09:23:44 UTC (rev 21454)
@@ -167,7 +167,7 @@
   <target name="create-local-build-properties" if="local.build.properties.does.not.exist.yet" depends="init">
     <echo>Build configuration ${yanel.home.dir}/local.build.properties does not exist yet!</echo>
 
-    <input message="Do you have an existing Tomcat instance which you want to use as servlet engine for Yanel? If so, please enter the path of your Tomcat instance (e.g. /home/yanel/jakarta-tomcat-5.0.30), or otherwise just hit return (recommended to first time users :-) and Tomcat 5.5.20 will be installed at ${default.tomcat.home.dir} (You will always be able to change this setting at some later time within src/build/local.build.properties): " defaultvalue="${default.tomcat.home.dir}" addproperty="pathOfUserSpecificTomcat"/>
+    <input message="Do you have an existing Tomcat instance which you want to use as servlet engine for Yanel? If so, please enter the path of your Tomcat instance (e.g. /home/yanel/jakarta-tomcat-5.0.30), or otherwise just hit return (recommended to first time users :-) and Tomcat 5.5.20 will be installed at ${default.tomcat.home.dir} (You will always be able to change this setting at some later time within src/build/local.build.properties): " defaultvalue="${default.tomcat.home.dir.forward.slashes}" addproperty="pathOfUserSpecificTomcat"/>
 
     <echo>User specific Tomcat: ${pathOfUserSpecificTomcat}</echo>
 
@@ -177,7 +177,7 @@
     </replace>
 
     <condition property="yes.install.default.tomcat">
-      <equals arg1="${pathOfUserSpecificTomcat}" arg2="${default.tomcat.home.dir}"/>
+      <equals arg1="${pathOfUserSpecificTomcat}" arg2="${default.tomcat.home.dir.forward.slashes}"/>
     </condition>
 
     <antcall target="install-default-tomcat"/>
@@ -227,7 +227,14 @@
     <echo>Log4j file with forward slashes: ${log4j.file.forward.slashes}</echo>
 -->
 
+<!--
+<property name="default.tomcat.home.dir" value="${yanel.home.dir}/local/apache-tomcat-5.5.20"/>
+-->
     <property name="default.tomcat.home.dir" location="${yanel.home.dir}/local/apache-tomcat-5.5.20"/>
+    <path id="default.tomcat.home.dir.ref">
+      <pathelement location="${default.tomcat.home.dir}"/>
+    </path>
+    <pathconvert targetos="unix" property="default.tomcat.home.dir.forward.slashes" refid="default.tomcat.home.dir.ref"/>
 
     <path id="classpath">
       <!--