[Tinyos-commits] CVS: tinyos-1.x/tools/java/net/tinyos/tools Deluge.java, 1.10, 1.11 Makefile, 1.6, 1.7

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26322/tools

Modified Files:
	Deluge.java Makefile 
Log Message:
- Initial import of Deluge 2.0 tools.



Index: Deluge.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/tools/Deluge.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Deluge.java	28 Jan 2005 18:59:19 -0000	1.10
--- Deluge.java	22 Jul 2005 17:52:38 -0000	1.11
***************
*** 1,8 ****
  // $Id$
  
! /*									tab:4
   *
   *
!  * "Copyright (c) 2000-2004 The Regents of the University  of California.  
   * All rights reserved.
   *
--- 1,8 ----
  // $Id$
[...1070 lines suppressed...]
  
!   }
  
!   public static void main(String[] args) {
!     Deluge deluge = null;
!     try {
!       deluge = new Deluge(args);
!       deluge.execute();
!     } catch( IllegalArgumentException e ) {
!       if( e.getMessage().startsWith("usage:") ) {
! 	System.out.println( e.getMessage() );
!       } else {
! 	System.err.println( "Error: "+e.getMessage() );
! 	System.exit(1);
        }
      }
!     System.exit(0);
    }
  }
+ 

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/java/net/tinyos/tools/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	16 Aug 2004 19:30:12 -0000	1.6
--- Makefile	22 Jul 2005 17:52:38 -0000	1.7
***************
*** 12,16 ****
  NCG = ncg java
  
! MSGS = DelugeConsts.java DelugeAdvMsg.java DelugeReqMsg.java DelugeDataMsg.java SimpleCmdMsg.java LogMsg.java
  
  INITIAL_TARGETS = $(MSGS)
--- 12,16 ----
  NCG = ncg java
  
! MSGS = SimpleCmdMsg.java LogMsg.java
  
  INITIAL_TARGETS = $(MSGS)
***************
*** 22,45 ****
  
  #
- # Deluge
- #
- 
- DELUGE_PLATFORM=pc
- DELUGE_LIB=$(TOS)/lib/Deluge
- TOSBOOT_LIB=$(TOS)/lib/Deluge/TOSBoot/include
- 
- DelugeAdvMsg.java:
- 	$(MIG) -java-classname=$(PACKAGE).DelugeAdvMsg $(DELUGE_LIB)/DelugeMsgs.h DelugeAdvMsg -o $@
- 
- DelugeReqMsg.java:
- 	$(MIG) -java-classname=$(PACKAGE).DelugeReqMsg $(DELUGE_LIB)/DelugeMsgs.h DelugeReqMsg -o $@
- 
- DelugeDataMsg.java:
- 	$(MIG) -java-classname=$(PACKAGE).DelugeDataMsg $(DELUGE_LIB)/DelugeMsgs.h DelugeDataMsg -o $@
- 
- DelugeConsts.java:
- 	$(NCG) -java-classname=$(PACKAGE).DelugeConsts -target=$(DELUGE_PLATFORM) -I$(DELUGE_LIB) -I$(TOSBOOT_LIB) $(DELUGE_LIB)/DelugeC.nc Deluge.h DelugePageTransfer.h DelugeStableStore.h DelugeMsgs.h -o $@
- 
- #
  # SimpleCmd
  #
--- 22,25 ----