X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=7fb3ee4bb30480964d36fb79156a6fe3aeb67b1e;hp=f4dcd552d238992d0926ac5466bec1fea05f5e94;hb=07310ad61164d50613d8c7855d5d8adddd7bbfb6;hpb=26818e380ea4c3ef0efdd00594e632b83a68225b

diff --git a/build.xml b/build.xml
index f4dcd55..7fb3ee4 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,6 @@
 <project name="mjc2wsl" default="all">
     <property file="custom.properties"/>
+    <property environment="env"/>
     
      <condition property="fermat.dir" value="C:\fermat3">
        <os family="windows" />
@@ -58,7 +59,7 @@
 
     <target name="init-time">
         <tstamp>
-          <format property="time" pattern="(yy-MM-dd)-(HH-mm-ss)"/>
+          <format property="time" pattern="yy-MM-dd--HH-mm-ss"/>
         </tstamp>
     </target>
 
@@ -181,10 +182,10 @@
 
     <target name="wsl-run" >
         <exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
-            <env key="PATH" path="${env.PATH}:${fermat.dir}/bin"/>
+            <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
             <env key="FermaT" path="${fermat.dir}" />
             <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
-            <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e5.scm" />
+            <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e7.scm" />
             <arg value="${filename}"/>
         </exec>
     </target>
@@ -205,7 +206,7 @@
         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
         </antcall>
-        <record name="${log.file.transformations}${time}" action="stop" />
+	<record name="${log.file.transformations}${time}.txt" action="stop" />
         <copy file="${log.file.transformations}${time}.txt" tofile="${log.file.transformations}.txt"/>
     </target>