diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-10-03 09:28:03 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-10-03 09:28:03 +0000 |
| commit | 72937e8473ffbd83e6c28d6a142f0a49c02da43b (patch) | |
| tree | 69bb2b0ed0f8907e3ce67e25ec29b32677f3f0ae | |
| parent | 27a039bf41983c1d58bfaf45b64f6afff1454377 (diff) | |
| download | scala-72937e8473ffbd83e6c28d6a142f0a49c02da43b.tar.gz scala-72937e8473ffbd83e6c28d6a142f0a49c02da43b.tar.bz2 scala-72937e8473ffbd83e6c28d6a142f0a49c02da43b.zip | |
Added support for building Scalac Ant task.
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | config/list/scala4ant.lst | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -784,13 +784,20 @@ PROJECT_SOURCES += $(SCALA4ANT_SOURCES) SCALA4ANT_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scala4ant SCALA4ANT_LIST += $(call READLIST,$(PROJECT_LISTDIR)/scala4ant.lst) SCALA4ANT_SOURCES += $(SCALA4ANT_LIST:%=$(SCALA4ANT_ROOT)/%) -SCALA4ANT_SC_FILES += $(SCALA4ANT_SOURCES) +SCALA4ANT_JC_FILES += $(filter %.java,$(SCALA4ANT_SOURCES)) +SCALA4ANT_JC_CLASSPATH = $(JC_CLASSPATH):$(ANT_JARFILE) +SCALA4ANT_SC_FILES += $(filter %.scala,$(SCALA4ANT_SOURCES)) SCALA4ANT_SC_CLASSPATH = $(SC_CLASSPATH):$(ANT_JARFILE) +$(latest)scala4ant : $(latest)scala4ant-jc $(latest)scala4ant : $(latest)scala4ant-sc $(latest)scala4ant : $(TOUCH) $@ +$(latest)scala4ant-jc : $(SCALA4ANT_JC_FILES) + @$(make) jc target=SCALA4ANT SCALA4ANT_JC_FILES='$?' + $(TOUCH) $@ + $(latest)scala4ant-sc : $(SCALA4ANT_SC_FILES) @$(make) sc target=SCALA4ANT SCALA4ANT_SC_FILES='$?' $(TOUCH) $@ diff --git a/config/list/scala4ant.lst b/config/list/scala4ant.lst index a205e76785..6337cbc38d 100644 --- a/config/list/scala4ant.lst +++ b/config/list/scala4ant.lst @@ -3,6 +3,8 @@ ############################################################################## # $Id$ +../scalac/ant/Scalac.java + AntAdaptor.scala AntTask.scala ScalaRuntime.scala |