From: <jo...@us...> - 2007-10-24 11:24:30
|
Revision: 5 http://mspsim.svn.sourceforge.net/mspsim/?rev=5&view=rev Author: joxe Date: 2007-10-24 04:24:24 -0700 (Wed, 24 Oct 2007) Log Message: ----------- Added Paths: ----------- mspsim/Makefile Added: mspsim/Makefile =================================================================== --- mspsim/Makefile (rev 0) +++ mspsim/Makefile 2007-10-24 11:24:24 UTC (rev 5) @@ -0,0 +1,134 @@ +############################################################### +# $Revision: 1.11 $ $Date: 2007/10/21 19:47:53 $ +# +# Needed stuff in the PATH: +# java, javac (JDK 1.2 or newer) +# +# Under MS-DOS/Windows 95/NT +# A GNU compatible Make (for example Cygnus GNU-Win 32, +# http://www.cygnus.com/misc/gnu-win32/) +# Note: might need to be called with "make --win32" under Windows!!! +############################################################### + +############################################################### +# Settings +############################################################### +CC=javac +JAVACC=javacc +JAR=jar +RM=rm -f +CP=cp + +############################################################### +# System dependent +############################################################### + +ifndef WINDIR + ifdef OS + ifneq (,$(findstring Windows,$(OS))) + WINDIR := Windows + endif + endif +endif + +ifndef WINDIR + # This settings are for UNIX + SEPARATOR=: + # Add "'" around filenames when removing them because UNIX expands "$" + APO='#' (last apostrophe to avoid incorrect font-lock) +else + # These setting are for MS-DOS/Windows 95/Windows NT + SEPARATOR=; + APO= +endif + + +############################################################### +# Arguments +############################################################### + +CCARGS=-deprecation -classpath . + + +############################################################### +# SERVER OBJECTS +############################################################### + +IHEXFILE = blinker2.ihex + +CPUTEST := tests/cputest.ihex +CPUTESTMAP := $(CPUTEST:.ihex=.map) + +PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util} + +SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} + +OBJECTS := $(SOURCES:.java=.class) + + +############################################################### +# MAKE +############################################################### + +.PHONY: compile $(CPUTEST) + +compile: $(OBJECTS) + +all: compile + +help: + @echo "Usage: make [all,compile,clean]" + +.PHONY: run +run: compile + java se.sics.util.IHexReader $(IHEXFILE) $(MAPFILE) + +runesb: compile + java se.sics.mspsim.platform.esb.ESBNode $(IHEXFILE) $(MAPFILE) + +runsky: compile + java se.sics.mspsim.platform.sky.SkyNode $(IHEXFILE) $(MAPFILE) + +.PHONY: cputest test +test: cputest + +cputest: $(CPUTEST) + java se.sics.util.Test $(CPUTEST) $(CPUTESTMAP) + +$(CPUTEST): + (cd tests && $(MAKE)) + +test: + cd tests && make + java se.sics.util.Test $(CPUTEST) $(CPUTESTMAP) + +.PHONY: mtest +mtest: compile $(CPUTEST) + @-$(RM) mini-test_cpu.txt + java se.sics.util.Test -debug $(CPUTEST) $(CPUTESTMAP) >mini-test_cpu.txt + + +############################################################### +# CLASS COMPILATION +############################################################### + +%.class : %.java + $(CC) $(CCARGS) $< + + +############################################################### +# CLEAN (untrusted, use with great care!!!) +############################################################### + +.PHONY: clean claen clena + +claen: clean + +clena: clean + +clean: +ifdef WINDIR + -$(RM) *.class ${addsuffix /*.class,$(PACKAGES)} +else + -$(RM) $(foreach f,$(wildcard *.class),$(APO)$(f)$(APO)) $(foreach dir,$(PACKAGES),$(dir)/*.class) +endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-10-26 13:26:01
|
Revision: 15 http://mspsim.svn.sourceforge.net/mspsim/?rev=15&view=rev Author: nifi Date: 2007-10-26 06:25:48 -0700 (Fri, 26 Oct 2007) Log Message: ----------- use FIRMWAREFILE if specified Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2007-10-26 13:11:08 UTC (rev 14) +++ mspsim/Makefile 2007-10-26 13:25:48 UTC (rev 15) @@ -52,9 +52,13 @@ # SERVER OBJECTS ############################################################### -FIRMWAREFILE = blinker2.ihex +ifndef FIRMWAREFILE ESBFIRMWARE = firmware/esb/sensor-demo.firmware SKYFIRMWARE = firmware/sky/sensor-demo.firmware +else +ESBFIRMWARE = $FIRMWAREFILE +SKYFIRMWARE = $FIRMWAREFILE +endif CPUTEST := tests/cputest.firmware @@ -115,12 +119,8 @@ # CLEAN (untrusted, use with great care!!!) ############################################################### -.PHONY: clean claen clena +.PHONY: clean -claen: clean - -clena: clean - clean: ifdef WINDIR -$(RM) *.class ${addsuffix /*.class,$(PACKAGES)} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fro...@us...> - 2007-11-01 15:45:57
|
Revision: 23 http://mspsim.svn.sourceforge.net/mspsim/?rev=23&view=rev Author: fros4943 Date: 2007-11-01 08:45:43 -0700 (Thu, 01 Nov 2007) Log Message: ----------- added chip + fixed inner classes in jar rule Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2007-11-01 10:41:24 UTC (rev 22) +++ mspsim/Makefile 2007-11-01 15:45:43 UTC (rev 23) @@ -62,7 +62,7 @@ CPUTEST := tests/cputest.firmware -PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util} +PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util chip} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} @@ -81,7 +81,7 @@ all: compile jar: compile - $(JAR) cf $(JARFILE) $(OBJECTS) images/*.jpg + $(JAR) cf $(JARFILE) ${addsuffix /*.class,$(PACKAGES)} images/*.jpg help: @echo "Usage: make [all,compile,clean]" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fro...@us...> - 2007-11-01 10:41:37
|
Revision: 22 http://mspsim.svn.sourceforge.net/mspsim/?rev=22&view=rev Author: fros4943 Date: 2007-11-01 03:41:24 -0700 (Thu, 01 Nov 2007) Log Message: ----------- jar support in Makefile Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2007-10-30 10:47:10 UTC (rev 21) +++ mspsim/Makefile 2007-11-01 10:41:24 UTC (rev 22) @@ -68,6 +68,7 @@ OBJECTS := $(SOURCES:.java=.class) +JARFILE := mspsim.jar ############################################################### # MAKE @@ -79,6 +80,9 @@ all: compile +jar: compile + $(JAR) cf $(JARFILE) $(OBJECTS) images/*.jpg + help: @echo "Usage: make [all,compile,clean]" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-11-26 10:24:53
|
Revision: 31 http://mspsim.svn.sourceforge.net/mspsim/?rev=31&view=rev Author: nifi Date: 2007-11-26 02:24:34 -0800 (Mon, 26 Nov 2007) Log Message: ----------- added archive generation for source release Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2007-11-26 09:34:12 UTC (rev 30) +++ mspsim/Makefile 2007-11-26 10:24:34 UTC (rev 31) @@ -62,6 +62,8 @@ CPUTEST := tests/cputest.firmware +BINARY := README.txt images/*.jpg firmware/*/*.firmware + PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util chip} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} @@ -74,19 +76,18 @@ # MAKE ############################################################### -.PHONY: compile $(CPUTEST) +.PHONY: all compile jar help run runesb runsky test cputest $(CPUTEST) mtest +all: compile + compile: $(OBJECTS) -all: compile - jar: compile $(JAR) cf $(JARFILE) ${addsuffix /*.class,$(PACKAGES)} images/*.jpg help: - @echo "Usage: make [all,compile,clean]" + @echo "Usage: make [all,compile,clean,run,runsky,runesb]" -.PHONY: run run: compile java se.sics.mspsim.util.IHexReader $(FIRMWAREFILE) $(MAPFILE) @@ -96,7 +97,6 @@ runsky: compile java se.sics.mspsim.platform.sky.SkyNode $(SKYFIRMWARE) $(MAPFILE) -.PHONY: cputest test test: cputest cputest: $(CPUTEST) @@ -105,13 +105,20 @@ $(CPUTEST): (cd tests && $(MAKE)) -.PHONY: mtest mtest: compile $(CPUTEST) @-$(RM) mini-test_cpu.txt java se.sics.util.Test -debug $(CPUTEST) >mini-test_cpu.txt ############################################################### +# ARCHIVE GENERATION +############################################################### + +source: + zip -9 mspsim-source-`date '+%F'`.zip Makefile $(BINARY) *.java $(addsuffix /*.java,$(PACKAGES)) tests/Makefile tests/*.c tests/*.h + + +############################################################### # CLASS COMPILATION ############################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-12-06 17:32:29
|
Revision: 45 http://mspsim.svn.sourceforge.net/mspsim/?rev=45&view=rev Author: nifi Date: 2007-12-06 09:32:27 -0800 (Thu, 06 Dec 2007) Log Message: ----------- added highlight package Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2007-12-06 17:31:58 UTC (rev 44) +++ mspsim/Makefile 2007-12-06 17:32:27 UTC (rev 45) @@ -64,7 +64,7 @@ BINARY := README.txt license.txt images/*.jpg firmware/*/*.firmware -PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util chip} +PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util chip extutil/highlight} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2007-12-10 10:17:06
|
Revision: 70 http://mspsim.svn.sourceforge.net/mspsim/?rev=70&view=rev Author: nifi Date: 2007-12-10 02:16:51 -0800 (Mon, 10 Dec 2007) Log Message: ----------- bug fix Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2007-12-07 10:24:30 UTC (rev 69) +++ mspsim/Makefile 2007-12-10 10:16:51 UTC (rev 70) @@ -56,8 +56,8 @@ ESBFIRMWARE = firmware/esb/sensor-demo.firmware SKYFIRMWARE = firmware/sky/blink.firmware else -ESBFIRMWARE = $FIRMWAREFILE -SKYFIRMWARE = $FIRMWAREFILE +ESBFIRMWARE = ${FIRMWAREFILE} +SKYFIRMWARE = ${FIRMWAREFILE} endif CPUTEST := tests/cputest.firmware This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-01-24 18:04:04
|
Revision: 80 http://mspsim.svn.sourceforge.net/mspsim/?rev=80&view=rev Author: nifi Date: 2008-01-24 09:58:34 -0800 (Thu, 24 Jan 2008) Log Message: ----------- added ui package Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-01-24 13:40:29 UTC (rev 79) +++ mspsim/Makefile 2008-01-24 17:58:34 UTC (rev 80) @@ -64,7 +64,7 @@ BINARY := README.txt license.txt CHANGE_LOG.txt images/*.jpg firmware/*/*.firmware -PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky util chip extutil/highlight} +PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky ui util chip extutil/highlight} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-01-28 11:08:43
|
Revision: 90 http://mspsim.svn.sourceforge.net/mspsim/?rev=90&view=rev Author: nifi Date: 2008-01-28 03:08:40 -0800 (Mon, 28 Jan 2008) Log Message: ----------- include jfreechart in classpath Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-01-28 11:08:08 UTC (rev 89) +++ mspsim/Makefile 2008-01-28 11:08:40 UTC (rev 90) @@ -45,7 +45,8 @@ # Arguments ############################################################### -CCARGS=-deprecation -classpath . +CLASSPATH=.$(SEPARATOR)lib/jfreechart-1.0.9.jar$(SEPARATOR)lib/jcommon-1.0.12.jar +CCARGS=-deprecation -classpath "${CLASSPATH}" ############################################################### @@ -82,9 +83,16 @@ compile: $(OBJECTS) -jar: compile - $(JAR) cf $(JARFILE) ${addsuffix /*.class,$(PACKAGES)} images/*.jpg +jar: compile JarManifest.txt + $(JAR) cfm $(JARFILE) JarManifest.txt ${addsuffix /*.class,$(PACKAGES)} images/*.jpg + -$(RM) JarManifest.txt +JarManifest.txt: + @echo >>$@ "Manifest-Version: 1.0" + @echo >>$@ "Sealed: true" + @echo >>$@ "Main-Class: se.sics.mspsim.platform.sky.SkyNode" + @echo >>$@ "Class-path: lib/jfreechart-1.0.9.jar lib/jcommon-1.0.12.jar" + help: @echo "Usage: make [all,compile,clean,run,runsky,runesb]" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-01-28 12:55:49
|
Revision: 94 http://mspsim.svn.sourceforge.net/mspsim/?rev=94&view=rev Author: nifi Date: 2008-01-28 04:55:32 -0800 (Mon, 28 Jan 2008) Log Message: ----------- added classpath to java command Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-01-28 12:54:51 UTC (rev 93) +++ mspsim/Makefile 2008-01-28 12:55:32 UTC (rev 94) @@ -12,6 +12,7 @@ # Settings ############################################################### CC=javac +JAVA=java JAVACC=javacc JAR=jar RM=rm -f @@ -48,7 +49,9 @@ CLASSPATH=.$(SEPARATOR)lib/jfreechart-1.0.9.jar$(SEPARATOR)lib/jcommon-1.0.12.jar CCARGS=-deprecation -classpath "${CLASSPATH}" +JAVAARGS=-classpath "${CLASSPATH}" + ############################################################### # SERVER OBJECTS ############################################################### @@ -97,25 +100,25 @@ @echo "Usage: make [all,compile,clean,run,runsky,runesb]" run: compile - java se.sics.mspsim.util.IHexReader $(FIRMWAREFILE) $(MAPFILE) + $(JAVA) $(JAVAARGS) se.sics.mspsim.util.IHexReader $(FIRMWAREFILE) $(MAPFILE) runesb: compile - java se.sics.mspsim.platform.esb.ESBNode $(ESBFIRMWARE) $(MAPFILE) + $(JAVA) $(JAVAARGS) se.sics.mspsim.platform.esb.ESBNode $(ESBFIRMWARE) $(MAPFILE) runsky: compile - java se.sics.mspsim.platform.sky.SkyNode $(SKYFIRMWARE) $(MAPFILE) + $(JAVA) $(JAVAARGS) se.sics.mspsim.platform.sky.SkyNode $(SKYFIRMWARE) $(MAPFILE) test: cputest cputest: $(CPUTEST) - java se.sics.mspsim.util.Test $(CPUTEST) + $(JAVA) $(JAVAARGS) se.sics.mspsim.util.Test $(CPUTEST) $(CPUTEST): (cd tests && $(MAKE)) mtest: compile $(CPUTEST) @-$(RM) mini-test_cpu.txt - java se.sics.util.Test -debug $(CPUTEST) >mini-test_cpu.txt + $(JAVA) $(JAVAARGS) se.sics.util.Test -debug $(CPUTEST) >mini-test_cpu.txt ############################################################### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-01-28 13:27:49
|
Revision: 99 http://mspsim.svn.sourceforge.net/mspsim/?rev=99&view=rev Author: nifi Date: 2008-01-28 05:27:48 -0800 (Mon, 28 Jan 2008) Log Message: ----------- added jfreechart ext util Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-01-28 13:22:13 UTC (rev 98) +++ mspsim/Makefile 2008-01-28 13:27:48 UTC (rev 99) @@ -68,7 +68,7 @@ BINARY := README.txt license.txt CHANGE_LOG.txt images/*.jpg firmware/*/*.firmware -PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky ui util chip extutil/highlight} +PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky ui util chip extutil/highlight extutil/jfreechart} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-02-20 09:46:30
|
Revision: 139 http://mspsim.svn.sourceforge.net/mspsim/?rev=139&view=rev Author: nifi Date: 2008-02-20 01:45:24 -0800 (Wed, 20 Feb 2008) Log Message: ----------- added package se.sics.mspsim.platform Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-02-19 19:56:31 UTC (rev 138) +++ mspsim/Makefile 2008-02-20 09:45:24 UTC (rev 139) @@ -68,7 +68,7 @@ BINARY := README.txt license.txt CHANGE_LOG.txt images/*.jpg firmware/*/*.firmware -PACKAGES := ${addprefix se/sics/mspsim/,core platform/esb platform/sky ui util chip extutil/highlight extutil/jfreechart} +PACKAGES := ${addprefix se/sics/mspsim/,core platform platform/esb platform/sky ui util chip extutil/highlight extutil/jfreechart} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-03-09 23:37:28
|
Revision: 166 http://mspsim.svn.sourceforge.net/mspsim/?rev=166&view=rev Author: nifi Date: 2008-03-09 16:37:13 -0700 (Sun, 09 Mar 2008) Log Message: ----------- added cli package Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-03-09 22:12:08 UTC (rev 165) +++ mspsim/Makefile 2008-03-09 23:37:13 UTC (rev 166) @@ -68,7 +68,7 @@ BINARY := README.txt license.txt CHANGE_LOG.txt images/*.jpg firmware/*/*.firmware -PACKAGES := ${addprefix se/sics/mspsim/,core platform platform/esb platform/sky ui util chip extutil/highlight extutil/jfreechart} +PACKAGES := ${addprefix se/sics/mspsim/,core platform platform/esb platform/sky cli ui util chip extutil/highlight extutil/jfreechart} SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2008-03-25 10:24:20
|
Revision: 209 http://mspsim.svn.sourceforge.net/mspsim/?rev=209&view=rev Author: nifi Date: 2008-03-25 03:24:01 -0700 (Tue, 25 Mar 2008) Log Message: ----------- added option to specify arguments to run targets Modified Paths: -------------- mspsim/Makefile Modified: mspsim/Makefile =================================================================== --- mspsim/Makefile 2008-03-25 10:07:17 UTC (rev 208) +++ mspsim/Makefile 2008-03-25 10:24:01 UTC (rev 209) @@ -100,13 +100,13 @@ @echo "Usage: make [all,compile,clean,run,runsky,runesb]" run: compile - $(JAVA) $(JAVAARGS) se.sics.mspsim.util.IHexReader $(FIRMWAREFILE) $(MAPFILE) + $(JAVA) $(JAVAARGS) se.sics.mspsim.util.IHexReader $(ARGS) $(FIRMWAREFILE) $(MAPFILE) runesb: compile - $(JAVA) $(JAVAARGS) se.sics.mspsim.platform.esb.ESBNode $(ESBFIRMWARE) $(MAPFILE) + $(JAVA) $(JAVAARGS) se.sics.mspsim.platform.esb.ESBNode $(ARGS) $(ESBFIRMWARE) $(MAPFILE) runsky: compile - $(JAVA) $(JAVAARGS) se.sics.mspsim.platform.sky.SkyNode $(SKYFIRMWARE) $(MAPFILE) + $(JAVA) $(JAVAARGS) se.sics.mspsim.platform.sky.SkyNode $(ARGS) $(SKYFIRMWARE) $(MAPFILE) test: cputest This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |