From f70518013d7dabd5e6478fffb02097f056cb353c Mon Sep 17 00:00:00 2001 From: Gilles Dubochet Date: Thu, 27 Oct 2005 15:31:36 +0000 Subject: Refactored the build.all system to be shorter, ... Refactored the build.all system to be shorter, clearer. Corrected some bugs that prevented rebuilding nsc without cleaning first. --- config/build.default.properties | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/build.default.properties b/config/build.default.properties index ab821b042e..bc645e0c11 100644 --- a/config/build.default.properties +++ b/config/build.default.properties @@ -82,6 +82,10 @@ build.dir=${basedir}/build # The directory to which the new Scala library is compiled. build.nslib.dir=${build.dir}/nslib +# The directory to which the part of the new Scala library built with PiCo +# is compiled. This should be different from ${build.nslib.dir}. +build.pico-nslib.dir=${build.dir}/pico-nslib + # The directory to which the new Scala tools (built with OSC) are compiled. build.osc-nstools.dir=${build.dir}/osc-nstools @@ -93,21 +97,23 @@ build.nstools.dir=${build.dir}/nstools # might not be useable. ############################################################################## -# The directory to which a new distribution will be added. -distrib.dir=${basedir}/distribs +# The directory to which a new distribution will be added, both for UNIX and +# Windows. These directories MUST BE SEPARATE! +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 JAR file in which the new Scala library should be archived. -distrib.nslib.jar=nslib.jar +# The name of the JAR file in which the new Scala library should be archived. +nslib.jar.name=nslib.jar -# The JAR file in which the new Scala tools should be archived. -distrib.nstools.jar=nstools.jar +# The name of the JAR file in which the new Scala tools should be archived. +nstools.jar.name=nstools.jar -# The JAR file in which the new Scala tools (built with OSC) should -# be archived. -distrib.osc-nstools.jar=osc-nstools.jar +# The name of the JAR file in which the new Scala tools (built with OSC) +# should be archived. +osc-nstools.jar.name=osc-nstools.jar ############################################################################## -- cgit v1.2.3