summaryrefslogtreecommitdiff
path: root/OMakefile
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-08-03 15:01:28 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-08-03 15:01:28 +0000
commit82543fe499c17c19f62f956fc5bd91e700088dd8 (patch)
tree0f477bb370920a48884e86c3eeabd058a857bc44 /OMakefile
parent6938beb1d44c4b00eae712a58bd092e0ef50a4c1 (diff)
downloadscala-82543fe499c17c19f62f956fc5bd91e700088dd8.tar.gz
scala-82543fe499c17c19f62f956fc5bd91e700088dd8.tar.bz2
scala-82543fe499c17c19f62f956fc5bd91e700088dd8.zip
Didn't get the propertyfile stuff quite right.
Diffstat (limited to 'OMakefile')
-rw-r--r--OMakefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/OMakefile b/OMakefile
index e773392deb..8957dff911 100644
--- a/OMakefile
+++ b/OMakefile
@@ -12,7 +12,7 @@ JAVA_OPTS = -Xms1024M -Xmx1024M -XX:MaxPermSize=256M
######################################################################
# The current copyright string
-COPYRIGHT_STRING = "Copyright 2002-2008, LAMP/EPFL"
+COPYRIGHT_STRING = Copyright 2002-2008, LAMP/EPFL
# Need to generate this correctly
VERSION_NUMBER = 2.7.2
@@ -70,9 +70,9 @@ idem-mkdir(dir) =
propfile(file) =
handle = $(fopen $(file), w)
# Need to correctly generated date/time
- fprint($(handle), "# Generated at some time")
- fprint($(handle), "copyright.string="$(COPYRIGHT_STRING))
- fprint($(handle), "version.number="$(VERSION_NUMBER))
+ fprint($(handle), \# Generated at some time)
+ fprint($(handle), copyright.string=$(COPYRIGHT_STRING))
+ fprint($(handle), version.number=$(VERSION_NUMBER))
close($(handle))
# Compile the Scala files in the sequence args with the specified
@@ -108,7 +108,7 @@ buildscala(classpath, outdir) =
# Need to copy over script.js and style.css for scaladoc to find them
cp($(addprefix ./src/compiler/scala/tools/nsc/doc/,script.js style.css) \
$(outdir)$(DIRSEP)classes$(DIRSEP)compiler$(DIRSEP)scala$(DIRSEP)tools$(DIRSEP)nsc$(DIRSEP)doc)
- propfile($(outdir)$(DIRSEP)classes$(DIRSEP)compiler$(DIRSEP)library.properties)
+ propfile($(outdir)$(DIRSEP)classes$(DIRSEP)library$(DIRSEP)library.properties)
# For compatibility with the old ant script we'll create some flags
touch($(outdir)$(DIRSEP)library.complete)
# touch($(outdir)$(DIRSEP)all.complete)