natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed 2 quirks on .NET 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@11979 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2007-06-11 15:23:21 +00:00
parent af0eb4557c
commit c01172f6fb
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
build.xml
View File

@ -635,21 +635,43 @@ MSIL
<target name="msil" depends="setup.quick, msil.sources">
<quick srcdir="${msil.dir}/src" usepredefs="no" target="msil"
assemname="${msil.dir}/predef" assemrefs="${lib.dir}">
<include name="scala/Predef.scala" />
<include name="scala/Console.scala" />
<include name="scala/Application.scala" />
<include name="scala/ByNameFunction.scala" />
<include name="scala/*Annotation.scala" />
<include name="scala/Function*.scala" />
<include name="scala/Tuple*.scala" />
<include name="scala/Product*.scala" />
<include name="scala/deprecated.scala" />
<include name="scala/serializable.scala" />
<include name="scala/transient.scala" />
<include name="scala/cloneable.scala" />
<include name="scala/transient.scala" />
<include name="scala/runtime/*.scala" />
<include name="scala/Predef.scala"/>
<include name="scala/Console.scala"/>
<include name="scala/Application.scala"/>
<include name="scala/ByNameFunction.scala"/>
<include name="scala/*Annotation.scala"/>
<include name="scala/Function*.scala"/>
<include name="scala/Tuple*.scala"/>
<include name="scala/Product*.scala"/>
<include name="scala/cloneable.scala"/>
<include name="scala/deprecated.scala"/>
<include name="scala/serializable.scala"/>
<include name="scala/transient.scala"/>
<include name="scala/runtime/*.scala"/>
</quick>
<property name="ilasm.infile" value="${msil.dir}/predef.msil"/>
<property name="ilasm.outfile" value="${msil.dir}/predef.dll"/>
<if><isset property="os.win"/>
<then>
<property
name="ilasm.args"
value="/quiet /dll /output=${ilasm.outfile} ${ilasm.infile}"
/>
</then>
<else>
<property
name="ilasm.args"
value="/dll /output:${ilasm.outfile} ${ilasm.infile}"
/>
</else>
</if>
<exec
executable="ilasm" vmlauncher="no">
<!--
errorproperty="ilasm.err" outputproperty="ilasm.out">
-->
<arg line="${ilasm.args}"/>
</exec>
</target>
<!-- ===========================================================================

2
src/compiler/scala/tools/nsc/symtab/Definitions.scala
View File

@ -939,7 +939,7 @@ trait Definitions {
SerializableAttr = getClass("scala.serializable")
BeanPropertyAttr = if (forCLDC || forMSIL) null else getClass("scala.reflect.BeanProperty")
DeprecatedAttr = getClass("scala.deprecated")
NativeAttr = getClass("scala.native")
NativeAttr = if (forMSIL) null else getClass("scala.native")
SyntheticClasses = new HashSet[Symbol]
SyntheticClasses ++= List(