diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-11-03 10:10:34 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-11-03 10:10:34 +0000 |
| commit | 0b22f202833cb1b6f98ab64f44ff7ca60f2b2f50 (patch) | |
| tree | 3349083d2364640acd1b05f1409dbe2cb3e1e459 | |
| parent | d466616dd488ead10e1f6eb342fd82b63dbd2b9b (diff) | |
| download | scala-0b22f202833cb1b6f98ab64f44ff7ca60f2b2f50.tar.gz scala-0b22f202833cb1b6f98ab64f44ff7ca60f2b2f50.tar.bz2 scala-0b22f202833cb1b6f98ab64f44ff7ca60f2b2f50.zip | |
Updated files for new directory structure.
| -rw-r--r-- | Makefile.config | 2 | ||||
| -rw-r--r-- | Makefile.distrib | 4 | ||||
| -rw-r--r-- | build.xml | 13 |
3 files changed, 11 insertions, 8 deletions
diff --git a/Makefile.config b/Makefile.config index 13469a55ce..95bdfbe107 100644 --- a/Makefile.config +++ b/Makefile.config @@ -13,7 +13,7 @@ PROJECT_NAME ?= scala PROJECT_ROOT ?= $(ROOT) -PROJECT_BINARYDIR ?= $(PROJECT_ROOT)/bin +PROJECT_BINARYDIR ?= $(PROJECT_ROOT)/sources/bin PROJECT_CONFIGDIR ?= $(PROJECT_ROOT)/config PROJECT_DOCUMENTDIR ?= $(PROJECT_ROOT)/doc PROJECT_LIBRARYDIR ?= $(PROJECT_ROOT)/lib diff --git a/Makefile.distrib b/Makefile.distrib index 054ed5eeaf..be584ea9be 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -81,7 +81,7 @@ XCODE_LIST += Specifications/Scala.pblangspec XCODE_FILES = $(XCODE_LIST:%=$(XCODE_ROOT)/%) # scala man pages -MANPAGES_ROOT = $(PROJECT_SUPPORTDIR)/man/man1 +MANPAGES_ROOT = $(PROJECT_DOCUMENTDIR)/man/man1 MANPAGES_LIST += scala.1 MANPAGES_LIST += scalac.1 MANPAGES_LIST += scaladoc.1 @@ -375,7 +375,7 @@ ia-build-windows : done $(INSTALL) -m 644 -p $(IA_CONFIG_PREFIX)/tools.zip $(IA_BUILD_PREFIX) $(XSLTPROC) $(XSLTPROC_FLAGS) $(IA_WIN32_PROJECTFILE) > $(IA_BUILD_PROJECTFILE) -# $(UNZIP) -q $(INSTALL_PREFIX).zip -d $(IA_BUILD_PREFIX) + $(UNZIP) -q $(INSTALL_PREFIX).zip -d $(IA_BUILD_PREFIX) $(UNZIP) -q $(DISTRIB_ARCHIVE).zip -d $(IA_BUILD_PREFIX) $(strip cd $(IA_BUILD_PREFIX)/$(PROJECT_NAME)-$(INSTALL_VERSION); \ $(ZIP) -q -r ../$(PROJECT_NAME).zip .) @@ -323,13 +323,16 @@ 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" + <copy file="${sources.dir}/bin/nscala.unix.tmpl" tofile="${distrib.unix.scala.dir}/bin/.scala_wrapper"> <filterset> <filter token="VERSION" value="${distrib.version}"/> <filter token="COPYRIGHT" value="${copyright.notice}"/> <filter token="TOOLS_CPATH" value="$PREFIX/lib/fjbg.jar:$PREFIX/lib/msil.jar:$PREFIX/lib/scala.jar:$PREFIX/lib/tools.jar:$PREFIX/lib/${osc-nstools.jar.name}"/> <filter token="LIB_CPATH" value="$PREFIX/lib/${nslib.jar.name}"/> + <filter token="SCALA" value="${scala.exec.name}"/> + <filter token="SCALAC" value="${scalac.exec.name}"/> + <filter token="SCALAP" value="${scalap.exec.name}"/> </filterset> </copy> <chmod file="${distrib.unix.scala.dir}/bin/.scala_wrapper" perm="ugo+rx"/> @@ -373,7 +376,7 @@ value=""%SCALA_HOME%"\lib"/> <!-- Set up 'bin' directory --> <mkdir dir="${distrib.win.current.dir}/bin"/> - <copy file="${support.dir}/bin/nscala.win.tmpl" + <copy file="${sources.dir}/bin/nscala.win.tmpl" tofile="${distrib.win.current.dir}/bin/${scala.exec.name}.bat"> <filterset> <filter token="PRODUCT" value="${scala.exec.name}"/> @@ -382,7 +385,7 @@ <filter token="BOOTCPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/> </filterset> </copy> - <copy file="${support.dir}/bin/nscala-tool.win.tmpl" + <copy file="${sources.dir}/bin/nscala-tool.win.tmpl" tofile="${distrib.win.current.dir}/bin/${scalac.exec.name}.bat"> <filterset> <filter token="PRODUCT" value="${scalac.exec.name}"/> @@ -393,7 +396,7 @@ <filter token="LIB_CPATH" value="${quotted.lib.dir}\${nslib.jar.name}"/> </filterset> </copy> - <copy file="${support.dir}/bin/nscala-tool.win.tmpl" + <copy file="${sources.dir}/bin/nscala-tool.win.tmpl" tofile="${distrib.win.current.dir}/bin/${scalap.exec.name}.bat"> <filterset> <filter token="PRODUCT" value="${scalap.exec.name}"/> @@ -459,7 +462,7 @@ <!-- Set up 'man' directory (unix) --> <mkdir dir="${distrib.unix.current.dir}/share/man"/> <copy todir="${distrib.unix.current.dir}/share/man"> - <fileset dir="${support.dir}/man" includes="**/*.1"/> + <fileset dir="${doc.dir}/man" includes="**/*.1"/> </copy> <!-- Set up 'support' directory (unix) --> <mkdir dir="${distrib.unix.scala.dir}/support"/> |