From 659b75996564abf6c87045eb7c096324702897c8 Mon Sep 17 00:00:00 2001 From: paltherr Date: Tue, 21 Sep 2004 17:26:04 +0000 Subject: - Moved scala scripts from ./bin to ./object/ma... - Moved scala scripts from ./bin to ./object/main/bin --- Makefile | 31 +++++++++++++------------------ Makefile.distrib | 3 +-- bin/.cvsignore | 1 - bin/.scala_wrapper | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 21 deletions(-) delete mode 100644 bin/.cvsignore create mode 100755 bin/.scala_wrapper diff --git a/Makefile b/Makefile index aec7363191..c6108aa9e6 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,6 @@ meta_SCALAC = $(SCALAC) boot_PREFIX = boot boot_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(boot_PREFIX) boot_INSTALLDIR = $(boot_OBJECTDIR) -boot_BINARYDIR = $(boot_OBJECTDIR)/bin boot_LIBRARY_CLASSDIR = $(main_LIBRARY_CLASSDIR) boot_TOOLS_CLASSDIR = $(boot_OBJECTDIR)/lib/$(TOOLS_NAME) boot_JC_OUTPUTDIR = $(boot_TOOLS_CLASSDIR) @@ -40,28 +39,26 @@ boot_SCALA_CMD = $(SCALA) main_PREFIX = main main_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(main_PREFIX) main_INSTALLDIR = $(PROJECT_ROOT) -main_BINARYDIR = $(PROJECT_BINARYDIR) main_LIBRARY_CLASSDIR = $(main_OBJECTDIR)/lib/$(LIBRARY_NAME) main_TOOLS_CLASSDIR = $(main_OBJECTDIR)/lib/$(TOOLS_NAME) main_JC_OUTPUTDIR = $(main_TOOLS_CLASSDIR) main_JC_CLASSPATH = $(main_JC_OUTPUTDIR):$(main_LIBRARY_CLASSDIR) main_SC_BOOTCLASSPATH = $(JRE_JARFILE) -main_SCALAC = $(boot_BINARYDIR)/scalac -main_SCALADOC = $(main_BINARYDIR)/scaladoc -main_SCALA_CMD = $(main_BINARYDIR)/scala +main_SCALAC = $(boot_OBJECTDIR)/bin/scalac +main_SCALADOC = $(main_OBJECTDIR)/bin/scaladoc +main_SCALA_CMD = $(main_OBJECTDIR)/bin/scala test_PREFIX = test test_OBJECTDIR = $(PROJECT_OBJECTDIR)/$(test_PREFIX) test_INSTALLDIR = $(test_OBJECTDIR) -test_BINARYDIR = $(test_OBJECTDIR)/bin test_LIBRARY_CLASSDIR = $(test_OBJECTDIR)/lib/$(LIBRARY_NAME) test_TOOLS_CLASSDIR = $(test_OBJECTDIR)/lib/$(TOOLS_NAME) test_JC_OUTPUTDIR = $(test_TOOLS_CLASSDIR) test_JC_CLASSPATH = $(test_JC_OUTPUTDIR):$(test_LIBRARY_CLASSDIR) test_SC_BOOTCLASSPATH = $(JRE_JARFILE) -test_SCALAC = $(main_BINARYDIR)/scalac -test_SCALADOC = $(test_BINARYDIR)/scaladoc -test_SCALA_CMD = $(test_BINARYDIR)/scala +test_SCALAC = $(main_OBJECTDIR)/bin/scalac +test_SCALADOC = $(test_OBJECTDIR)/bin/scaladoc +test_SCALA_CMD = $(test_OBJECTDIR)/bin/scala ############################################################################## # Variables @@ -273,11 +270,12 @@ $(LATEST_PREFIX)-test-% : ; @$(make) prefix="test" $@ ############################################################################## # Targets - scala scripts -SCRIPTS_PREFIX = $($(prefix)_BINARYDIR) +SCRIPTS_PREFIX = $($(prefix)_OBJECTDIR) +SCRIPTS_BINARYDIR = $(SCRIPTS_PREFIX)/bin SCRIPTS_TEMPLATE_NAME = $(SCRIPTS_WRAPPER_NAME).tmpl SCRIPTS_TEMPLATE_FILE = $(PROJECT_BINARYDIR)/$(SCRIPTS_TEMPLATE_NAME) SCRIPTS_WRAPPER_NAME = .scala_wrapper -SCRIPTS_WRAPPER_FILE = $(SCRIPTS_PREFIX)/$(SCRIPTS_WRAPPER_NAME) +SCRIPTS_WRAPPER_FILE = $(SCRIPTS_BINARYDIR)/$(SCRIPTS_WRAPPER_NAME) SCRIPTS_ALIASES_NAMES += scala SCRIPTS_ALIASES_NAMES += scala-debug SCRIPTS_ALIASES_NAMES += scala-info @@ -292,13 +290,10 @@ SCRIPTS_ALIASES_NAMES += scalaint-debug SCRIPTS_ALIASES_NAMES += dtd2scala SCRIPTS_ALIASES_NAMES += scalap SCRIPTS_ALIASES_NAMES += scalatest -SCRIPTS_ALIASES_FILES += $(SCRIPTS_ALIASES_NAMES:%=$(SCRIPTS_PREFIX)/%) -SCRIPTS_MACRO = -es@{\#$(1)\#}@'"$(MACRO_$(1):$(INSTALL_PREFIX)/%=$$PREFIX/%)"'@g +SCRIPTS_ALIASES_FILES += $(SCRIPTS_ALIASES_NAMES:%=$(SCRIPTS_BINARYDIR)/%) +SCRIPTS_MACRO = -es@{\#$(1)\#}@'"$(MACRO_$(1):$(SCRIPTS_PREFIX)/%=$$PREFIX/%)"'@g + -distclean : distclean.scripts -distclean.scripts : - $(RM) $(SCRIPTS_ALIASES_FILES) - $(RM) $(SCRIPTS_WRAPPER_FILE) $(latest)scripts : $(SCRIPTS_ALIASES_FILES) $(TOUCH) $@ @@ -308,7 +303,7 @@ $(SCRIPTS_ALIASES_FILES): $(SCRIPTS_WRAPPER_FILE) $(call RUN,$(LN) -s $(notdir $(SCRIPTS_WRAPPER_FILE)) $@); \ fi -$(SCRIPTS_WRAPPER_FILE) : INSTALL_PREFIX ?= $($(prefix)_INSTALLDIR) +$(SCRIPTS_WRAPPER_FILE) : ROOT := $(shell cd $(ROOT); pwd) $(SCRIPTS_WRAPPER_FILE) : MACRO_VERSION ?= $(PROJECT_VERSION) $(SCRIPTS_WRAPPER_FILE) : MACRO_LIBRARY_SOURCES ?= $(PROJECT_SOURCEDIR) $(SCRIPTS_WRAPPER_FILE) : MACRO_LIBRARY_CLASSES ?= $(LIBRARY_CLASSDIR) diff --git a/Makefile.distrib b/Makefile.distrib index 151f6b170e..a8ebb05784 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -72,8 +72,7 @@ install : $(TOOLS_JAR_ARCHIVE) $(INSTALL) -m 755 -d $(INSTALL_BINDIR) $(INSTALL) -m 644 -p $(SCRIPTS_TEMPLATE_FILE) $(INSTALL_BINDIR) @$(make) \ - SCRIPTS_PREFIX=$(INSTALL_BINDIR) \ - INSTALL_PREFIX=$(INSTALL_PREFIX) \ + SCRIPTS_PREFIX=$(INSTALL_PREFIX) \ MACRO_VERSION=$(INSTALL_VERSION) \ MACRO_LIBRARY_SOURCES=$(INSTALL_SRCDIR) \ MACRO_LIBRARY_CLASSES=$(INSTALL_LIBRARY_JARFILE) \ diff --git a/bin/.cvsignore b/bin/.cvsignore deleted file mode 100644 index 8a44ab5a3b..0000000000 --- a/bin/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -.scala_wrapper diff --git a/bin/.scala_wrapper b/bin/.scala_wrapper new file mode 100755 index 0000000000..4906ec4835 --- /dev/null +++ b/bin/.scala_wrapper @@ -0,0 +1,48 @@ +#!/bin/sh +############################################################################## +# __ # +# ________ ___ / / ___ Scala Tools Launch Script # +# / __/ __// _ | / / / _ | (c) 2002-2003, LAMP/EPFL # +# __\ \/ /__/ __ |/ /__/ __ | # +# /____/\___/_/ |_/____/_/ | | # +# |/ # +############################################################################## + +# $Id$ + +############################################################################## +# Definition of UNAME, SOURCE, SCRIPT, PREFIX and VERSION + +unset SCRIPT; +UNAME=`uname`; +SOURCE=$0; +SCRIPT=`basename "$SOURCE"`; +while [ -h "$SOURCE" ]; do + SCRIPT=`basename "$SOURCE"`; + LOOKUP=`ls -ld "$SOURCE"`; + TARGET=`expr "$LOOKUP" : '.*-> \(.*\)$'`; + if expr "${TARGET:-.}/" : '/.*/$' > /dev/null; then + SOURCE=${TARGET:-.}; + else + SOURCE=`dirname "$SOURCE"`/${TARGET:-.}; + fi; +done; +PREFIX=`dirname "$SOURCE"`/..; +prefix=$PREFIX; +PREFIX=`cd "$PREFIX"; pwd`; + +VERSION={#VERSION#}; +VERSION=${VERSION:-"unknown version"}; + +############################################################################## +# Main + +echo 1>&2 "$0: This script is obsolete."; +echo 1>&2 "All scripts that used to be in $PREFIX/bin/ have been moved to" \ + "$PREFIX/objects/main/bin/. You should remove all remaining symbolic" \ + "links in $PREFIX/bin/ or replace them by links pointing to the new" \ + "location." + +exit 1; + +############################################################################## -- cgit v1.2.3