diff options
-rw-r--r-- | Makefile | 29 | ||||
-rw-r--r-- | sources/scala/tools/scala4ant/AntAdaptor.java | 2 | ||||
-rw-r--r-- | sources/scala/tools/scala4ant/AntTask.java | 2 | ||||
-rw-r--r-- | support/ant/src.java/scala/tools/scalac4ant/AntAdaptor.java | 105 | ||||
-rw-r--r-- | support/ant/src.java/scala/tools/scalac4ant/AntTask.java | 139 |
5 files changed, 16 insertions, 261 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 diff --git a/sources/scala/tools/scala4ant/AntAdaptor.java b/sources/scala/tools/scala4ant/AntAdaptor.java index bb682cf815..bcd0b94c06 100644 --- a/sources/scala/tools/scala4ant/AntAdaptor.java +++ b/sources/scala/tools/scala4ant/AntAdaptor.java @@ -1,4 +1,4 @@ -package scala.tools.scalac4ant; +package scala.tools.scala4ant; import scalac.*; import scalac.util.Reporter; diff --git a/sources/scala/tools/scala4ant/AntTask.java b/sources/scala/tools/scala4ant/AntTask.java index 963cc5af17..2a9e83d336 100644 --- a/sources/scala/tools/scala4ant/AntTask.java +++ b/sources/scala/tools/scala4ant/AntTask.java @@ -1,4 +1,4 @@ -package scala.tools.scalac4ant; +package scala.tools.scala4ant; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/support/ant/src.java/scala/tools/scalac4ant/AntAdaptor.java b/support/ant/src.java/scala/tools/scalac4ant/AntAdaptor.java deleted file mode 100644 index bb682cf815..0000000000 --- a/support/ant/src.java/scala/tools/scalac4ant/AntAdaptor.java +++ /dev/null @@ -1,105 +0,0 @@ -package scala.tools.scalac4ant; - -import scalac.*; -import scalac.util.Reporter; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Execute; -import org.apache.tools.ant.taskdefs.Javac; -import org.apache.tools.ant.taskdefs.LogStreamHandler; -import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter; -import org.apache.tools.ant.types.Commandline; -import org.apache.tools.ant.types.Path; -import java.io.IOException; - - -/** a compiler adaptor for Scalac. - * - * author: Burak Emir - * adapted from package jaco.framework.ant.AntCompilerAdaptor - * (part of Matthias Zenger's jaco framework) - */ - -public class AntAdaptor extends DefaultCompilerAdapter { - - private String source; - private String target; - - public static final String PRODUCT = - System.getProperty("scala.product", "scalac"); - public static final String VERSION = - System.getProperty("scala.version", "unknown version"); - - - public boolean runCompiler(String[] args) { - // dirty work, to get rid of debugging (-g) option, set in setupJavac... - String[] nargs = new String[ args.length - 1 ]; - int j = 0; - for( int i = 0; i<args.length; i++ ) - if( !args[ i ].startsWith("-g") ) { - //System.err.print( args[ i ] +" ") - nargs[ j++ ] = args[ i ]; - } - // compile - Reporter reporter = new Reporter(); - CompilerCommand command = new CompilerCommand( - PRODUCT, VERSION, reporter, new CompilerPhases()); - if (command.parse(nargs) && command.files.list.size() > 0) { - Global global = new Global(command); - try { - global.compile(command.files.toArray(), false); - } catch (Throwable e) { - e.printStackTrace(); - //throw new BuildException(e.message()); - return false; - } - global.stop("total"); - global.reporter.printSummary(); - /* - PizzaSettings js = new PizzaSettings(); - js.parse(args); - return js.JavaContext().JavaCompiler().compile(); - */ - } - return true; - - } - - public String compilerName() { - return "scalac"; - } - - public void setJavac(Javac attributes) { - super.setJavac(attributes); - AntTask myattribs = (AntTask)attributes; - source = myattribs.getSource(); - target = myattribs.getTarget(); - } - - public boolean execute() throws BuildException { - attributes.log("Using " + compilerName() + " as scala compiler", - Project.MSG_VERBOSE); - return runCompiler(setupScalacCommand().getArguments()); - } - - public Commandline setupScalacCommand() { - Commandline cmd = new Commandline(); - setupJavacCommandlineSwitches(cmd); - //setupScalacCommandlineSwitches(cmd); - logAndAddFilesToCompile(cmd); - return cmd; - } - /* - public void setupScalacCommandlineSwitches(Commandline cmd) { - if (source != null) { - cmd.createArgument().setValue("-source"); - cmd.createArgument().setValue(source); - } - if (target != null) { - cmd.createArgument().setValue("-target"); - cmd.createArgument().setValue(target); - } - } - */ -} diff --git a/support/ant/src.java/scala/tools/scalac4ant/AntTask.java b/support/ant/src.java/scala/tools/scalac4ant/AntTask.java deleted file mode 100644 index 963cc5af17..0000000000 --- a/support/ant/src.java/scala/tools/scalac4ant/AntTask.java +++ /dev/null @@ -1,139 +0,0 @@ -package scala.tools.scalac4ant; - -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Javac; -import org.apache.tools.ant.util.*; -import java.io.File; -import java.util.*; - - -/** Scala AntTask. - * - * author: Burak Emir - * adapted from package jaco.framework.ant.AntCompilerTask - * (part of Matthias Zenger's jaco framework) - * - * $Id$ - */ - - -public class AntTask extends Javac { - - private String suffixes = "scala"; - private boolean force = false; - private String source = null; - private String target = null; - private FileUtils fileUtils = FileUtils.newFileUtils(); - - public void execute() { - Project project = getProject(); - String old = project.getProperty("build.compiler"); - project.setProperty("build.compiler", "scala.tools.scalac4ant.AntAdaptor"); - super.execute(); - if (old == null) - project.setProperty("build.compiler", "modern"); - else - project.setProperty("build.compiler", old); - } - - public void setForce(boolean fc) { - force = fc; - } - - public boolean getForce() { - return force; - } - - public void setSource(String source) { - this.source = source; - } - - public String getSource() { - return source; - } - - public void setTarget(String target) { - this.target = target; - } - - public String getTarget() { - return target; - } - - public void setSuffixes(String s) { - suffixes = s; - } - - public String getSuffixes() { - return suffixes; - } - - public void setScalaClasspath(String s) { - System.setProperty("scala.class.path",s); - } - public String getScalaClasspath() { - return System.getProperty("scala.class.path"); - } - public void setScalaBootClasspath(String s) { - System.setProperty("scala.boot.class.path",s); - } - public String getScalaBootClasspath() { - return System.getProperty("scala.boot.class.path"); - } - - protected String[] parseSuffixes() { - StringTokenizer st = new StringTokenizer(suffixes, " ,"); - ArrayList al = new ArrayList(); - while (st.hasMoreTokens()) - al.add("." + st.nextToken()); - return (String[])al.toArray(new String[al.size()]); - } - - private static boolean hasLegalSuffix(String[] suffixes, String file) { - for (int i = 0; i < suffixes.length; i++) - if (file.endsWith(suffixes[i])) - return true; - return false; - } - - protected void scanDir(File srcDir, File destDir, String files[]) { - String[] sfx = parseSuffixes(); - if (force) { - File[] newCompileList = new File[compileList.length + files.length]; - System.arraycopy(compileList, 0, newCompileList, 0, compileList.length); - int j = 0; - for (int i = 0; i < files.length; i++) - if (hasLegalSuffix(sfx, files[i])) { - if (srcDir == null) - newCompileList[compileList.length + (j++)] = new File(files[i]); - else - newCompileList[compileList.length + (j++)] = - fileUtils.resolveFile(srcDir, files[i]); - } - if (j == files.length) - compileList = newCompileList; - else { - compileList = new File[j]; - System.arraycopy(newCompileList, 0, compileList, 0, j); - } - } else { - GlobPatternMapper m = new GlobPatternMapper(); - for (int i = 0; i < sfx.length; i++) { - m.setFrom("*" + sfx[i]); - m.setTo("*.class"); - SourceFileScanner sfs = new SourceFileScanner(this); - File[] newFiles = sfs.restrictAsFiles(files, srcDir, destDir, m); - if (newFiles.length > 0) { - File[] newCompileList = new File[compileList.length + - newFiles.length]; - System.arraycopy(compileList, 0, newCompileList, 0, - compileList.length); - System.arraycopy(newFiles, 0, newCompileList, - compileList.length, newFiles.length); - compileList = newCompileList; - } - } - } - } -} |