[jsword-svn] common s

jswordcvs at crosswire.org jswordcvs at crosswire.org
Mon May 9 19:10:44 MST 2005


Update of /cvs/jsword/common
In directory www.crosswire.org:/tmp/cvs-serv11169

Modified Files:
	core.xml build.xml 
Log Message:
Moved GPL to be a file comment.
Fixed the JSword build fail on missing resource diirectory.
Made ant clean also remove the keystore file.

Index: core.xml
===================================================================
RCS file: /cvs/jsword/common/core.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** core.xml	30 Jan 2005 18:26:05 -0000	1.17
--- core.xml	10 May 2005 02:10:41 -0000	1.18
***************
*** 34,44 ****
    <patternset id="external.runtime.jars">
      <include name="**/jdom-*.jar"/>
-     <!-- include name="**/log4j*.jar"/ -->
-     <!-- include name="**/commons-lang-*.jar"/ -->
      <include name="**/commons-net-*.jar"/>
      <include name="**/lucene-*.jar"/>
      <include name="**/activation.jar"/>
-     <!-- include name="**/tar.jar"/ -->
-     <!-- include name="**/winlaf-*.jar"/ -->
      <include name="**/jlfgr-*.jar"/>
      <include name="**/servlet.jar"/>
--- 34,40 ----
***************
*** 130,136 ****
--- 126,140 ----
            description="Remove the target directory">
      <delete dir="${target.root}"/>
+     <antcall target="clean.extra"/>
    </target>
  
    <!--=======================================================================
+     == Do any other needed work after clean.
+     == By overriding this target in the importing ant build file,
+     == it will allow for the definition of any other post clean activities.
+     =========================================================================-->
+   <target name="clean.extra" description="Extra stuff to do after calling clean"/>
+ 
+   <!--=======================================================================
      == Invoke a clean on any dependencies, if any.
      == This target requires the "dependency" property to be set by

Index: build.xml
===================================================================
RCS file: /cvs/jsword/common/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml	30 Jul 2004 16:47:00 -0000	1.7
--- build.xml	10 May 2005 02:10:41 -0000	1.8
***************
*** 4,6 ****
--- 4,10 ----
    <import file="../common/core.xml"/>
  
+   <target name="clean.extra" description="Extra stuff to do after calling clean">
+     <delete dir="${keystore.file}"/>
+   </target>
+ 
  </project>



More information about the jsword-svn mailing list