[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/shockfish/tools/java_tc65 build.xml, 1.2, 1.3

[rogmeier]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/shockfish/tools/java_tc65
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7996

Modified Files:
	build.xml 
Log Message:
Cygwin-compatible build.

Index: build.xml
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/shockfish/tools/java_tc65/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	11 Sep 2006 13:40:02 -0000	1.2
--- build.xml	11 Sep 2006 15:19:05 -0000	1.3
***************
*** 7,20 ****
  	<!--- #### BEGIN Configuration section ###################   -->
  
! 	<!--- The WTK directory   under windows : read IMPNG_DIR     -->
! 	<property name="wtk.home" value="/opt/sun-j2me-bin-1.0.4/" />
  
- 	<!--- FIXME : wtk.home and tosroot -->
- 	
- 	<!--- The full path to the TinyOS root.                      -->	
- 	<!--- Under Windows, this is normally set to                 -->
- 	<!--- c:/path/to/cygwin/${env.TOSROOT} -->	
- 	<property name="mtosroot" value="${env.TOSROOT}" />
- 	
  	<!--- ### END Configuration section ######################   -->
  	
--- 7,14 ----
  	<!--- #### BEGIN Configuration section ###################   -->
  
! 	<!--- The WTK directory  (read IMPNG_DIR 				     -->
! 	<property name="wtk.home" value="C:\Program Files\Siemens\SMTK\TC65_R2\WTK" />
! 
  
  	<!--- ### END Configuration section ######################   -->
  	
***************
*** 26,30 ****
  	<property name="lib" value="lib" />
  	<property name="tc65_bootcp" value="${wtk.home}/lib/classes.zip" />
! 	<property name="tc65_preverify" value="${wtk.home}/bin/preverify" />
  	<property name="antennajar" value="antenna-bin-0.9.13.jar" />
  	<taskdef name="wtkpackage" classname="de.pleumann.antenna.WtkPackage" classpath="${lib}/ant/${antennajar}" />
--- 20,24 ----
  	<property name="lib" value="lib" />
  	<property name="tc65_bootcp" value="${wtk.home}/lib/classes.zip" />
! 	<property name="tc65_preverify" value="${wtk.home}/bin/preverify.exe" />
  	<property name="antennajar" value="antenna-bin-0.9.13.jar" />
  	<taskdef name="wtkpackage" classname="de.pleumann.antenna.WtkPackage" classpath="${lib}/ant/${antennajar}" />
***************
*** 49,52 ****
--- 43,47 ----
  
  	<target name="sanitycheck">
+ 		
  		<echo message="Detected ${os.name} platform." />
  		<echo message="Checking your configuration..." />
***************
*** 57,63 ****
  		<fail unless="guess.preverifyfound" message="Your preverify utility was not found. Was set to ${tc65_preverify}. ${helpfail}"/>
  		<echo message="Found preverify, using ${tc65_preverify}" />
! 		<available file="${mtosroot}" type="dir" property="guess.mtosroot"/>
! 		<fail unless="guess.mtosroot" message="Your TOSROOT was not found. Was set to ${mtosroot}. ${helpfail}"/>
! 		<echo message="Found TOSROOT, using ${mtosroot}" />
  	</target>
  	
--- 52,56 ----
  		<fail unless="guess.preverifyfound" message="Your preverify utility was not found. Was set to ${tc65_preverify}. ${helpfail}"/>
  		<echo message="Found preverify, using ${tc65_preverify}" />
! 
  	</target>
  	
***************
*** 69,73 ****
  
  	<target name="compile" depends="init,genfiles" unless="coreBuild.notRequired">
! 		<javac target="1.4" source="1.4" destdir="${buildtmp}" compiler="modern" bootclasspath="${tc65_bootcp}" srcdir="${mtosroot}/tools/java:${mtosroot}/contrib/shockfish/tools/java:${src}">
  			<!--- Drop-in for TinyOS files -->
  			<include name="net/tinyos/packet/ByteSource.java" />
--- 62,66 ----
  
  	<target name="compile" depends="init,genfiles" unless="coreBuild.notRequired">
! 		<javac target="1.4" source="1.4" destdir="${buildtmp}" compiler="modern" bootclasspath="${tc65_bootcp}" srcdir="../../../../tools/java:../../../../contrib/shockfish/tools/java:${src}">
  			<!--- Drop-in for TinyOS files -->
  			<include name="net/tinyos/packet/ByteSource.java" />
***************
*** 83,87 ****
  	<target name="preverify" depends="sanitycheck,compile">
  		<exec dir="." executable="${tc65_preverify}">
! 			<arg line="-classpath ${tc65_bootcp} -d ${buildjar} ${buildtmp}" />
  		</exec>
  	</target>
--- 76,80 ----
  	<target name="preverify" depends="sanitycheck,compile">
  		<exec dir="." executable="${tc65_preverify}">
! 			<arg line=" -classpath &quot;${tc65_bootcp}&quot; -d &quot;${buildjar}&quot; &quot;${buildtmp}&quot;" />
  		</exec>
  	</target>