diff options
| author | paltherr <paltherr@epfl.ch> | 2003-11-27 15:02:09 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-11-27 15:02:09 +0000 |
| commit | b72b96eacef48a87c94a0c3a64794533f3d22ddf (patch) | |
| tree | 56a1792dc298f2f391671ca3ba6a410a4325bb96 /Makefile | |
| parent | 18b13aadb52d1a15c0ed0f7547b9a1e86c1a91bf (diff) | |
| download | scala-b72b96eacef48a87c94a0c3a64794533f3d22ddf.tar.gz scala-b72b96eacef48a87c94a0c3a64794533f3d22ddf.tar.bz2 scala-b72b96eacef48a87c94a0c3a64794533f3d22ddf.zip | |
- Fixed bootclasspaths for library and scalac c...
- Fixed bootclasspaths for library and scalac compilation Changed
- compiler for library and scalac to scalac (from scalacboot)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -82,6 +82,7 @@ SCALAC_JC_FILES += $(SCALACBOOT_SOURCES) SCALAC_JC_CLASSPATH = $(PROJECT_CLASSPATH):$(MSIL_JARFILE):$(FJBG_JARFILE) SCALAC_SC_FILES += $(SCALAC_SOURCES) SCALAC_SC_CLASSPATH = $(SCALAC_JC_CLASSPATH) +SCALAC_SC_BOOTCLASSPATH = $(LIBRARY_SC_BOOTCLASSPATH) SCALAC_SCALAC = $(LIBRARY_SCALAC) # scala library @@ -90,6 +91,7 @@ LIBRARY_LIST += $(call READLIST,$(PROJECT_LISTDIR)/library.lst) LIBRARY_SOURCES += $(LIBRARY_LIST:%=$(LIBRARY_ROOT)/%) LIBRARY_JC_FILES += $(filter %.java,$(LIBRARY_SOURCES)) LIBRARY_SC_FILES += $(filter %.scala,$(LIBRARY_SOURCES)) +LIBRARY_SC_BOOTCLASSPATH = $(PROJECT_OUTPUTDIR):$(PROJECT_SOURCEDIR):$(JRE_JARFILE) LIBRARY_SDC_FLAGS += -windowtitle "Scala Library Documentation" LIBRARY_SDC_FLAGS += -doctitle "Scala<br/>$(PROJECT_VERSION)" LIBRARY_SDC_FILES += $(LIBRARY_SC_FILES) @@ -97,7 +99,7 @@ LIBRARY_SDC_OUTPUTDIR = $(PROJECT_APIDOCDIR) LIBRARY_JAR_ARCHIVE = $(PROJECT_LIBRARYDIR)/$(PROJECT_NAME).jar LIBRARY_JAR_INPUTDIR = $(PROJECT_OUTPUTDIR) LIBRARY_JAR_FILES += scala -LIBRARY_SCALAC = $(PROJECT_BOOTSTRAPDIR)/bin/scalacboot +LIBRARY_SCALAC = $(PROJECT_BOOTSTRAPDIR)/bin/scalac # scala interpreter INTERPRETER_ROOT = $(PROJECT_SOURCEDIR)/scala/tools/scalai @@ -312,6 +314,7 @@ cvs-fix-perms : INSTALL_PREFIX=$(PROJECT_BOOTSTRAPDIR) \ PROJECT_BINARYDIR=$(PROJECT_BOOTSTRAPDIR)/bin \ PROJECT_OUTPUTDIR=$(PROJECT_BOOTSTRAPDIR)/classes \ + LIBRARY_SCALAC=$(PROJECT_BOOTSTRAPDIR)/bin/scalacboot \ boot="bootstrap-" scripts lamplib \ .latest-bootstrap-scalac-jc \ .latest-bootstrap-library-jc \ |