diff options
| author | paltherr <paltherr@epfl.ch> | 2004-01-19 09:05:29 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-01-19 09:05:29 +0000 |
| commit | a15110d8837e3cd351d956566516d656f4f84a55 (patch) | |
| tree | af583024d79852693b58381fceb55d3cdc541bbf /Makefile | |
| parent | 6f0bb4891c2e4c23c33462ff977c4805fea1338c (diff) | |
| download | scala-a15110d8837e3cd351d956566516d656f4f84a55.tar.gz scala-a15110d8837e3cd351d956566516d656f4f84a55.tar.bz2 scala-a15110d8837e3cd351d956566516d656f4f84a55.zip | |
- Renamed scalac4ant into scala4ant
- Moved scala4ant sources into sources/scala/tools/scala4ant Removed
- examples from support/ant
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 29 |
1 files changed, 14 insertions, 15 deletions
@@ -23,7 +23,7 @@ PROJECT_SOURCES += $(INTERPRETER_SOURCES) PROJECT_SOURCES += $(SCALADOC_SOURCES) PROJECT_SOURCES += $(SCALAP_SOURCES) PROJECT_SOURCES += $(DTD2SCALA_SOURCES) -PROJECT_SOURCES += $(SCALAC4ANT_SOURCES) +PROJECT_SOURCES += $(SCALA4ANT_SOURCES) PROJECT_SOURCES += $(SCALATEST_SOURCES) # scala scripts wrapper @@ -134,12 +134,12 @@ DTD2SCALA_RSRC_FILES += $(filter %.xml,$(DTD2SCALA_SOURCES)) DTD2SCALA_RSRC_OUTPUTDIR = $(DTD2SCALA_ROOT:$(PROJECT_SOURCEDIR)/%=$(PROJECT_OUTPUTDIR)/%) # scala ant task -SCALAC4ANT_ROOT = $(PROJECT_SUPPORTDIR)/ant -SCALAC4ANT_LIST += src.java/scala/tools/scalac4ant/AntAdaptor.java -SCALAC4ANT_LIST += src.java/scala/tools/scalac4ant/AntTask.java -SCALAC4ANT_SOURCES += $(SCALAC4ANT_LIST:%=$(SCALAC4ANT_ROOT)/%) -SCALAC4ANT_JC_FILES += $(SCALAC4ANT_SOURCES) -SCALAC4ANT_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(ANT_JARFILE) +SCALA4ANT_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scala4ant +SCALA4ANT_LIST += AntAdaptor.java +SCALA4ANT_LIST += AntTask.java +SCALA4ANT_SOURCES += $(SCALA4ANT_LIST:%=$(SCALA4ANT_ROOT)/%) +SCALA4ANT_JC_FILES += $(SCALA4ANT_SOURCES) +SCALA4ANT_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(ANT_JARFILE) # scalatest SCALATEST_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scalatest @@ -153,8 +153,8 @@ TOOLS_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(TOOLS_NAME).jar TOOLS_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR) TOOLS_JAR_FILES += ch TOOLS_JAR_FILES += scala/tools/dtd2scala +TOOLS_JAR_FILES += scala/tools/scala4ant TOOLS_JAR_FILES += scala/tools/scalac -TOOLS_JAR_FILES += scala/tools/scalac4ant TOOLS_JAR_FILES += scala/tools/scaladoc TOOLS_JAR_FILES += scala/tools/scalai TOOLS_JAR_FILES += scala/tools/scalap @@ -181,7 +181,7 @@ all : interpreter all : scaladoc all : scalap all : dtd2scala -all : scalac4ant +all : scala4ant all : scalatest all : library-doc @@ -230,7 +230,7 @@ scaladoc : .latest-scaladoc-rsrc scalap : .latest-scalap-sc dtd2scala : .latest-dtd2scala-sc dtd2scala : .latest-dtd2scala-rsrc -scalac4ant : .latest-scalac4ant-jc +scala4ant : .latest-scala4ant-jc scalatest : .latest-scalatest-jc library-doc : .latest-library-sdc @@ -248,10 +248,9 @@ library-doc : .latest-library-sdc .PHONY : scaladoc .PHONY : scalap .PHONY : dtd2scala -.PHONY : scalac4ant +.PHONY : scala4ant .PHONY : scalatest .PHONY : library-doc -.PHONY : scalac4ant ############################################################################## # Commands - Version management @@ -380,8 +379,8 @@ cvs-fix-perms : $(DTD2SCALA_RSRC_OUTPUTDIR)) touch $@ -.latest-scalac4ant-jc : $(SCALAC4ANT_JC_FILES) - @$(make) jc target=SCALAC4ANT SCALAC4ANT_JC_FILES='$?' +.latest-scala4ant-jc : $(SCALA4ANT_JC_FILES) + @$(make) jc target=SCALA4ANT SCALA4ANT_JC_FILES='$?' touch $@ .latest-scalatest-jc : $(SCALATEST_JC_FILES) @@ -457,7 +456,7 @@ $(TOOLS_JAR_ARCHIVE) : .latest-scaladoc-rsrc $(TOOLS_JAR_ARCHIVE) : .latest-scalap-sc $(TOOLS_JAR_ARCHIVE) : .latest-dtd2scala-sc $(TOOLS_JAR_ARCHIVE) : .latest-dtd2scala-rsrc -$(TOOLS_JAR_ARCHIVE) : .latest-scalac4ant-jc +$(TOOLS_JAR_ARCHIVE) : .latest-scala4ant-jc $(TOOLS_JAR_ARCHIVE) : .latest-scalatest-jc $(TOOLS_JAR_ARCHIVE) : @$(MAKE) jar target=TOOLS |