[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestDIP DipInject.java, 1.1, 1.2 Makefile, 1.2, 1.3

[Kaisen Lin]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestDIP
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15498

Modified Files:
	DipInject.java Makefile 
Log Message:
Fixed Version/ID order injector

Index: DipInject.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestDIP/DipInject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DipInject.java	16 Feb 2008 10:55:33 -0000	1.1
--- DipInject.java	16 Feb 2008 19:20:12 -0000	1.2
***************
*** 27,31 ****
  	DipDataMsg ddm = new DipDataMsg(dm, DipMsg.DEFAULT_MESSAGE_SIZE);
  	ddm.set_key(key);
!         ddm.set_version(version);
          ddm.set_size((short)data.length);
  
--- 27,31 ----
  	DipDataMsg ddm = new DipDataMsg(dm, DipMsg.DEFAULT_MESSAGE_SIZE);
  	ddm.set_key(key);
!         ddm.set_version(version << 16);
          ddm.set_size((short)data.length);
  

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestDIP/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	16 Feb 2008 10:55:33 -0000	1.2
--- Makefile	16 Feb 2008 19:20:12 -0000	1.3
***************
*** 8,11 ****
--- 8,13 ----
  CFLAGS += $(CONSTANTS)
  
+ CLEAN_EXTRA += DipMsg.py DipDataMsg.py DipData.py DipMsg.java DipDataMsg.java DipData.java DipMsg.class DipDataMsg.class DipData.class DipInject.class
+ 
  DipMsg.py:
  	mig python -target=$(PLATFORM) -python-classname=DipMsg $(CFLAGS) $(TOSDIR)/lib/net/dip/Dip.h dip_msg -o $@
***************
*** 39,47 ****
  	javac -target 1.4 -source 1.4 DipInject.java
  
- #clean-inject:
- #	rm -f DipMsg.py DipDataMsg.py DipData.py
- #	rm -f DipMsg.java DipDataMsg.java DipData.java
- #	rm -f DipMsg.class DipDataMsg.class DipData.class
- #	rm -f DipInject.class
- 
  include $(MAKERULES)
--- 41,43 ----