[Tinyos-2-commits] CVS: tinyos-2.x/support/make sim-fast.extra, 1.1.2.2, 1.1.2.3 sim.extra, 1.1.2.6, 1.1.2.7

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/support/make
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17514

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	sim-fast.extra sim.extra 
Log Message:
Adjust compilation process for more universal hashtable use.


Index: sim-fast.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/sim-fast.extra,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** sim-fast.extra	1 Jul 2006 19:36:30 -0000	1.1.2.2
--- sim-fast.extra	4 Aug 2006 01:42:47 -0000	1.1.2.3
***************
*** 15,18 ****
--- 15,20 ----
  CXXFILE    = $(TOSDIR)/lib/tossim/tossim.c
  CXXOBJFILE = $(BUILDDIR)/tossim.o
+ HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
+ HASHOBJFILE = $(BUILDDIR)/c-support.o
  PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
  PYOBJFILE  = $(BUILDDIR)/pytossim.o
***************
*** 52,59 ****
  	@echo "  compiling $(COMPONENT) to object file sim.o"
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
! 
! 	@echo "  compiling Python support into pytossim.o and tossim.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
  	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
--- 54,61 ----
  	@echo "  compiling $(COMPONENT) to object file sim.o"
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
! 	@echo "  compiling Python support and C libraries into pytossim.o, tossim.o, and c-support.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
+ 	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(HASHOBJFILE) $(OPTFLAGS) $(CFLAGS) $(HASHFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
  	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)

Index: sim.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/sim.extra,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** sim.extra	8 Jun 2006 01:46:20 -0000	1.1.2.6
--- sim.extra	4 Aug 2006 01:42:48 -0000	1.1.2.7
***************
*** 8,12 ****
  PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\)  
  WFLAGS = -Wno-nesc-data-race
! PYTHON_VERSION=2.3
  
  BUILDDIR   = simbuild/$(PLATFORM)
--- 8,12 ----
  PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\)  
  WFLAGS = -Wno-nesc-data-race
! PYTHON_VERSION=2.4
  
  BUILDDIR   = simbuild/$(PLATFORM)
***************
*** 15,18 ****
--- 15,20 ----
  CXXFILE    = $(TOSDIR)/lib/tossim/tossim.c
  CXXOBJFILE = $(BUILDDIR)/tossim.o
+ HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
+ HASHOBJFILE = $(BUILDDIR)/c-support.o
  PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
  PYOBJFILE  = $(BUILDDIR)/pytossim.o
***************
*** 53,61 ****
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
  
! 	@echo "  compiling Python support into pytossim.o and tossim.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .
--- 55,64 ----
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
  
! 	@echo "  compiling Python support and C libraries into pytossim.o, tossim.o, and c-support.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
+ 	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(HASHOBJFILE) $(OPTFLAGS) $(CFLAGS) $(HASHFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(HASHOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .