- added definitions of directories

- now uses variables

3 files changed, 102 insertions, 18 deletions

diff --git a/build-nsc.properties.SAMPLE b/build-nsc.properties.SAMPLE
index 25296985e0..f79245aa77 100644
--- a/build-nsc.properties.SAMPLE
+++ b/build-nsc.properties.SAMPLE
@@ -9,31 +9,33 @@
 # don't run commands here
 #
 ##############################################################################
-# jar archives
-#
-scala_jar   = /home/michelou/projects/scala/lib/scala.jar
-tools_jar   = /home/michelou/projects/scala/lib/tools.jar
-nsc_jar     = /home/michelou/projects/scala/lib/nsc.jar
-nsrt_jar    = /home/michelou/projects/scala/lib/nsrt.jar
-nsc4ant_jar = /home/michelou/projects/scala/lib/nsc4ant.jar
+# directories
 #
-ant_jar     = /home/linuxsoft/apps/ant/lib/ant.jar
-fjbg_jar    = /home/linuxsoft/apps/fjbg/jars/fjbg.jar
-jaco_jar    = /home/linuxsoft/apps/jaco/lib/jaco.jar
+apps_dir    = /home/linuxsoft/apps
+main_dir    = /home/michelou/projects/scala/objects/main/lib
+jars_dir    = /home/michelou/projects/scala/objects/nsc/lib
+tmp_dir	    = /tmp
 #
 ##############################################################################
-# build directories
-#
-jars_dir = /home/michelou/projects/scala/objects/nsc/lib
+# jar archives
 #
-#tools_util_dir = /tmp/classes_tools_util
+scala_jar   = ${main_dir}/scala.jar
+tools_jar   = ${main_dir}/tools.jar
 #
-nsc_dir = /tmp/classes_nsc
+nsc_jar     = ${jars_dir}/nsc.jar
+nsrt_jar    = ${jars_dir}/nsrt.jar
+nsc4ant_jar = ${jars_dir}/nsc4ant.jar
 #
-nsc4ant_dir = /tmp/classes_nsc4ant
+ant_jar     = ${apps_dir}/ant/lib/ant.jar
+fjbg_jar    = ${apps_dir}/fjbg/jars/fjbg.jar
+jaco_jar    = ${apps_dir}/jaco/lib/jaco.jar
 #
-nsc_output_dir = /tmp/classes_new
+##############################################################################
+# build directories
 #
-tools_util_runtime_dir=/tmp/classes_runtime
+nsc_dir                = ${tmp_dir}/classes_nsc
+nsc4ant_dir            = ${tmp_dir}/classes_nsc4ant
+nsc_output_dir         = ${tmp_dir}/classes_new
+tools_util_runtime_dir = ${tmp_dir}/classes_runtime
 #
 ##############################################################################
diff --git a/build-nsc.properties.unix.SAMPLE b/build-nsc.properties.unix.SAMPLE
new file mode 100644
index 0000000000..f79245aa77
--- /dev/null
+++ b/build-nsc.properties.unix.SAMPLE
@@ -0,0 +1,41 @@
+# $Id$
+# 
+# this file serves two purposes 
+#
+# 1. properties file for ant
+# 2. environment variables for shell-scripts (e.g. ant-build-nsc.sh)
+#
+# don't use characters like '.' in variable names, and
+# don't run commands here
+#
+##############################################################################
+# directories
+#
+apps_dir    = /home/linuxsoft/apps
+main_dir    = /home/michelou/projects/scala/objects/main/lib
+jars_dir    = /home/michelou/projects/scala/objects/nsc/lib
+tmp_dir	    = /tmp
+#
+##############################################################################
+# jar archives
+#
+scala_jar   = ${main_dir}/scala.jar
+tools_jar   = ${main_dir}/tools.jar
+#
+nsc_jar     = ${jars_dir}/nsc.jar
+nsrt_jar    = ${jars_dir}/nsrt.jar
+nsc4ant_jar = ${jars_dir}/nsc4ant.jar
+#
+ant_jar     = ${apps_dir}/ant/lib/ant.jar
+fjbg_jar    = ${apps_dir}/fjbg/jars/fjbg.jar
+jaco_jar    = ${apps_dir}/jaco/lib/jaco.jar
+#
+##############################################################################
+# build directories
+#
+nsc_dir                = ${tmp_dir}/classes_nsc
+nsc4ant_dir            = ${tmp_dir}/classes_nsc4ant
+nsc_output_dir         = ${tmp_dir}/classes_new
+tools_util_runtime_dir = ${tmp_dir}/classes_runtime
+#
+##############################################################################
diff --git a/build-nsc.properties.win.SAMPLE b/build-nsc.properties.win.SAMPLE
new file mode 100644
index 0000000000..259897e8eb
--- /dev/null
+++ b/build-nsc.properties.win.SAMPLE
@@ -0,0 +1,41 @@
+# $Id$
+# 
+# this file serves two purposes 
+#
+# 1. properties file for ant
+# 2. environment variables for shell-scripts (e.g. ant-build-sh)
+#
+# don't use characters like '.' in variable names, and
+# don't run commands here
+#
+##############################################################################
+# directories
+#
+apps_dir    = c:\\localhome\\linuxsoft\\apps
+main_dir    = c:\\localhome\\michelou\\projects\\scala\\objects\\main\\lib
+jars_dir    = c:\\localhome\\michelou\\projects\\scala\\objects\\nsc\\lib
+tmp_dir	    = c:\\tmp
+#
+##############################################################################
+# jar archives
+#
+scala_jar   = ${main_dir}\\scala.jar
+tools_jar   = ${main_dir}\\tools.jar
+#
+nsc_jar     = ${jars_dir}\\nsc.jar
+nsrt_jar    = ${jars_dir}\\nsrt.jar
+nsc4ant_jar = ${jars_dir}\\nsc4ant.jar
+#
+ant_jar     = ${apps_dir}\\ant\\lib\\ant.jar
+fjbg_jar    = ${apps_dir}\\fjbg\\jars\\fjbg.jar
+jaco_jar    = ${apps_dir}\\jaco-20050730\\lib\\jaco.jar
+#
+##############################################################################
+# build directories
+#
+nsc_dir	               = ${tmp_dir}\\classes_nsc
+nsc4ant_dir            = ${tmp_dir}\\classes_nsc4ant
+nsc_output_dir         = ${tmp_dir}\\classes_new
+tools_util_runtime_dir = ${tmp_dir}\\classes_runtime
+#
+##############################################################################