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

[rogmeier]

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

Modified Files:
	build.xml 
Log Message:
TC65/TinyNode foundations.

Index: build.xml
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/shockfish/tools/java_tc65/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	25 May 2006 18:41:56 -0000	1.1
--- build.xml	11 Sep 2006 13:40:02 -0000	1.2
***************
*** 2,21 ****
  	<property environment="env" />
  		
! 	<!--- Shockfish Mamaboard ANT for TC65/TinyNode              -->
! 	<!--- (c) 2006 Shockfish SA	                             -->
  	
  	<!--- #### BEGIN Configuration section ###################   -->
  
! 	<!--- The WTK directory                                      -->
  	<property name="wtk.home" value="/opt/sun-j2me-bin-1.0.4/" />
! 	<!--- The boot classpath (classes.zip) provided by Siemens.  -->
! 	<!--- Under Windows, this is normally set to -->
! 	<!--- C:\Program Files\Siemens\SMTK\TC65\WTK\lib\classes.zip -->
! 	<property name="tc65_bootcp" value="/opt/sun-j2me-bin-1.0.4/tc65_classes.zip" />
! 	
! 	<!--- The 'preverify' binary (by Siemens or from the J2ME)   -->
! 	<!--- Under Windows, this is normally set to -->
! 	<!--- C:\Program Files\Siemens\SMTK\TC65\WTK\bin\preverify   -->
! 	<property name="tc65_preverify" value="/usr/bin/preverify" />
  	
  	<!--- The full path to the TinyOS root.                      -->	
--- 2,14 ----
  	<property environment="env" />
  		
! 	<!--- ANT Build file for TC65/MamaBoard/TinyNode             -->
! 	<!--- (c) 2006 Shockfish SA	                                 -->
  	
  	<!--- #### 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.                      -->	
***************
*** 26,31 ****
  	<!--- ### END Configuration section ######################   -->
  	
- 	
- 	
  	<property name="src" value="src" />
  	<property name="build" value="build" />
--- 19,22 ----
***************
*** 34,42 ****
  	<property name="dist" value="dist" />
  	<property name="lib" value="lib" />
  	<property name="antennajar" value="antenna-bin-0.9.13.jar" />
  	<taskdef name="wtkpackage" classname="de.pleumann.antenna.WtkPackage" classpath="${lib}/ant/${antennajar}" />
  	<taskdef name="wtkjad" classname="de.pleumann.antenna.WtkJad" classpath="${lib}/ant/${antennajar}" />
  	<property name="helpfail" value="Please edit the properties in this buid.xml." />
! 	<!--- TODO remove <property name="wtk.home" value="/opt/sun-j2me-bin-1.0.4" /> -->
  	<property name="jarfile" value="MamaBoardDemo.jar" />
  	<property name="jadfile" value="${src}/com/shockfish/tinyos/apps/demo/mamaboarddemo.jad" />
--- 25,35 ----
  	<property name="dist" value="dist" />
  	<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}" />
  	<taskdef name="wtkjad" classname="de.pleumann.antenna.WtkJad" classpath="${lib}/ant/${antennajar}" />
  	<property name="helpfail" value="Please edit the properties in this buid.xml." />
! 
  	<property name="jarfile" value="MamaBoardDemo.jar" />
  	<property name="jadfile" value="${src}/com/shockfish/tinyos/apps/demo/mamaboarddemo.jad" />
***************
*** 48,51 ****
--- 41,45 ----
  		<mkdir dir="${buildjar}" />
  		<mkdir dir="${dist}" />
+ 		<mkdir dir="${dist}/apps" />
  		<uptodate property="coreBuild.notRequired">
  			<srcfiles dir="${src}" includes="**/*.java" />
***************
*** 55,58 ****
--- 49,53 ----
  
  	<target name="sanitycheck">
+ 		<echo message="Detected ${os.name} platform." />
  		<echo message="Checking your configuration..." />
  		<available file="${tc65_bootcp}" type="file" property="guess.bootcpfound"/>
***************
*** 67,77 ****
  	</target>
  	
- 	<!--- Message class generation
-   		<target name="genfiles">
-    			<exec dir="${src}/com/shockfish/tinyos/testapp" executable="make" />
-   		</target>
-  	-->
  
! 	<target name="compile" depends="init" 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 -->
--- 62,72 ----
  	</target>
  	
  
!   	<target name="genfiles">
!    			<exec dir="${src}/com/shockfish/tinyos/apps/demo" executable="make" />
!   	</target>
! 
! 
! 	<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 -->
***************
*** 93,104 ****
  
  	<target name="packaging" depends="sanitycheck,preverify">
! 		<jar jarfile="${dist}/${jarfile}" manifest="${jadfile}">
  			<fileset dir="${buildjar}" />
  		</jar>
  	</target>
  
! 	<target name="dist" depends="sanitycheck,packaging">
! 		<copy file="${jadfile}" todir="${dist}" overwrite="true" />
! 		<wtkjad jadfile="${dist}/mamaboarddemo.jad" jarfile="${dist}/${jarfile}" update="yes" />
  	</target>
  
--- 88,105 ----
  
  	<target name="packaging" depends="sanitycheck,preverify">
! 		<jar jarfile="${dist}/apps/${jarfile}" manifest="${jadfile}">
  			<fileset dir="${buildjar}" />
  		</jar>
  	</target>
  
! 	<target name="dist" depends="clean,sanitycheck,packaging">
! 		
! 		<copy file="${jadfile}" todir="${dist}/apps" overwrite="true" />
! 		<wtkjad jadfile="${dist}/apps/mamaboarddemo.jad" jarfile="${dist}/apps/${jarfile}" update="yes" />
! 		<echo file ="${dist}/BASESTATION_ID" message="Shockfish-test-basestation1" />
! 		<echo file ="${dist}/IP_DATA_SERVER" message="hq.shockfish.com" />
! 		<echo file ="${dist}/PORT_DATA_SERVER" message="6556" />
! 		<echo file ="${dist}/GPRSCONF" message=";bearer_type=gprs;access_point=internet;dns=213.055.128.001;timeout=3600" />
! 		<echo file ="${dist}/IP_DATE_SERVER" message="swisstime.ethz.ch" />
  	</target>