Three things to be friendly with Scala Bazaars:
1. Generate three sbp packages, not just one 2. Fix the name of the bin scripts, e.g. scala22 --> scala2 3. Do not include a Main-Class in the scalac jar file git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5582 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
a99af70769
commit
233eea8ad3
51
build.xml
51
build.xml
|
@ -66,10 +66,10 @@ PROPERTIES
|
||||||
<property name="dist.name" value="scala2"/>
|
<property name="dist.name" value="scala2"/>
|
||||||
<property name="lib.jar.name" value="${dist.name}-${lib.dir.name}.jar"/>
|
<property name="lib.jar.name" value="${dist.name}-${lib.dir.name}.jar"/>
|
||||||
<property name="comp.jar.name" value="${dist.name}-${comp.dir.name}.jar"/>
|
<property name="comp.jar.name" value="${dist.name}-${comp.dir.name}.jar"/>
|
||||||
<property name="scala.exec.name" value="${dist.name}2"/>
|
<property name="scala.exec.name" value="${dist.name}"/>
|
||||||
<property name="scalai.exec.name" value="${dist.name}i2"/>
|
<property name="scalai.exec.name" value="scalai2"/>
|
||||||
<property name="scalac.exec.name" value="${dist.name}c2"/>
|
<property name="scalac.exec.name" value="scalac2"/>
|
||||||
<property name="scalatok.exec.name" value="${dist.name}tok2"/>
|
<property name="scalatok.exec.name" value="scalatok2"/>
|
||||||
<!-- Shorcut names -->
|
<!-- Shorcut names -->
|
||||||
<property name="locker.lib.dir" value="${locker.dir}/${lib.dir.name}"/>
|
<property name="locker.lib.dir" value="${locker.dir}/${lib.dir.name}"/>
|
||||||
<property name="locker.comp.dir" value="${locker.dir}/${comp.dir.name}"/>
|
<property name="locker.comp.dir" value="${locker.dir}/${comp.dir.name}"/>
|
||||||
|
@ -592,8 +592,10 @@ GENERATES A DISTRIBUTION
|
||||||
basedir="${strap.comp.dir}">
|
basedir="${strap.comp.dir}">
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Signature-Version" value="${version.number}"/>
|
<attribute name="Signature-Version" value="${version.number}"/>
|
||||||
|
<!-- For a sbaz package, the Main-Class should not be included
|
||||||
<attribute name="Main-Class" value="scala.tools.nsc.Main"/>
|
<attribute name="Main-Class" value="scala.tools.nsc.Main"/>
|
||||||
<attribute name="Class-Path" value="${lib.jar.name}"/>
|
<attribute name="Class-Path" value="${lib.jar.name}"/>
|
||||||
|
-->
|
||||||
</manifest>
|
</manifest>
|
||||||
</jar>
|
</jar>
|
||||||
<jar destfile="${dist.current.dir}/lib/${lib.jar.name}"
|
<jar destfile="${dist.current.dir}/lib/${lib.jar.name}"
|
||||||
|
@ -628,14 +630,39 @@ GENERATES A DISTRIBUTION
|
||||||
failonerror="no"/>
|
failonerror="no"/>
|
||||||
</then>
|
</then>
|
||||||
</if>
|
</if>
|
||||||
<quicksbaz file="${dist.dir}/${dist.name}-${version.number}.sbp"
|
|
||||||
adfile="${dist.dir}/${dist.name}-${version.number}.advert"
|
<quicksbaz
|
||||||
name="${dist.name}"
|
file="${dist.dir}/scalac2-${version.number}.sbp"
|
||||||
version="${version.number}"
|
adfile="${dist.dir}/scalac2-${version.number}.advert"
|
||||||
desc="The Scala core library and compiler.">
|
name="scalac2"
|
||||||
<libset dir="${dist.current.dir}/lib" includes="*.jar"/>
|
version="${version.number}"
|
||||||
<binset dir="${dist.current.dir}/bin" includes="*"/>
|
desc="The Scala compiler. This is used to compile Scala programs
|
||||||
<manset dir="${docs.dir}/man" includes="**"/>
|
into Java .class files.">
|
||||||
|
<libset dir="${dist.current.dir}/lib" includes="scala2-compiler.jar"/>
|
||||||
|
<binset dir="${dist.current.dir}/bin" includes="scalac2*"/>
|
||||||
|
<manset dir="${docs.dir}/man" includes="scalac2.1"/>
|
||||||
|
</quicksbaz>
|
||||||
|
|
||||||
|
<quicksbaz
|
||||||
|
file="${dist.dir}/scala2-${version.number}.sbp"
|
||||||
|
adfile="${dist.dir}/scala2-${version.number}.advert"
|
||||||
|
name="scala2"
|
||||||
|
version="${version.number}"
|
||||||
|
desc="The Scala command runner. It is a wrapper around the Java VM that,
|
||||||
|
by default, sets up a large CLASSPATH including the Scala library
|
||||||
|
as well as all jars installed in the lib directory of the sbaz-
|
||||||
|
managed directory.">
|
||||||
|
<binset dir="${dist.current.dir}/bin" includes="scala2*"/>
|
||||||
|
<manset dir="${docs.dir}/man" includes="scala2.1"/>
|
||||||
|
</quicksbaz>
|
||||||
|
|
||||||
|
<quicksbaz
|
||||||
|
file="${dist.dir}/scala2-library-${version.number}.sbp"
|
||||||
|
adfile="${dist.dir}/scala2-library-${version.number}.advert"
|
||||||
|
name="scala2-library"
|
||||||
|
version="${version.number}"
|
||||||
|
desc="The base Scala library, required for running all Scala programs.">
|
||||||
|
<libset dir="${dist.current.dir}/lib" includes="scala2-library.jar"/>
|
||||||
</quicksbaz>
|
</quicksbaz>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue