Changeset 15028 for greenstone3/trunk/build.xml

Timestamp:

2008-03-02T13:08:33+13:00 (15 years ago)

Author:

shaoqun

Message:

copy xalan.jar into tomcat endorsed dir on mac

File:

• greenstone3/trunk/build.xml (modified) (3 diffs)

greenstone3/trunk/build.xml

@@ -23 +23 @@
     <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/>
     <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpath="${basedir}/lib/java/anttasks.jar"/>
-
 
 <!-- ===================== Property Definitions =========================== -->
@@ -458 +457 @@
   <target name="activate-xalan-jar" if="need.xalan.jar">
     <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
+    <copy file="${web.lib}/xalan.jar.tmp" tofile="${tomcat.installed.path}/common/endorsed/xalan.jar" if="current.os.ismac"/> 
   </target>
   
@@ -1434 +1434 @@
       <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/" 
                 destPath="${basedir}/web/sites/flax"/>
+      <checkout url="${flax.svn.root}/flax1.0/trunk/resources/flax-build.xml"
+                destPath="${basedir}"/>
     </svn>
     <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/>
     <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" />
-
+ 
     <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/>
-    <!-- betterfa -->
-    <unzip src="${coll.dir}/betterfa/archives/archives.zip" dest="${coll.dir}/betterfa/archives"/>
-    <unzip src="${coll.dir}/betterfa/import/import.zip" dest="${coll.dir}/betterfa/import"/>
-    <unzip src="${coll.dir}/betterfa/index/index.zip" dest="${coll.dir}/betterfa/index"/>
-    <!-- imagegue -->
-    <unzip src="${coll.dir}/imagegue/archives/archives.zip" dest="${coll.dir}/imagegue/archives"/>
-    <unzip src="${coll.dir}/imagegue/import/import.zip" dest="${coll.dir}/imagegue/import"/>
-    <unzip src="${coll.dir}/imagegue/index/index.zip" dest="${coll.dir}/imagegue/index"/>
-    <!-- wikill -->
-    <unzip src="${coll.dir}/wikill/archives/archives.zip" dest="${coll.dir}/wikill/archives"/>
-    <unzip src="${coll.dir}/wikill/import/import.zip" dest="${coll.dir}/wikill/import"/>
-    <unzip src="${coll.dir}/wikill/index/index.zip" dest="${coll.dir}/wikill/index"/>
-
+    <unzip dest="${coll.dir}">  
+       <fileset dir="${coll.dir}">
+          <include name="*.zip"/>
+       </fileset>    
+    </unzip>    
+    <delete>
+     <fileset dir="${coll.dir}" includes="*.zip"/>
+    </delete>
   </target>