Changeset 32755 for other-projects/the-macronizer/trunk/build.xml

Timestamp:

2019-02-07T20:14:03+13:00 (5 years ago)

Author:

ak19

Message:

Western Wilson stuff. Final changes to get the mysql.props file running directly off the-macronizer checkout after ant's been run on it (and the 'ant logs-to-db-instructions' have been followed)

File:

• other-projects/the-macronizer/trunk/build.xml (modified) (2 diffs)

other-projects/the-macronizer/trunk/build.xml

@@ -95 +95 @@
     <!-- For the MacroniserFileLogProcessor, which sets up a nightly cron to send useful logging info
      from the daily macron.log.<date> files to a mysqldb, need to do some setup too -->
-    <copy file="${build.dir.exp}/mysql.properties.in" tofile="${build.dir.exp}/WEB-INF/classes/mysql.properties" filtering="true" overwrite="true"/>
+    <copy file="${build.dir.exp}/mysql.properties.in" tofile="${basedir}/mysql.properties" filtering="true" overwrite="true"/>
     
     <mkdir dir="${logfileproc.dir}"/>
@@ -107 +107 @@
     <filter token="jarlibs.folder" value="${build.dir.exp}/WEB-INF/lib"/>
     <filter token="classes.folder" value="${build.dir.exp}/WEB-INF/classes"/>
+    <!-- Why can't we set the classpath to the mysql.properties file
+     to be anywhere other than the toplevel Macronizer folder/basedir?
+     Anything else causes class MySQLAccess of MacroniserLogFileProcessor
+     to fail with mysql.properties FileNotFoundException -->
+    <!--<filter token="mysqlprops.dir" value="${logfileproc.dir}"/>-->
+    <filter token="mysqlprops.dir" value="${basedir}"/>
     
     <copy file="${scripts.dir}/macronLogToDB.bash.in" tofile="${scripts.dir}/macronLogToDB.bash" filtering="true" overwrite="true"/>