[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/ptII/ptinyos/tools/make/ptII ptII.rules, 1.2, 1.3

[Elaine Cheong]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/tools/make/ptII
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1288

Modified Files:
	ptII.rules 
Log Message:
Use double quotes (") around anything that refers to java because on
Windows, Java 1.5 is in Program Files.



Index: ptII.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/ptII/ptinyos/tools/make/ptII/ptII.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ptII.rules	1 Feb 2006 22:42:22 -0000	1.2
--- ptII.rules	13 Jun 2006 22:40:29 -0000	1.3
***************
*** 46,51 ****
  	$(NCC) -E -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LDFLAGS)
  	@echo "    compiled $(COMPONENT) to $(PTII_APPFILE)"
! 	$(PTCC) $(PTJNI_NO_CYGWIN) -I$(PTJAVA_DIR)/include \
! 		-I$(PTJAVA_DIR)/include/$(PTJNI_ARCHITECTURE) \
  		$(PTJNI_SHAREDLIBRARY_CFLAG) $(PTJNI_SHAREDLIBRARY_LDFLAG) \
  		$(MY_PTCC_FLAGS) \
--- 46,51 ----
  	$(NCC) -E -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LDFLAGS)
  	@echo "    compiled $(COMPONENT) to $(PTII_APPFILE)"
! 	$(PTCC) $(PTJNI_NO_CYGWIN) "-I$(PTJAVA_DIR)/include" \
! 		"-I$(PTJAVA_DIR)/include/$(PTJNI_ARCHITECTURE)" \
  		$(PTJNI_SHAREDLIBRARY_CFLAG) $(PTJNI_SHAREDLIBRARY_LDFLAG) \
  		$(MY_PTCC_FLAGS) \
***************
*** 54,58 ****
  	@echo "    compiled $(COMPONENT) to $(PTII_SHARED_LIBRARY)"
  	@echo "    compiling $(COMPONENT).java"
! 	CLASSPATH="$(PTII)" $(JAVAC) -d $(BUILDDIR) Loader$(COMPONENT).java
  	@echo "    compiled Loader$(COMPONENT).java to $(BUILDDIR)/Loader$(COMPONENT).class"
  
--- 54,58 ----
  	@echo "    compiled $(COMPONENT) to $(PTII_SHARED_LIBRARY)"
  	@echo "    compiling $(COMPONENT).java"
! 	CLASSPATH="$(PTII)" "$(JAVAC)" -d $(BUILDDIR) Loader$(COMPONENT).java
  	@echo "    compiled Loader$(COMPONENT).java to $(BUILDDIR)/Loader$(COMPONENT).class"