Lib folder fixed

hdoc_to_opale/bibtex_to_opale/Ant/bibtex_to_opale.ant

@@ -2,7 +2,8 @@
 <project basedir=".." name="main" default="convert">
     <property name="InputPath" value="bib2.bib"></property>
     <property name="OutputPath" value="${basedir}\result\ref.scar"></property>
-    
+    <property name="lib" value="${basedir}/lib"/>
+
     <target name="convert">
         <antcall target="preparation"/>
         <antcall target="BibtexToBibXml"/>
@@ -18,7 +19,7 @@
         <antcall target="zip"/>
         <antcall target="CleanDirectory"/>
     </target>
-    
+
     <target name="preparation">
         <delete dir="${basedir}/result"></delete>
         <mkdir dir="${basedir}/result"></mkdir>
@@ -26,52 +27,52 @@
         <mkdir dir="${basedir}/decompressedOpale/ref"></mkdir>
         <mkdir dir="${basedir}/tmp"></mkdir>
     </target>
-    
+
     <target name="CleanDirectory">
         <delete dir="${basedir}/tmp"></delete>
         <delete dir="${basedir}/java"></delete>
         <delete dir="${basedir}/decompressedOpale"></delete>
     </target>
-    
-    
+
+
     <target name="BibtexToBibXml">
         <!-- Convert Bibtex into BibtexXml  -->
         <java
             fork="true"
-            failonerror="true" 
-            jar="lib/bibtex.jar"
+            failonerror="true"
+            jar="${lib}/bibtex.jar"
             >
             <arg value="${InputPath}"/>
             <arg value="${basedir}/tmp"/>
             <arg value="/tmpBibXml.xml"/>
         </java>
     </target>
-    
+
     <target name="BibXmlToHdocBib">
         <!-- Convert from BibXlm to HdocBib -->
-        <xslt classpath="${basedir}/lib/saxon9he.jar" 
-            in="${basedir}\tmp\tmpBibXml.xml" out="${basedir}\tmp\tmpHdocBib.xml" 
+        <xslt classpath="${basedir}/${lib}/saxon9he.jar"
+            in="${basedir}\tmp\tmpBibXml.xml" out="${basedir}\tmp\tmpHdocBib.xml"
             xslresource="${basedir}/XSL/BibToHdoc.xsl"></xslt>
     </target>
-    
+
     <target name="HdocToOpale">
         <!-- Convert from HdocBib to Opale -->
-        <xslt in="${basedir}\tmp\tmpHdocBib.xml" 
-            out="${basedir}/tmp/tempHdoc.xml" 
+        <xslt in="${basedir}\tmp\tmpHdocBib.xml"
+            out="${basedir}/tmp/tempHdoc.xml"
             xslresource="${basedir}/XSL/SeparateXmlt.xsl">
             <param name="in" expression="${basedir}\tmp\tmpHdocBib.xml"></param>
             <param name="out" expression="${basedir}\decompressedOpale\ref"></param>
         </xslt>
         <ant antfile="${basedir}/tmp/tempHdoc.xml"/>
     </target>
-    
+
     <target name="zip">
         <chmod dir="${basedir}/decompressedOpale" perm="777"></chmod>
         <copy file=".wspmeta" todir="${basedir}/decompressedOpale"/>
         <zip basedir="decompressedOpale" destfile="${OutputPath}" encoding="UTF-8"/>
         <chmod dir="${OutputPath}" perm="777"/>
     </target>
-    
-    
-    
-</project>
\ No newline at end of file
+
+
+
+</project>

hdoc_to_opale/hdoc_to_opale.ant

@@ -12,7 +12,6 @@
     <property name="log" location="${basedir}/log"/>
     <property name="schema" location="${basedir}/schema"/>
     <property name="bibtex" location="${basedir}/bibtex_to_opale"/>
-
     <property file="global.properties"/>
 
   	<target name="convert">
@@ -91,6 +90,7 @@
       		</first>
       		<xslt in="${toString:first}" out="${tmp}/${filename}/generateContentPath.xml" style="${xsl}/transformation0.xsl" processor="org.apache.tools.ant.taskdefs.optional.TraXLiaison">
             <param name="filename" expression="${filename}"/>
+            <param name="lib" expression="${lib}"/>
           </xslt>
       		<chmod file="${tmp}/${filename}/generateContentPath.xml" perm="777"/>
         </sequential>

hdoc_to_opale/xsl/prepareCourseUcCopies.xsl

@@ -21,7 +21,7 @@
       <property name="filename" location="${{tmp}}/{$filename}"/>
       <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
         <classpath>
-          <pathelement location="../lib/jing.jar"/>
+          <pathelement location="../${lib}/jing.jar"/>
         </classpath>
       </taskdef>
 

hdoc_to_opale/xsl/transformation0.xsl

@@ -9,9 +9,10 @@
         <project name="getContentFileAndTransformIt" basedir="." default="start">
             <property file="global.properties"/>
             <property name="filename" location="${filename}"/>
+            <property name="lib" location="${lib}"/>
             <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
                 <classpath>
-                    <pathelement location="../lib/jing.jar"/>
+                    <pathelement location="../${lib}/jing.jar"/>
                 </classpath>
             </taskdef>