[Tm4j-commits] tm4j build.sh,1.4,1.5 build.xml,1.145,1.146

[Xuan B. <med...@us...>]

Update of /cvsroot/tm4j/tm4j
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12860

Modified Files:
	build.sh build.xml 
Log Message:
Update 4 years old ant.

Index: build.sh
===================================================================
RCS file: /cvsroot/tm4j/tm4j/build.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.sh	9 Feb 2002 19:25:03 -0000	1.4
--- build.sh	25 Jan 2008 19:21:07 -0000	1.5
***************
*** 1,9 ****
  #!/bin/sh
  
! for f in lib/*.jar; do export CLASSPATH=$f:$CLASSPATH; done
  
  # Make "all" target if no arguments given; otherwise use first argument as target
! test -z $1 && target=all || target=$1
  
! export ANT_HOME=`dirname $0`
! . $ANT_HOME/bin/ant $target
--- 1,15 ----
  #!/bin/sh
  
! export CLASSPATH=""
! 
! if false; then
! 	for f in lib/*.jar; do
! 		export CLASSPATH="$f:$CLASSPATH";
! 	done
! fi
  
  # Make "all" target if no arguments given; otherwise use first argument as target
! test -z "$1" && target=all || target="$1"
  
! export ANT_HOME="`dirname $0`/lib/ant/apache-ant-1.7.0"
! . "$ANT_HOME"/bin/ant "$target"

Index: build.xml
===================================================================
RCS file: /cvsroot/tm4j/tm4j/build.xml,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** build.xml	23 Jan 2008 22:39:09 -0000	1.145
--- build.xml	25 Jan 2008 19:21:07 -0000	1.146
***************
*** 18,21 ****
--- 18,22 ----
        <include name="*.jar"/>
        <include name="build/*.jar"/>
+       <include name="jpox/*.jar"/>
      </fileset>
      <pathelement location="build/classes"/>
***************
*** 53,56 ****
--- 54,64 ----
    </path>
  
+   <path id="jpox.project.classpath">
+     <path refid="project.class.path"/>
+     <fileset dir="lib/jpox">
+       <include name="*.jar"/>
+     </fileset>
+   </path>
+   
    <property name="testdir" location="resource/tests"/>
    
***************
*** 735,742 ****
--- 743,753 ----
      <exclude name="org/tm4j/topicmap/utils/TopicMapDoclet.java"/>
      <exclude name="org/tm4j/topicmap/**/test/*.java"/>
+     <include name="org/tm4j/topicmap/utils/ctm/**/*.java"/>
    </patternset>
  
    <patternset id="tm4j.resources">
      <include name="org/tm4j/topicmap/xtm1.dtd"/>
+ 	<include name="org/tm4j/topicmap/utils/ctm/parser/sablecc3/parser/parser.dat"/>
+ 	<include name="org/tm4j/topicmap/utils/ctm/parser/sablecc3/lexer/lexer.dat"/>
    </patternset>
  
***************
*** 845,848 ****
--- 856,878 ----
    </target>
        
+ 	<target name="enhance" depends="init">
+ 		<copy todir="${classdir}">
+ 			<fileset dir="src">
+ 				<include name="**/package.jdo"/>
+ 			</fileset>
+ 		</copy>
+ 		
+ 		<!-- define the task enhancer -->
+ 		<taskdef name="enhancer" classname="org.jpox.enhancer.tools.EnhancerTask">
+ 			<classpath refid="project.class.path"/>
+ 		</taskdef>
+ 		
+ 		<!-- enhance -->
+ <!--	<enhancer classpathref="compile.classpath" dir="${classdir}" verbose="true"> -->
+ 		<enhancer classpathref="project.class.path" dir="${classdir}" verbose="true" enhancerName="ASM" >
+ <!--			<sysproperty key="log4j.configuration" value="file:log4j.properties"/> -->
+ 		</enhancer>
+ 	</target>
+ 
    <target name="tm4j-clean" depends="init,tm4j-net-clean">
      <description>