diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-23 14:27:42 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-23 14:27:42 -0400 |
commit | fad0bf216e196c78fdabc19227435d5e5e593a67 (patch) | |
tree | 67d312f4a7f4eede8fe719cae12b83c60ae64fb0 | |
parent | d3bb612195dbaa8996ff98187cd51452a5f72f6c (diff) | |
download | scala-fad0bf216e196c78fdabc19227435d5e5e593a67.tar.gz scala-fad0bf216e196c78fdabc19227435d5e5e593a67.tar.bz2 scala-fad0bf216e196c78fdabc19227435d5e5e593a67.zip |
ASM now compiled once in the build.
* Moved ASM sources to src/asm
* New ant task builds asm *ONCE*. Build times improve by a few seconds
* Fixed SBT build for new asm location. SBT build still broken from actors-migration and partest
Review by @magarciaEPFL
-rw-r--r-- | build.xml | 85 | ||||
-rw-r--r-- | project/Build.scala | 12 | ||||
-rw-r--r-- | project/Layers.scala | 15 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/AnnotationVisitor.java (renamed from src/compiler/scala/tools/asm/AnnotationVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/AnnotationWriter.java (renamed from src/compiler/scala/tools/asm/AnnotationWriter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Attribute.java (renamed from src/compiler/scala/tools/asm/Attribute.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/ByteVector.java (renamed from src/compiler/scala/tools/asm/ByteVector.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/ClassReader.java (renamed from src/compiler/scala/tools/asm/ClassReader.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/ClassVisitor.java (renamed from src/compiler/scala/tools/asm/ClassVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/ClassWriter.java (renamed from src/compiler/scala/tools/asm/ClassWriter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/CustomAttr.java (renamed from src/compiler/scala/tools/asm/CustomAttr.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Edge.java (renamed from src/compiler/scala/tools/asm/Edge.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/FieldVisitor.java (renamed from src/compiler/scala/tools/asm/FieldVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/FieldWriter.java (renamed from src/compiler/scala/tools/asm/FieldWriter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Frame.java (renamed from src/compiler/scala/tools/asm/Frame.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Handle.java (renamed from src/compiler/scala/tools/asm/Handle.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Handler.java (renamed from src/compiler/scala/tools/asm/Handler.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Item.java (renamed from src/compiler/scala/tools/asm/Item.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Label.java (renamed from src/compiler/scala/tools/asm/Label.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/MethodVisitor.java (renamed from src/compiler/scala/tools/asm/MethodVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/MethodWriter.java (renamed from src/compiler/scala/tools/asm/MethodWriter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Opcodes.java (renamed from src/compiler/scala/tools/asm/Opcodes.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/Type.java (renamed from src/compiler/scala/tools/asm/Type.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/signature/SignatureReader.java (renamed from src/compiler/scala/tools/asm/signature/SignatureReader.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/signature/SignatureVisitor.java (renamed from src/compiler/scala/tools/asm/signature/SignatureVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/signature/SignatureWriter.java (renamed from src/compiler/scala/tools/asm/signature/SignatureWriter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/AbstractInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/AbstractInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/AnnotationNode.java (renamed from src/compiler/scala/tools/asm/tree/AnnotationNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/ClassNode.java (renamed from src/compiler/scala/tools/asm/tree/ClassNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/FieldInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/FieldInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/FieldNode.java (renamed from src/compiler/scala/tools/asm/tree/FieldNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/FrameNode.java (renamed from src/compiler/scala/tools/asm/tree/FrameNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/IincInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/IincInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/InnerClassNode.java (renamed from src/compiler/scala/tools/asm/tree/InnerClassNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/InsnList.java (renamed from src/compiler/scala/tools/asm/tree/InsnList.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/InsnNode.java (renamed from src/compiler/scala/tools/asm/tree/InsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/IntInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/IntInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/InvokeDynamicInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/InvokeDynamicInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/JumpInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/JumpInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/LabelNode.java (renamed from src/compiler/scala/tools/asm/tree/LabelNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/LdcInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/LdcInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/LineNumberNode.java (renamed from src/compiler/scala/tools/asm/tree/LineNumberNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/LocalVariableNode.java (renamed from src/compiler/scala/tools/asm/tree/LocalVariableNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/LookupSwitchInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/LookupSwitchInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/MethodInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/MethodInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/MethodNode.java (renamed from src/compiler/scala/tools/asm/tree/MethodNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/MultiANewArrayInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/MultiANewArrayInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/TableSwitchInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/TableSwitchInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/TryCatchBlockNode.java (renamed from src/compiler/scala/tools/asm/tree/TryCatchBlockNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/TypeInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/TypeInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/VarInsnNode.java (renamed from src/compiler/scala/tools/asm/tree/VarInsnNode.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/Analyzer.java (renamed from src/compiler/scala/tools/asm/tree/analysis/Analyzer.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/AnalyzerException.java (renamed from src/compiler/scala/tools/asm/tree/analysis/AnalyzerException.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/BasicInterpreter.java (renamed from src/compiler/scala/tools/asm/tree/analysis/BasicInterpreter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/BasicValue.java (renamed from src/compiler/scala/tools/asm/tree/analysis/BasicValue.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/BasicVerifier.java (renamed from src/compiler/scala/tools/asm/tree/analysis/BasicVerifier.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/Frame.java (renamed from src/compiler/scala/tools/asm/tree/analysis/Frame.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/Interpreter.java (renamed from src/compiler/scala/tools/asm/tree/analysis/Interpreter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/SimpleVerifier.java (renamed from src/compiler/scala/tools/asm/tree/analysis/SimpleVerifier.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/SmallSet.java (renamed from src/compiler/scala/tools/asm/tree/analysis/SmallSet.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/SourceInterpreter.java (renamed from src/compiler/scala/tools/asm/tree/analysis/SourceInterpreter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/SourceValue.java (renamed from src/compiler/scala/tools/asm/tree/analysis/SourceValue.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/Subroutine.java (renamed from src/compiler/scala/tools/asm/tree/analysis/Subroutine.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/tree/analysis/Value.java (renamed from src/compiler/scala/tools/asm/tree/analysis/Value.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/ASMifiable.java (renamed from src/compiler/scala/tools/asm/util/ASMifiable.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/ASMifier.java (renamed from src/compiler/scala/tools/asm/util/ASMifier.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/CheckAnnotationAdapter.java (renamed from src/compiler/scala/tools/asm/util/CheckAnnotationAdapter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/CheckClassAdapter.java (renamed from src/compiler/scala/tools/asm/util/CheckClassAdapter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/CheckFieldAdapter.java (renamed from src/compiler/scala/tools/asm/util/CheckFieldAdapter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/CheckMethodAdapter.java (renamed from src/compiler/scala/tools/asm/util/CheckMethodAdapter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/CheckSignatureAdapter.java (renamed from src/compiler/scala/tools/asm/util/CheckSignatureAdapter.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/Printer.java (renamed from src/compiler/scala/tools/asm/util/Printer.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/SignatureChecker.java (renamed from src/compiler/scala/tools/asm/util/SignatureChecker.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/Textifiable.java (renamed from src/compiler/scala/tools/asm/util/Textifiable.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/Textifier.java (renamed from src/compiler/scala/tools/asm/util/Textifier.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/TraceAnnotationVisitor.java (renamed from src/compiler/scala/tools/asm/util/TraceAnnotationVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/TraceClassVisitor.java (renamed from src/compiler/scala/tools/asm/util/TraceClassVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/TraceFieldVisitor.java (renamed from src/compiler/scala/tools/asm/util/TraceFieldVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/TraceMethodVisitor.java (renamed from src/compiler/scala/tools/asm/util/TraceMethodVisitor.java) | 0 | ||||
-rw-r--r-- | src/asm/scala/tools/asm/util/TraceSignatureVisitor.java (renamed from src/compiler/scala/tools/asm/util/TraceSignatureVisitor.java) | 0 |
80 files changed, 58 insertions, 54 deletions
@@ -182,6 +182,7 @@ PROPERTIES <!-- Sets location of build folders --> <property name="build.dir" value="${basedir}/build"/> + <property name="build-asm.dir" value="${build.dir}/asm"/> <property name="build-locker.dir" value="${build.dir}/locker"/> <property name="build-palo.dir" value="${build.dir}/palo"/> <property name="build-quick.dir" value="${build.dir}/quick"/> @@ -413,10 +414,43 @@ INITIALISATION </target> <!-- =========================================================================== +LOCAL Adapted ASM +============================================================================ --> + + <target name="asm.start" depends="init"> + <condition property="asm.available"> + <available file="${build-asm.dir}/asm.complete"/> + </condition> + </target> + + <target name="asm.lib" depends="asm.start" unless="asm.available"> + <stopwatch name="asm.lib.timer"/> + <mkdir dir="${build-asm.dir}/classes/"/> + <javac + srcdir="${src.dir}/asm" + destdir="${build-asm.dir}/classes" + classpath="${build-asm.dir}/classes" + includes="**/*.java" + target="1.5" source="1.5"> + <compilerarg line="${javac.args} -XDignore.symbol.file"/> + </javac> + <touch file="${build-asm.dir}/asm.complete" verbose="no"/> + <stopwatch name="asm.lib.timer" action="total"/> + </target> + + + <target name="asm.done" depends="asm.lib"> + <path id="asm.classpath"> + <pathelement location="${build-asm.dir}/classes/"/> + </path> + </target> + + +<!-- =========================================================================== LOCAL REFERENCE BUILD (LOCKER) ============================================================================ --> - <target name="locker.start" depends="init"> + <target name="locker.start" depends="asm.done"> <condition property="locker.available"> <available file="${build-locker.dir}/all.complete"/> </condition> @@ -482,20 +516,6 @@ LOCAL REFERENCE BUILD (LOCKER) <target name="locker.comp" depends="locker.pre-comp" if="locker.comp.needed"> <stopwatch name="locker.comp.timer"/> <mkdir dir="${build-locker.dir}/classes/compiler"/> - <!-- TODO If we have cross dependencies, move this below scalacfork... --> - <javac - srcdir="${src.dir}/compiler" - destdir="${build-locker.dir}/classes/compiler" - includes="**/*.java" - target="1.5" source="1.5"> - <compilerarg line="${javac.args}"/> - <classpath> - <pathelement location="${build-locker.dir}/classes/library"/> - <pathelement location="${build-locker.dir}/classes/compiler"/> - <path refid="aux.libs"/> - <pathelement location="${jline.jar}"/> - </classpath> - </javac> <scalacfork destdir="${build-locker.dir}/classes/compiler" compilerpathref="starr.classpath" @@ -507,6 +527,7 @@ LOCAL REFERENCE BUILD (LOCKER) <pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/compiler"/> <path refid="aux.libs"/> + <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> </compilationpath> </scalacfork> @@ -538,11 +559,13 @@ LOCAL REFERENCE BUILD (LOCKER) <path id="locker.classpath"> <pathelement location="${build-locker.dir}/classes/library"/> <pathelement location="${build-locker.dir}/classes/compiler"/> + <path refid="asm.classpath"/> <path refid="aux.libs"/> </path> <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> + <path refid="asm.classpath"/> <path refid="aux.libs"/> </path> </target> @@ -610,6 +633,7 @@ PACKED LOCKER BUILD (PALO) <mkdir dir="${build-palo.dir}/lib"/> <jar destfile="${build-palo.dir}/lib/scala-compiler.jar" manifest="${basedir}/META-INF/MANIFEST.MF"> <fileset dir="${build-locker.dir}/classes/compiler"/> + <fileset dir="${build-asm.dir}/classes/"/> <!-- filemode / dirmode: see trac ticket #1294 --> <zipfileset dirmode="755" filemode="644" src="${lib.dir}/fjbg.jar"/> <zipfileset dirmode="755" filemode="644" src="${lib.dir}/msil.jar"/> @@ -781,20 +805,6 @@ QUICK BUILD (QUICK) <target name="quick.comp" depends="quick.pre-comp" unless="quick.comp.available"> <stopwatch name="quick.comp.timer"/> <mkdir dir="${build-quick.dir}/classes/compiler"/> - <!-- TODO If we have cross dependencies, move this below scalacfork... --> - <javac - srcdir="${src.dir}/compiler" - destdir="${build-quick.dir}/classes/compiler" - includes="**/*.java" - target="1.5" source="1.5"> - <compilerarg line="${javac.args}"/> - <classpath> - <pathelement location="${build-quick.dir}/classes/library"/> - <pathelement location="${build-quick.dir}/classes/compiler"/> - <path refid="aux.libs"/> - <pathelement location="${jline.jar}"/> - </classpath> - </javac> <scalacfork destdir="${build-quick.dir}/classes/compiler" compilerpathref="locker.classpath" @@ -806,6 +816,7 @@ QUICK BUILD (QUICK) <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> <path refid="aux.libs"/> + <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> </compilationpath> </scalacfork> @@ -1064,6 +1075,7 @@ QUICK BUILD (QUICK) <path id="quick.classpath"> <pathelement location="${build-quick.dir}/classes/library"/> <pathelement location="${build-quick.dir}/classes/compiler"/> + <path refid="asm.classpath"/> <path refid="aux.libs"/> </path> </target> @@ -1130,6 +1142,7 @@ PACKED QUICK BUILD (PACK) <mkdir dir="${build-pack.dir}/lib"/> <jar destfile="${build-pack.dir}/lib/scala-compiler.jar" manifest="${build-pack.dir}/META-INF/MANIFEST.MF"> <fileset dir="${build-quick.dir}/classes/compiler"/> + <fileset dir="${build-asm.dir}/classes"/> <!-- filemode / dirmode: see trac ticket #1294 --> <zipfileset dirmode="755" filemode="644" src="${fjbg.jar}"/> <zipfileset dirmode="755" filemode="644" src="${msil.jar}"/> @@ -1346,19 +1359,6 @@ BOOTSTRAPPING BUILD (STRAP) <stopwatch name="strap.comp.timer"/> <mkdir dir="${build-strap.dir}/classes/compiler"/> <!-- TODO If we have cross dependencies, move this below scalacfork... --> - <javac - srcdir="${src.dir}/compiler" - destdir="${build-strap.dir}/classes/compiler" - includes="**/*.java" - target="1.5" source="1.5"> - <compilerarg line="${javac.args}"/> - <classpath> - <pathelement location="${build-strap.dir}/classes/library"/> - <pathelement location="${build-strap.dir}/classes/compiler"/> - <path refid="aux.libs"/> - <pathelement location="${jline.jar}"/> - </classpath> - </javac> <scalacfork destdir="${build-strap.dir}/classes/compiler" compilerpathref="pack.classpath" @@ -1370,6 +1370,7 @@ BOOTSTRAPPING BUILD (STRAP) <pathelement location="${build-strap.dir}/classes/library"/> <pathelement location="${build-strap.dir}/classes/compiler"/> <path refid="aux.libs"/> + <path refid="asm.classpath"/> <pathelement location="${jline.jar}"/> </compilationpath> </scalacfork> diff --git a/project/Build.scala b/project/Build.scala index d3be8cd810..0cc0c5c5d7 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -184,6 +184,8 @@ object ScalaBuild extends Build with Layers { lazy val jline = Project("jline", file("src/jline")) // Fast Java Bytecode Generator (nested in every scala-compiler.jar) lazy val fjbg = Project("fjbg", file(".")) settings(settingOverrides : _*) + // Our wrapped version of msil. + lazy val asm = Project("asm", file(".")) settings(settingOverrides : _*) // Forkjoin backport lazy val forkjoin = Project("forkjoin", file(".")) settings(settingOverrides : _*) @@ -208,11 +210,11 @@ object ScalaBuild extends Build with Layers { lazy val locker = Project("locker", file(".")) aggregate(lockerLib, lockerComp) // Quick is the general purpose project layer for the Scala compiler. - lazy val (quickLib, quickComp) = makeLayer("quick", makeScalaReference("locker", lockerLib, lockerComp, fjbg)) + lazy val (quickLib, quickComp) = makeLayer("quick", makeScalaReference("locker", lockerLib, lockerComp)) lazy val quick = Project("quick", file(".")) aggregate(quickLib, quickComp) // Reference to quick scala instance. - lazy val quickScalaInstance = makeScalaReference("quick", quickLib, quickComp, fjbg) + lazy val quickScalaInstance = makeScalaReference("quick", quickLib, quickComp) def quickScalaLibraryDependency = unmanagedClasspath in Compile <++= (exportedProducts in quickLib in Compile).identity def quickScalaCompilerDependency = unmanagedClasspath in Compile <++= (exportedProducts in quickComp in Compile).identity @@ -312,7 +314,7 @@ object ScalaBuild extends Build with Layers { // -------------------------------------------------------------- // Real Compiler Artifact // -------------------------------------------------------------- - lazy val packageScalaBinTask = Seq(quickComp, fjbg).map(p => products in p in Compile).join.map(_.flatten).map(productTaskToMapping) + lazy val packageScalaBinTask = Seq(quickComp, fjbg, asm).map(p => products in p in Compile).join.map(_.flatten).map(productTaskToMapping) lazy val scalaBinArtifactSettings : Seq[Setting[_]] = inConfig(Compile)(Defaults.packageTasks(packageBin, packageScalaBinTask)) ++ Seq( name := "scala-compiler", crossPaths := false, @@ -324,7 +326,7 @@ object ScalaBuild extends Build with Layers { target <<= (baseDirectory, name) apply (_ / "target" / _) ) lazy val scalaCompiler = Project("scala-compiler", file(".")) settings(publishSettings:_*) settings(scalaBinArtifactSettings:_*) dependsOn(scalaLibrary) - lazy val fullQuickScalaReference = makeScalaReference("pack", scalaLibrary, scalaCompiler, fjbg) + lazy val fullQuickScalaReference = makeScalaReference("pack", scalaLibrary, scalaCompiler) // -------------------------------------------------------------- // Testing @@ -368,7 +370,7 @@ object ScalaBuild extends Build with Layers { // TODO - Migrate this into the dist project. // Scaladocs - def distScalaInstance = makeScalaReference("dist", scalaLibrary, scalaCompiler, fjbg) + def distScalaInstance = makeScalaReference("dist", scalaLibrary, scalaCompiler) lazy val documentationSettings: Seq[Setting[_]] = dependentProjectSettings ++ Seq( // TODO - Make these work for realz. defaultExcludes in unmanagedSources in Compile := ((".*" - ".") || HiddenFileFilter || diff --git a/project/Layers.scala b/project/Layers.scala index 3d6d780f8f..58fcb1b254 100644 --- a/project/Layers.scala +++ b/project/Layers.scala @@ -14,6 +14,8 @@ trait Layers extends Build { def forkjoin: Project /** Reference to Fast-Java-Bytecode-Generator library */ def fjbg: Project + /** Reference to the ASM wrapped project. */ + def asm: Project /** A setting that adds some external dependencies. */ def externalDeps: Setting[_] /** The root project. */ @@ -22,14 +24,15 @@ trait Layers extends Build { /** Creates a reference Scala version that can be used to build other projects. This takes in the raw * library, compiler and fjbg libraries as well as a string representing the layer name (used for compiling the compile-interface). */ - def makeScalaReference(layer : String, library: Project, compiler: Project, fjbg: Project) = + def makeScalaReference(layer : String, library: Project, compiler: Project) = scalaInstance <<= (appConfiguration in library, version in library, (exportedProducts in library in Compile), (exportedProducts in compiler in Compile), (exportedProducts in fjbg in Compile), - (fullClasspath in jline in Runtime)) map { - (app, version: String, lib: Classpath, comp: Classpath, fjbg: Classpath, jline: Classpath) => + (fullClasspath in jline in Runtime), + (exportedProducts in asm in Runtime)) map { + (app, version: String, lib: Classpath, comp: Classpath, fjbg: Classpath, jline: Classpath, asm: Classpath) => val launcher = app.provider.scalaProvider.launcher (lib,comp) match { case (Seq(libraryJar), Seq(compilerJar)) => @@ -38,7 +41,7 @@ trait Layers extends Build { libraryJar.data, compilerJar.data, launcher, - ((fjbg.files++jline.files):_*)) + ((fjbg.files++jline.files ++ asm.files):_*)) case _ => error("Cannot build a ScalaReference with more than one classpath element") } } @@ -58,7 +61,6 @@ trait Layers extends Build { defaultExcludes in unmanagedResources := ("*.scala" | "*.java" | "*.disabled"), // TODO - Allow other scalac option settings. scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)), - classpathOptions := ClasspathOptions.manual, resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("library.properties"), referenceScala ) @@ -80,8 +82,7 @@ trait Layers extends Build { dirs.descendentsExcept( ("*.xml" | "*.html" | "*.gif" | "*.png" | "*.js" | "*.css" | "*.tmpl" | "*.swf" | "*.properties" | "*.txt"),"*.scala").get }, // TODO - Use depends on *and* SBT's magic dependency mechanisms... - unmanagedClasspath in Compile <<= Seq(forkjoin, library, fjbg, jline).map(exportedProducts in Compile in _).join.map(_.flatten), - classpathOptions := ClasspathOptions.manual, + unmanagedClasspath in Compile <<= Seq(forkjoin, library, fjbg, jline, asm).map(exportedProducts in Compile in _).join.map(_.flatten), externalDeps, referenceScala ) diff --git a/src/compiler/scala/tools/asm/AnnotationVisitor.java b/src/asm/scala/tools/asm/AnnotationVisitor.java index b96e730a73..b96e730a73 100644 --- a/src/compiler/scala/tools/asm/AnnotationVisitor.java +++ b/src/asm/scala/tools/asm/AnnotationVisitor.java diff --git a/src/compiler/scala/tools/asm/AnnotationWriter.java b/src/asm/scala/tools/asm/AnnotationWriter.java index e530780249..e530780249 100644 --- a/src/compiler/scala/tools/asm/AnnotationWriter.java +++ b/src/asm/scala/tools/asm/AnnotationWriter.java diff --git a/src/compiler/scala/tools/asm/Attribute.java b/src/asm/scala/tools/asm/Attribute.java index 408f21ce1e..408f21ce1e 100644 --- a/src/compiler/scala/tools/asm/Attribute.java +++ b/src/asm/scala/tools/asm/Attribute.java diff --git a/src/compiler/scala/tools/asm/ByteVector.java b/src/asm/scala/tools/asm/ByteVector.java index 5081f0184b..5081f0184b 100644 --- a/src/compiler/scala/tools/asm/ByteVector.java +++ b/src/asm/scala/tools/asm/ByteVector.java diff --git a/src/compiler/scala/tools/asm/ClassReader.java b/src/asm/scala/tools/asm/ClassReader.java index f3287d41ae..f3287d41ae 100644 --- a/src/compiler/scala/tools/asm/ClassReader.java +++ b/src/asm/scala/tools/asm/ClassReader.java diff --git a/src/compiler/scala/tools/asm/ClassVisitor.java b/src/asm/scala/tools/asm/ClassVisitor.java index ae38ae0ab9..ae38ae0ab9 100644 --- a/src/compiler/scala/tools/asm/ClassVisitor.java +++ b/src/asm/scala/tools/asm/ClassVisitor.java diff --git a/src/compiler/scala/tools/asm/ClassWriter.java b/src/asm/scala/tools/asm/ClassWriter.java index c7a0736b51..c7a0736b51 100644 --- a/src/compiler/scala/tools/asm/ClassWriter.java +++ b/src/asm/scala/tools/asm/ClassWriter.java diff --git a/src/compiler/scala/tools/asm/CustomAttr.java b/src/asm/scala/tools/asm/CustomAttr.java index 5ecfd283d0..5ecfd283d0 100644 --- a/src/compiler/scala/tools/asm/CustomAttr.java +++ b/src/asm/scala/tools/asm/CustomAttr.java diff --git a/src/compiler/scala/tools/asm/Edge.java b/src/asm/scala/tools/asm/Edge.java index daac1f7bb0..daac1f7bb0 100644 --- a/src/compiler/scala/tools/asm/Edge.java +++ b/src/asm/scala/tools/asm/Edge.java diff --git a/src/compiler/scala/tools/asm/FieldVisitor.java b/src/asm/scala/tools/asm/FieldVisitor.java index 9ac0f6236f..9ac0f6236f 100644 --- a/src/compiler/scala/tools/asm/FieldVisitor.java +++ b/src/asm/scala/tools/asm/FieldVisitor.java diff --git a/src/compiler/scala/tools/asm/FieldWriter.java b/src/asm/scala/tools/asm/FieldWriter.java index 45ef6d0df3..45ef6d0df3 100644 --- a/src/compiler/scala/tools/asm/FieldWriter.java +++ b/src/asm/scala/tools/asm/FieldWriter.java diff --git a/src/compiler/scala/tools/asm/Frame.java b/src/asm/scala/tools/asm/Frame.java index 387b56796d..387b56796d 100644 --- a/src/compiler/scala/tools/asm/Frame.java +++ b/src/asm/scala/tools/asm/Frame.java diff --git a/src/compiler/scala/tools/asm/Handle.java b/src/asm/scala/tools/asm/Handle.java index be8f334192..be8f334192 100644 --- a/src/compiler/scala/tools/asm/Handle.java +++ b/src/asm/scala/tools/asm/Handle.java diff --git a/src/compiler/scala/tools/asm/Handler.java b/src/asm/scala/tools/asm/Handler.java index 9e92bb98be..9e92bb98be 100644 --- a/src/compiler/scala/tools/asm/Handler.java +++ b/src/asm/scala/tools/asm/Handler.java diff --git a/src/compiler/scala/tools/asm/Item.java b/src/asm/scala/tools/asm/Item.java index 021a0b11d3..021a0b11d3 100644 --- a/src/compiler/scala/tools/asm/Item.java +++ b/src/asm/scala/tools/asm/Item.java diff --git a/src/compiler/scala/tools/asm/Label.java b/src/asm/scala/tools/asm/Label.java index 712c7f251f..712c7f251f 100644 --- a/src/compiler/scala/tools/asm/Label.java +++ b/src/asm/scala/tools/asm/Label.java diff --git a/src/compiler/scala/tools/asm/MethodVisitor.java b/src/asm/scala/tools/asm/MethodVisitor.java index a8a859a6a9..a8a859a6a9 100644 --- a/src/compiler/scala/tools/asm/MethodVisitor.java +++ b/src/asm/scala/tools/asm/MethodVisitor.java diff --git a/src/compiler/scala/tools/asm/MethodWriter.java b/src/asm/scala/tools/asm/MethodWriter.java index 321bacb6fc..321bacb6fc 100644 --- a/src/compiler/scala/tools/asm/MethodWriter.java +++ b/src/asm/scala/tools/asm/MethodWriter.java diff --git a/src/compiler/scala/tools/asm/Opcodes.java b/src/asm/scala/tools/asm/Opcodes.java index 809e5ae590..809e5ae590 100644 --- a/src/compiler/scala/tools/asm/Opcodes.java +++ b/src/asm/scala/tools/asm/Opcodes.java diff --git a/src/compiler/scala/tools/asm/Type.java b/src/asm/scala/tools/asm/Type.java index bf1107182a..bf1107182a 100644 --- a/src/compiler/scala/tools/asm/Type.java +++ b/src/asm/scala/tools/asm/Type.java diff --git a/src/compiler/scala/tools/asm/signature/SignatureReader.java b/src/asm/scala/tools/asm/signature/SignatureReader.java index 22e6427e63..22e6427e63 100644 --- a/src/compiler/scala/tools/asm/signature/SignatureReader.java +++ b/src/asm/scala/tools/asm/signature/SignatureReader.java diff --git a/src/compiler/scala/tools/asm/signature/SignatureVisitor.java b/src/asm/scala/tools/asm/signature/SignatureVisitor.java index 2fc364e374..2fc364e374 100644 --- a/src/compiler/scala/tools/asm/signature/SignatureVisitor.java +++ b/src/asm/scala/tools/asm/signature/SignatureVisitor.java diff --git a/src/compiler/scala/tools/asm/signature/SignatureWriter.java b/src/asm/scala/tools/asm/signature/SignatureWriter.java index a59fdfde2b..a59fdfde2b 100644 --- a/src/compiler/scala/tools/asm/signature/SignatureWriter.java +++ b/src/asm/scala/tools/asm/signature/SignatureWriter.java diff --git a/src/compiler/scala/tools/asm/tree/AbstractInsnNode.java b/src/asm/scala/tools/asm/tree/AbstractInsnNode.java index 471f842ffc..471f842ffc 100644 --- a/src/compiler/scala/tools/asm/tree/AbstractInsnNode.java +++ b/src/asm/scala/tools/asm/tree/AbstractInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/AnnotationNode.java b/src/asm/scala/tools/asm/tree/AnnotationNode.java index 9f132550e6..9f132550e6 100644 --- a/src/compiler/scala/tools/asm/tree/AnnotationNode.java +++ b/src/asm/scala/tools/asm/tree/AnnotationNode.java diff --git a/src/compiler/scala/tools/asm/tree/ClassNode.java b/src/asm/scala/tools/asm/tree/ClassNode.java index 64effae698..64effae698 100644 --- a/src/compiler/scala/tools/asm/tree/ClassNode.java +++ b/src/asm/scala/tools/asm/tree/ClassNode.java diff --git a/src/compiler/scala/tools/asm/tree/FieldInsnNode.java b/src/asm/scala/tools/asm/tree/FieldInsnNode.java index 6b7a6a142a..6b7a6a142a 100644 --- a/src/compiler/scala/tools/asm/tree/FieldInsnNode.java +++ b/src/asm/scala/tools/asm/tree/FieldInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/FieldNode.java b/src/asm/scala/tools/asm/tree/FieldNode.java index 9a1e17033c..9a1e17033c 100644 --- a/src/compiler/scala/tools/asm/tree/FieldNode.java +++ b/src/asm/scala/tools/asm/tree/FieldNode.java diff --git a/src/compiler/scala/tools/asm/tree/FrameNode.java b/src/asm/scala/tools/asm/tree/FrameNode.java index 66825de0ac..66825de0ac 100644 --- a/src/compiler/scala/tools/asm/tree/FrameNode.java +++ b/src/asm/scala/tools/asm/tree/FrameNode.java diff --git a/src/compiler/scala/tools/asm/tree/IincInsnNode.java b/src/asm/scala/tools/asm/tree/IincInsnNode.java index 75ac40884d..75ac40884d 100644 --- a/src/compiler/scala/tools/asm/tree/IincInsnNode.java +++ b/src/asm/scala/tools/asm/tree/IincInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/InnerClassNode.java b/src/asm/scala/tools/asm/tree/InnerClassNode.java index 4579488921..4579488921 100644 --- a/src/compiler/scala/tools/asm/tree/InnerClassNode.java +++ b/src/asm/scala/tools/asm/tree/InnerClassNode.java diff --git a/src/compiler/scala/tools/asm/tree/InsnList.java b/src/asm/scala/tools/asm/tree/InsnList.java index dedd3bba73..dedd3bba73 100644 --- a/src/compiler/scala/tools/asm/tree/InsnList.java +++ b/src/asm/scala/tools/asm/tree/InsnList.java diff --git a/src/compiler/scala/tools/asm/tree/InsnNode.java b/src/asm/scala/tools/asm/tree/InsnNode.java index d4664d23c2..d4664d23c2 100644 --- a/src/compiler/scala/tools/asm/tree/InsnNode.java +++ b/src/asm/scala/tools/asm/tree/InsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/IntInsnNode.java b/src/asm/scala/tools/asm/tree/IntInsnNode.java index b61270c786..b61270c786 100644 --- a/src/compiler/scala/tools/asm/tree/IntInsnNode.java +++ b/src/asm/scala/tools/asm/tree/IntInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/InvokeDynamicInsnNode.java b/src/asm/scala/tools/asm/tree/InvokeDynamicInsnNode.java index d993b5a054..d993b5a054 100644 --- a/src/compiler/scala/tools/asm/tree/InvokeDynamicInsnNode.java +++ b/src/asm/scala/tools/asm/tree/InvokeDynamicInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/JumpInsnNode.java b/src/asm/scala/tools/asm/tree/JumpInsnNode.java index 339ebbd2d0..339ebbd2d0 100644 --- a/src/compiler/scala/tools/asm/tree/JumpInsnNode.java +++ b/src/asm/scala/tools/asm/tree/JumpInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/LabelNode.java b/src/asm/scala/tools/asm/tree/LabelNode.java index 523a8d6442..523a8d6442 100644 --- a/src/compiler/scala/tools/asm/tree/LabelNode.java +++ b/src/asm/scala/tools/asm/tree/LabelNode.java diff --git a/src/compiler/scala/tools/asm/tree/LdcInsnNode.java b/src/asm/scala/tools/asm/tree/LdcInsnNode.java index f8d115acd5..f8d115acd5 100644 --- a/src/compiler/scala/tools/asm/tree/LdcInsnNode.java +++ b/src/asm/scala/tools/asm/tree/LdcInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/LineNumberNode.java b/src/asm/scala/tools/asm/tree/LineNumberNode.java index acc83c8d30..acc83c8d30 100644 --- a/src/compiler/scala/tools/asm/tree/LineNumberNode.java +++ b/src/asm/scala/tools/asm/tree/LineNumberNode.java diff --git a/src/compiler/scala/tools/asm/tree/LocalVariableNode.java b/src/asm/scala/tools/asm/tree/LocalVariableNode.java index 51cbd3ca00..51cbd3ca00 100644 --- a/src/compiler/scala/tools/asm/tree/LocalVariableNode.java +++ b/src/asm/scala/tools/asm/tree/LocalVariableNode.java diff --git a/src/compiler/scala/tools/asm/tree/LookupSwitchInsnNode.java b/src/asm/scala/tools/asm/tree/LookupSwitchInsnNode.java index 6d0f971c29..6d0f971c29 100644 --- a/src/compiler/scala/tools/asm/tree/LookupSwitchInsnNode.java +++ b/src/asm/scala/tools/asm/tree/LookupSwitchInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/MethodInsnNode.java b/src/asm/scala/tools/asm/tree/MethodInsnNode.java index c3036bc6b4..c3036bc6b4 100644 --- a/src/compiler/scala/tools/asm/tree/MethodInsnNode.java +++ b/src/asm/scala/tools/asm/tree/MethodInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/MethodNode.java b/src/asm/scala/tools/asm/tree/MethodNode.java index 70ec39e058..70ec39e058 100644 --- a/src/compiler/scala/tools/asm/tree/MethodNode.java +++ b/src/asm/scala/tools/asm/tree/MethodNode.java diff --git a/src/compiler/scala/tools/asm/tree/MultiANewArrayInsnNode.java b/src/asm/scala/tools/asm/tree/MultiANewArrayInsnNode.java index 9dfba77335..9dfba77335 100644 --- a/src/compiler/scala/tools/asm/tree/MultiANewArrayInsnNode.java +++ b/src/asm/scala/tools/asm/tree/MultiANewArrayInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/TableSwitchInsnNode.java b/src/asm/scala/tools/asm/tree/TableSwitchInsnNode.java index 929ad9b32b..929ad9b32b 100644 --- a/src/compiler/scala/tools/asm/tree/TableSwitchInsnNode.java +++ b/src/asm/scala/tools/asm/tree/TableSwitchInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/TryCatchBlockNode.java b/src/asm/scala/tools/asm/tree/TryCatchBlockNode.java index 375b4cfcb9..375b4cfcb9 100644 --- a/src/compiler/scala/tools/asm/tree/TryCatchBlockNode.java +++ b/src/asm/scala/tools/asm/tree/TryCatchBlockNode.java diff --git a/src/compiler/scala/tools/asm/tree/TypeInsnNode.java b/src/asm/scala/tools/asm/tree/TypeInsnNode.java index 0b2666c498..0b2666c498 100644 --- a/src/compiler/scala/tools/asm/tree/TypeInsnNode.java +++ b/src/asm/scala/tools/asm/tree/TypeInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/VarInsnNode.java b/src/asm/scala/tools/asm/tree/VarInsnNode.java index 89f572db59..89f572db59 100644 --- a/src/compiler/scala/tools/asm/tree/VarInsnNode.java +++ b/src/asm/scala/tools/asm/tree/VarInsnNode.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/Analyzer.java b/src/asm/scala/tools/asm/tree/analysis/Analyzer.java index df387b0b8e..df387b0b8e 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/Analyzer.java +++ b/src/asm/scala/tools/asm/tree/analysis/Analyzer.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/AnalyzerException.java b/src/asm/scala/tools/asm/tree/analysis/AnalyzerException.java index a89bb3513f..a89bb3513f 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/AnalyzerException.java +++ b/src/asm/scala/tools/asm/tree/analysis/AnalyzerException.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/BasicInterpreter.java b/src/asm/scala/tools/asm/tree/analysis/BasicInterpreter.java index 64ddcc11e6..64ddcc11e6 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/BasicInterpreter.java +++ b/src/asm/scala/tools/asm/tree/analysis/BasicInterpreter.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/BasicValue.java b/src/asm/scala/tools/asm/tree/analysis/BasicValue.java index 6c449db9b0..6c449db9b0 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/BasicValue.java +++ b/src/asm/scala/tools/asm/tree/analysis/BasicValue.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/BasicVerifier.java b/src/asm/scala/tools/asm/tree/analysis/BasicVerifier.java index 9297dd9294..9297dd9294 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/BasicVerifier.java +++ b/src/asm/scala/tools/asm/tree/analysis/BasicVerifier.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/Frame.java b/src/asm/scala/tools/asm/tree/analysis/Frame.java index fe19c2c9ae..fe19c2c9ae 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/Frame.java +++ b/src/asm/scala/tools/asm/tree/analysis/Frame.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/Interpreter.java b/src/asm/scala/tools/asm/tree/analysis/Interpreter.java index 930c8f4af8..930c8f4af8 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/Interpreter.java +++ b/src/asm/scala/tools/asm/tree/analysis/Interpreter.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/SimpleVerifier.java b/src/asm/scala/tools/asm/tree/analysis/SimpleVerifier.java index c4f515d328..c4f515d328 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/SimpleVerifier.java +++ b/src/asm/scala/tools/asm/tree/analysis/SimpleVerifier.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/SmallSet.java b/src/asm/scala/tools/asm/tree/analysis/SmallSet.java index 205878d18c..205878d18c 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/SmallSet.java +++ b/src/asm/scala/tools/asm/tree/analysis/SmallSet.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/SourceInterpreter.java b/src/asm/scala/tools/asm/tree/analysis/SourceInterpreter.java index 067200b51e..067200b51e 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/SourceInterpreter.java +++ b/src/asm/scala/tools/asm/tree/analysis/SourceInterpreter.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/SourceValue.java b/src/asm/scala/tools/asm/tree/analysis/SourceValue.java index 57ff212fb2..57ff212fb2 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/SourceValue.java +++ b/src/asm/scala/tools/asm/tree/analysis/SourceValue.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/Subroutine.java b/src/asm/scala/tools/asm/tree/analysis/Subroutine.java index 038880ddcd..038880ddcd 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/Subroutine.java +++ b/src/asm/scala/tools/asm/tree/analysis/Subroutine.java diff --git a/src/compiler/scala/tools/asm/tree/analysis/Value.java b/src/asm/scala/tools/asm/tree/analysis/Value.java index 1edf475ce7..1edf475ce7 100644 --- a/src/compiler/scala/tools/asm/tree/analysis/Value.java +++ b/src/asm/scala/tools/asm/tree/analysis/Value.java diff --git a/src/compiler/scala/tools/asm/util/ASMifiable.java b/src/asm/scala/tools/asm/util/ASMifiable.java index 6a31dd508f..6a31dd508f 100644 --- a/src/compiler/scala/tools/asm/util/ASMifiable.java +++ b/src/asm/scala/tools/asm/util/ASMifiable.java diff --git a/src/compiler/scala/tools/asm/util/ASMifier.java b/src/asm/scala/tools/asm/util/ASMifier.java index 5967c877d1..5967c877d1 100644 --- a/src/compiler/scala/tools/asm/util/ASMifier.java +++ b/src/asm/scala/tools/asm/util/ASMifier.java diff --git a/src/compiler/scala/tools/asm/util/CheckAnnotationAdapter.java b/src/asm/scala/tools/asm/util/CheckAnnotationAdapter.java index 8030c14f2e..8030c14f2e 100644 --- a/src/compiler/scala/tools/asm/util/CheckAnnotationAdapter.java +++ b/src/asm/scala/tools/asm/util/CheckAnnotationAdapter.java diff --git a/src/compiler/scala/tools/asm/util/CheckClassAdapter.java b/src/asm/scala/tools/asm/util/CheckClassAdapter.java index a455322531..a455322531 100644 --- a/src/compiler/scala/tools/asm/util/CheckClassAdapter.java +++ b/src/asm/scala/tools/asm/util/CheckClassAdapter.java diff --git a/src/compiler/scala/tools/asm/util/CheckFieldAdapter.java b/src/asm/scala/tools/asm/util/CheckFieldAdapter.java index bdcbe14b16..bdcbe14b16 100644 --- a/src/compiler/scala/tools/asm/util/CheckFieldAdapter.java +++ b/src/asm/scala/tools/asm/util/CheckFieldAdapter.java diff --git a/src/compiler/scala/tools/asm/util/CheckMethodAdapter.java b/src/asm/scala/tools/asm/util/CheckMethodAdapter.java index 7549765421..7549765421 100644 --- a/src/compiler/scala/tools/asm/util/CheckMethodAdapter.java +++ b/src/asm/scala/tools/asm/util/CheckMethodAdapter.java diff --git a/src/compiler/scala/tools/asm/util/CheckSignatureAdapter.java b/src/asm/scala/tools/asm/util/CheckSignatureAdapter.java index 3a6c3e780f..3a6c3e780f 100644 --- a/src/compiler/scala/tools/asm/util/CheckSignatureAdapter.java +++ b/src/asm/scala/tools/asm/util/CheckSignatureAdapter.java diff --git a/src/compiler/scala/tools/asm/util/Printer.java b/src/asm/scala/tools/asm/util/Printer.java index c39fd548ce..c39fd548ce 100644 --- a/src/compiler/scala/tools/asm/util/Printer.java +++ b/src/asm/scala/tools/asm/util/Printer.java diff --git a/src/compiler/scala/tools/asm/util/SignatureChecker.java b/src/asm/scala/tools/asm/util/SignatureChecker.java index 7b7eea4383..7b7eea4383 100644 --- a/src/compiler/scala/tools/asm/util/SignatureChecker.java +++ b/src/asm/scala/tools/asm/util/SignatureChecker.java diff --git a/src/compiler/scala/tools/asm/util/Textifiable.java b/src/asm/scala/tools/asm/util/Textifiable.java index b80d0139db..b80d0139db 100644 --- a/src/compiler/scala/tools/asm/util/Textifiable.java +++ b/src/asm/scala/tools/asm/util/Textifiable.java diff --git a/src/compiler/scala/tools/asm/util/Textifier.java b/src/asm/scala/tools/asm/util/Textifier.java index 8d40ebd026..8d40ebd026 100644 --- a/src/compiler/scala/tools/asm/util/Textifier.java +++ b/src/asm/scala/tools/asm/util/Textifier.java diff --git a/src/compiler/scala/tools/asm/util/TraceAnnotationVisitor.java b/src/asm/scala/tools/asm/util/TraceAnnotationVisitor.java index f112609031..f112609031 100644 --- a/src/compiler/scala/tools/asm/util/TraceAnnotationVisitor.java +++ b/src/asm/scala/tools/asm/util/TraceAnnotationVisitor.java diff --git a/src/compiler/scala/tools/asm/util/TraceClassVisitor.java b/src/asm/scala/tools/asm/util/TraceClassVisitor.java index bb830b71ce..bb830b71ce 100644 --- a/src/compiler/scala/tools/asm/util/TraceClassVisitor.java +++ b/src/asm/scala/tools/asm/util/TraceClassVisitor.java diff --git a/src/compiler/scala/tools/asm/util/TraceFieldVisitor.java b/src/asm/scala/tools/asm/util/TraceFieldVisitor.java index f537e83be1..f537e83be1 100644 --- a/src/compiler/scala/tools/asm/util/TraceFieldVisitor.java +++ b/src/asm/scala/tools/asm/util/TraceFieldVisitor.java diff --git a/src/compiler/scala/tools/asm/util/TraceMethodVisitor.java b/src/asm/scala/tools/asm/util/TraceMethodVisitor.java index 9aabf2079e..9aabf2079e 100644 --- a/src/compiler/scala/tools/asm/util/TraceMethodVisitor.java +++ b/src/asm/scala/tools/asm/util/TraceMethodVisitor.java diff --git a/src/compiler/scala/tools/asm/util/TraceSignatureVisitor.java b/src/asm/scala/tools/asm/util/TraceSignatureVisitor.java index a37b759811..a37b759811 100644 --- a/src/compiler/scala/tools/asm/util/TraceSignatureVisitor.java +++ b/src/asm/scala/tools/asm/util/TraceSignatureVisitor.java |