Mercurial > hg > testrepo
changeset 72:45ac459f8752
Backed out changeset 2d7064ff0003
Let me think a bit about this first.
| author | Mark Wielaard <mark@klomp.org> |
|---|---|
| date | Fri, 09 Dec 2011 01:37:40 +0100 |
| parents | 2d7064ff0003 |
| children | 8bac79b4db25 |
| files | ChangeLog Makefile |
| diffstat | 2 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Dec 09 01:33:34 2011 +0100 +++ b/ChangeLog Fri Dec 09 01:37:40 2011 +0100 @@ -1,7 +1,3 @@ -2011-12-09 Mark Wielaard <mark@klomp.org> - - * Makefile: Generalize SCRIPTNAME. - 2011-11-10 Mark Wielaard <mark@klomp.org> * Mandelbrot.java: Turn into a true oneliner.
--- a/Makefile Fri Dec 09 01:33:34 2011 +0100 +++ b/Makefile Fri Dec 09 01:37:40 2011 +0100 @@ -1,19 +1,18 @@ JAVASOURCES = Hello.java World.java Mandelbrot.java MAINCLASS = Hello -SCRIPTNAME = helloworld -${SCRIPTNAME}: ${JAVASOURCES} +helloworld: ${JAVASOURCES} javac ${JAVASOURCES} - echo "java ${MAINCLASS} \$$1" > ${SCRIPTNAME} - chmod 755 ${SCRIPTNAME} + echo "java ${MAINCLASS} \$$1" > helloworld + chmod 755 helloworld clean: rm -f *.class - rm -f ${SCRIPTNAME} + rm -f helloworld -check: ${SCRIPTNAME} - echo "Testing ${SCRIPTNAME} runs and exits with no error" +check: helloworld + echo "Testing helloworld runs and exits with no error" echo "HINT: Must at least produce Hello World" - ./${SCRIPTNAME} | grep "Hello World" + ./helloworld | grep "Hello World" -all: ${SCRIPTNAME} +all: helloworld