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

Timestamp:

2017-09-12T17:19:04+12:00 (7 years ago)

Author:

rmw36

Message:

Macronizer changes: 1. adding an ethical disclaimer to the main web page (temporarily still in English for the Maori jsp file too, but Te Taka will be translating this.) 2. Adding more logging to the macronizer. This required setting up a log4j.properties file (and adding its jar file copied from GS3), and modifying the existing java code DirectInput and FileUpload to make calls to logger. Modifications to build.xml to copy the new template log4j.properties.in file into web/WEB-INF/classes where the log4j.props needs to live. 3. Corrected the svn mime-type property on build.xml so that it's no longer mistaken for a binary file

File:

• other-projects/the-macronizer/trunk/build.xml (modified) (3 diffs, 1 prop)

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

@@ -9 +9 @@
   <property name="build.dir.exp"   location="web" />
   <property name="lib.dir.exp"  location="web/WEB-INF/lib" />
+  <property name="webinf.dir"  location="web/WEB-INF" />
   
   <!--
@@ -40 +41 @@
   </target>
     
-  <target depends="init" name="build">
+  <target name="build" depends="init">
     <javac source="${javac.source}" target="${javac.target}" debug="${javac.debug}"
        encoding="utf-8"
@@ -49 +50 @@
     <path refid="classpath.exp"/>
     <pathelement location="src/jars/servlet-api.jar"/>
-    <pathelement path="src/java"/>            
+    <pathelement path="src/java"/>
+    <pathelement path="webinf.dir"/>
       </classpath>
     </javac>
+
+    <!-- http://ant.apache.org/manual/Tasks/copy.html
+     By default, files are only copied if the source file is newer than the destination file,
+     or when the destination file does not exist. However, you can explicitly overwrite files
+     with the overwrite attribute.-->
+    <copy file="${build.dir.exp}/log4j.properties.in" tofile="/greenstone/greenstone3/web/WEB-INF/classes/log4j.properties"/>
+
+    <!-- mkdir Creates a directory. Also non-existent parent directories are created,
+     when necessary. Does nothing if the directory already exist. -->
+    <mkdir dir="${build.dir.exp}/logs"/>
   </target>
 
     
-  <target depends="build" name="war">
+  <target name="war" depends="build">
     <jar destfile="${dist.filename.exp}">  
       <fileset dir="${build.dir.exp}" />