diff options
| -rw-r--r-- | build.xml | 46 | ||||
| -rw-r--r-- | config/build.default.properties | 10 | ||||
| -rw-r--r-- | config/izpack/install-nsc.xml | 10 |
3 files changed, 35 insertions, 31 deletions
@@ -318,9 +318,9 @@ depends="build, distrib.init" description="Creates a simplified Scala distribution for Unix."> <property name="distrib.unix.current.dir" - value="${distrib.unix.dir}/${distrib.current.prefix}-${distrib.version}"/> + value="${distrib.unix.dir}/${distrib.name}-${distrib.version}"/> <property name="distrib.unix.scala.dir" - value="${distrib.unix.current.dir}/share/scala"/> + value="${distrib.unix.current.dir}/share/${distrib.name}"/> <!-- Set up 'bin' directory (unix) --> <mkdir dir="${distrib.unix.scala.dir}/bin"/> <copy file="${support.dir}/bin/nscala.unix.tmpl" @@ -334,18 +334,18 @@ </copy> <chmod file="${distrib.unix.scala.dir}/bin/.scala_wrapper" perm="ugo+rx"/> <symlink resource=".scala_wrapper" - link="${distrib.unix.scala.dir}/bin/scala"/> + link="${distrib.unix.scala.dir}/bin/${scala.exec.name}"/> <symlink resource=".scala_wrapper" - link="${distrib.unix.scala.dir}/bin/scalac"/> + link="${distrib.unix.scala.dir}/bin/${scalac.exec.name}"/> <symlink resource=".scala_wrapper" - link="${distrib.unix.scala.dir}/bin/scalap"/> + link="${distrib.unix.scala.dir}/bin/${scalap.exec.name}"/> <mkdir dir="${distrib.unix.current.dir}/bin"/> - <symlink resource="${distrib.unix.scala.dir}/bin/scala" - link="${distrib.unix.current.dir}/bin/scala"/> - <symlink resource="${distrib.unix.scala.dir}/bin/scalac" - link="${distrib.unix.current.dir}/bin/scalac"/> - <symlink resource="${distrib.unix.scala.dir}/bin/scalap" - link="${distrib.unix.current.dir}/bin/scalap"/> + <symlink resource="${distrib.unix.scala.dir}/bin/${scala.exec.name}" + link="${distrib.unix.current.dir}/bin/${scala.exec.name}"/> + <symlink resource="${distrib.unix.scala.dir}/bin/${scalac.exec.name}" + link="${distrib.unix.current.dir}/bin/${scalac.exec.name}"/> + <symlink resource="${distrib.unix.scala.dir}/bin/${scalap.exec.name}" + link="${distrib.unix.current.dir}/bin/${scalap.exec.name}"/> <!-- Set up 'lib' directory --> <mkdir dir="${distrib.unix.scala.dir}/lib"/> <copy todir="${distrib.unix.scala.dir}/lib"> @@ -368,24 +368,24 @@ depends="build, distrib.init" description="Creates a simplified Scala distribution for Windows."> <property name="distrib.win.current.dir" - value="${distrib.win.dir}/${distrib.current.prefix}-${distrib.version}"/> + value="${distrib.win.dir}/${distrib.name}-${distrib.version}"/> <property name="quotted.lib.dir" value=""%SCALA_HOME%"\lib"/> <!-- Set up 'bin' directory --> <mkdir dir="${distrib.win.current.dir}/bin"/> <copy file="${support.dir}/bin/nscala.win.tmpl" - tofile="${distrib.win.current.dir}/bin/nscala.bat"> + tofile="${distrib.win.current.dir}/bin/${scala.exec.name}.bat"> <filterset> - <filter token="PRODUCT" value="scala"/> + <filter token="PRODUCT" value="${scala.exec.name}"/> <filter token="VERSION" value="${distrib.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="BOOTCPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/> </filterset> </copy> <copy file="${support.dir}/bin/nscala-tool.win.tmpl" - tofile="${distrib.win.current.dir}/bin/nscalac.bat"> + tofile="${distrib.win.current.dir}/bin/${scalac.exec.name}.bat"> <filterset> - <filter token="PRODUCT" value="scalac"/> + <filter token="PRODUCT" value="${scalac.exec.name}"/> <filter token="VERSION" value="${distrib.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="MAIN" value="scala.tools.nsc.Main"/> @@ -394,9 +394,9 @@ </filterset> </copy> <copy file="${support.dir}/bin/nscala-tool.win.tmpl" - tofile="${distrib.win.current.dir}/bin/nscalap.bat"> + tofile="${distrib.win.current.dir}/bin/${scalap.exec.name}.bat"> <filterset> - <filter token="PRODUCT" value="scalap"/> + <filter token="PRODUCT" value="${scalap.exec.name}"/> <filter token="VERSION" value="${distrib.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="MAIN" value="scala.tools.scalap.Main"/> @@ -443,7 +443,7 @@ <target name="distrib.unix.all" depends="distrib.all.init, distrib.unix" description="Creates a full Scala distribution for Unix."> <property name="distrib.unix.doc.dir" - value="${distrib.unix.current.dir}/share/doc/scala"/> + value="${distrib.unix.current.dir}/share/doc/${distrib.name}"/> <!-- Set up 'doc' directory (unix) --> <mkdir dir="${distrib.unix.doc.dir}"/> <copy todir="${distrib.unix.doc.dir}"> @@ -472,7 +472,7 @@ <tar destfile="${distrib.unix.scala.dir}/sources.tar.gz" basedir="${basedir}" includes="sources/scala/**/*.scala" compression="gzip"/> <!-- Create gz and bz2 compressed tarballs --> - <tar destfile="${distrib.unix.dir}/${distrib.current.prefix}-${distrib.version}.tar.gz" + <tar destfile="${distrib.unix.dir}/${distrib.name}-${distrib.version}.tar.gz" basedir="${distrib.unix.current.dir}" compression="gzip"/> </target> @@ -510,7 +510,7 @@ <zip destfile="${distrib.win.current.dir}/sources.zip" basedir="${basedir}" includes="sources/scala/**/*.scala"/> <!-- Create zip archive --> - <zip destfile="${distrib.win.dir}/${distrib.current.prefix}-${distrib.version}.zip" + <zip destfile="${distrib.win.dir}/${distrib.name}-${distrib.version}.zip" basedir="${distrib.win.current.dir}"/> </target> @@ -554,13 +554,13 @@ includes="**/*.html, **/*.xml"/> <filterset> <filter token="RESOURCEDIR" value="${resource.dir}"/> - <filter token="PREFIX" value="${distrib.current.prefix}"/> + <filter token="PREFIX" value="${distrib.name}"/> <filter token="VERSION" value="${distrib.version}"/> <filter token="URL" value="http://scala.epfl.ch/"/> </filterset> </copy> <izpack input="${resource.dir}/install-nsc.xml" - output="${distrib.unix.dir}/nscala-install-${distrib.version}.jar" + output="${distrib.unix.dir}/${distrib.name}-install-${distrib.version}.jar" installerType="standard" basedir="${basedir}"/> </target> diff --git a/config/build.default.properties b/config/build.default.properties index bc645e0c11..cf123820bd 100644 --- a/config/build.default.properties +++ b/config/build.default.properties @@ -102,9 +102,8 @@ build.nstools.dir=${build.dir}/nstools distrib.unix.dir=${basedir}/distribs/unix distrib.win.dir=${basedir}/distribs/windows -# The prefix of the directory in which a distribution will reside. This -# will be completed by the date of the distribution. -distrib.current.prefix=nscala +# The name of the product to build. +distrib.name=nscala # The name of the JAR file in which the new Scala library should be archived. nslib.jar.name=nslib.jar @@ -116,4 +115,9 @@ nstools.jar.name=nstools.jar # should be archived. osc-nstools.jar.name=osc-nstools.jar +# The name of the Scala executables +scala.exec.name=ns +scalac.exec.name=nsc +scalap.exec.name=nsp + ############################################################################## diff --git a/config/izpack/install-nsc.xml b/config/izpack/install-nsc.xml index c9b2498a23..d91cdc92ae 100644 --- a/config/izpack/install-nsc.xml +++ b/config/izpack/install-nsc.xml @@ -72,12 +72,12 @@ <executable os="unix" targetfile="$INSTALL_PATH/bin/.nsc_symlink"/> <singlefile os="unix" - target="$INSTALL_PATH/share/scala/bin/.nsc_symlink" + target="$INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink" src="bin/.nsc_symlink.tmpl"/> <executable os="unix" - targetfile="$INSTALL_PATH/share/scala/bin/.nsc_symlink"/> + targetfile="$INSTALL_PATH/share/@PREFIX@/bin/.nsc_symlink"/> <executable os="unix" keep="true" - targetfile="$INSTALL_PATH/share/scala/bin/.scala_wrapper"/> + targetfile="$INSTALL_PATH/share/@PREFIX@/bin/.scala_wrapper"/> <!-- windows --> @@ -87,11 +87,11 @@ targetdir="$INSTALL_PATH" excludes="doc/*.pdf, lib/**"/> <fileset os="windows" - dir="distribs/unix/@PREFIX@-@VERSION@/share/doc/scala" + dir="distribs/unix/@PREFIX@-@VERSION@/share/doc/@PREFIX@" targetdir="$INSTALL_PATH/doc" includes="*.pdf"/> <fileset os="windows" - dir="distribs/unix/@PREFIX@-@VERSION@/share/scala" + dir="distribs/unix/@PREFIX@-@VERSION@/share/@PREFIX@" targetdir="$INSTALL_PATH" includes="lib/**"/> <fileset os="windows" |