[Tinyos-2-commits] CVS: tinyos-2.x/support/make sim.extra, 1.1.2.3, 1.1.2.4

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	sim.extra 
Log Message:
Make TOSSIM compilation conditional on OS. Currently support Linux
and Cygwin (need to test Cygwin, use sim-cygwin for now).


Index: sim.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/Attic/sim.extra,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** sim.extra	2 Feb 2006 18:39:09 -0000	1.1.2.3
--- sim.extra	7 Jun 2006 17:34:04 -0000	1.1.2.4
***************
*** 8,11 ****
--- 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)
***************
*** 16,23 ****
  PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
  PYOBJFILE  = $(BUILDDIR)/pytossim.o
! PYDIR      =/usr/include/python2.3
  SIMDIR     =$(TOSDIR)/lib/tossim
  XML        = app.xml
  DUMPTYPES = -fnesc-dump=components -fnesc-dump=variables -fnesc-dump=constants -fnesc-dump=typedefs -fnesc-dump=interfacedefs -fnesc-dump=tags
  BUILD_DEPS = sim-exe
  
--- 17,36 ----
  PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
  PYOBJFILE  = $(BUILDDIR)/pytossim.o
! PYDIR      =/usr/include/python$(PYTHON_VERSION)
  SIMDIR     =$(TOSDIR)/lib/tossim
  XML        = app.xml
  DUMPTYPES = -fnesc-dump=components -fnesc-dump=variables -fnesc-dump=constants -fnesc-dump=typedefs -fnesc-dump=interfacedefs -fnesc-dump=tags
+ 
+ ifeq ($(OSTYPE), cygwin)
+   PLATFORM_FLAGS=-DUSE_DL_IMPORT -fpic
+   SHARED_OBJECT=_TOSSIM.dll
+   PLATFORM_BUILD_FLAGS= -fpic -W1,--enabled-auto-image-base 
+   PLATFORM_LIB_FLAGS = -L/$(PYDIR)/config -lstdc++ -lpython$(PYTHON_VERSION)
+ else  # Linux
+   PLATFORM_FLAGS=-shared -fPIC
+   SHARED_OBJECT=_TOSSIMmodule.so
+   PLATFORM_LIB_FLAGS = -lstdc++ 
+ endif
+  
  BUILD_DEPS = sim-exe
  
***************
*** 29,39 ****
  	@echo "  writing XML schema to $(XML)"
  	@echo "  compiling $(COMPONENT) to object file sim.o"
! 	$(NCC) -c -fPIC -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 -shared -fPIC -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
! 	$(GPP) -c -shared -fPIC -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
! 	@echo "  linking into shared object ./_TOSSIMmodule.so"
! 	$(GPP) -shared $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) -lstdc++ -o _TOSSIMmodule.so
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .
--- 42,52 ----
  	@echo "  writing XML schema to $(XML)"
  	@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_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
! 	$(GPP) -c $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
! 	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_FLAGS) $(PLATFORM_BUILD_FLAGS) $(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 .