diff options
author | michelou <michelou@epfl.ch> | 2005-10-04 09:37:21 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2005-10-04 09:37:21 +0000 |
commit | c420d1b4b60a51236de6be50702d46a75f6546c1 (patch) | |
tree | 2654b67a0d7cb9aff0a8fc335e8a93d7260cc657 | |
parent | 120d1f6d1d40a98cdf19b124fdc8531d276bacb7 (diff) | |
download | scala-c420d1b4b60a51236de6be50702d46a75f6546c1.tar.gz scala-c420d1b4b60a51236de6be50702d46a75f6546c1.tar.bz2 scala-c420d1b4b60a51236de6be50702d46a75f6546c1.zip |
- added support for IntelliJ IDEA and Vim.
- added nsrt.jar and nsc.jar to distribution (needed by ./bin/scalansc).
-rw-r--r-- | Makefile.distrib | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/Makefile.distrib b/Makefile.distrib index 57624d5bfb..54926d3840 100644 --- a/Makefile.distrib +++ b/Makefile.distrib @@ -25,6 +25,12 @@ GEDIT_LIST += scala.lang GEDIT_LIST += README GEDIT_FILES = $(GEDIT_LIST:%=$(GEDIT_ROOT)/%) +# intellij idea scala-mode +INTELLIJ_ROOT = $(PROJECT_SUPPORTDIR)/intellij +INTELLIJ_LIST += scala.xml +INTELLIJ_LIST += README +INTELLIJ_FILES = $(INTELLIJ_LIST:%=$(INTELLIJ_ROOT)/%) + # jedit scala-mode JEDIT_ROOT = $(PROJECT_SUPPORTDIR)/jedit JEDIT_LIST += modes/scala.xml @@ -54,6 +60,12 @@ ULTRAEDIT_LIST += scala.txt ULTRAEDIT_LIST += README ULTRAEDIT_FILES = $(ULTRAEDIT_LIST:%=$(ULTRAEDIT_ROOT)/%) +# vim scala-mode +VIM_ROOT = $(PROJECT_SUPPORTDIR)/vim +VIM_LIST += scala.vim +VIM_LIST += README +VIM_FILES = $(VIM_LIST:%=$(VIM_ROOT)/%) + # xcode scala-mode XCODE_ROOT = $(PROJECT_SUPPORTDIR)/xcode XCODE_LIST += README @@ -99,12 +111,16 @@ INSTALL_EXAMPLEDIR = $(INSTALL_DOCDIR)/examples INSTALL_LIBRARY_JARFILE = $(INSTALL_LIBDIR)/$(LIBRARY_NAME).jar INSTALL_TOOLS_JARFILE = $(INSTALL_LIBDIR)/$(TOOLS_NAME).jar +INSTALL_NLIBRARY_JARFILE = $(INSTALL_LIBDIR)/nsrt.jar +INSTALL_NTOOLS_JARFILE = $(INSTALL_LIBDIR)/nsc.jar INSTALL_FJBG_JARFILE = $(INSTALL_LIBDIR)/fjbg.jar INSTALL_MSIL_JARFILE = $(INSTALL_LIBDIR)/msil.jar INSTALL_MSIL_DLLFILE = $(INSTALL_LIBDIR)/scala.dll install : $(LIBRARY_JAR_ARCHIVE) install : $(TOOLS_JAR_ARCHIVE) +install : $(NLIBRARY_JAR_ARCHIVE) +install : $(NTOOLS_JAR_ARCHIVE) $(MAKE) -C $(DOCUMENTS_ROOT)/reference $(MAKE) -C $(DOCUMENTS_ROOT)/tutorial $(INSTALL) -m 755 -d $(INSTALL_DOCDIR) @@ -120,6 +136,8 @@ install : $(TOOLS_JAR_ARCHIVE) MACRO_LIBRARY_SOURCES=$(INSTALL_SRCDIR) \ MACRO_LIBRARY_CLASSES=$(INSTALL_LIBRARY_JARFILE) \ MACRO_TOOLS_CLASSES=$(INSTALL_TOOLS_JARFILE) \ + MACRO_NLIBRARY_CLASSES=$(INSTALL_NLIBRARY_JARFILE) \ + MACRO_NTOOLS_CLASSES=$(INSTALL_NTOOLS_JARFILE) \ MACRO_FJBG_CLASSES=$(INSTALL_FJBG_JARFILE) \ MACRO_MSIL_CLASSES=$(INSTALL_MSIL_JARFILE) \ MACRO_JAVA_CMD=java \ @@ -135,6 +153,8 @@ install : $(TOOLS_JAR_ARCHIVE) $(INSTALL) -m 755 -d $(INSTALL_LIBDIR) $(INSTALL) -m 644 -p $(LIBRARY_JAR_ARCHIVE) $(INSTALL_LIBRARY_JARFILE) $(INSTALL) -m 644 -p $(TOOLS_JAR_ARCHIVE) $(INSTALL_TOOLS_JARFILE) + $(INSTALL) -m 644 -p $(NLIBRARY_JAR_ARCHIVE) $(INSTALL_NLIBRARY_JARFILE) + $(INSTALL) -m 644 -p $(NTOOLS_JAR_ARCHIVE) $(INSTALL_NTOOLS_JARFILE) $(INSTALL) -m 644 -p $(FJBG_JARFILE) $(INSTALL_FJBG_JARFILE) $(INSTALL) -m 644 -p $(MSIL_JARFILE) $(INSTALL_MSIL_JARFILE) $(INSTALL) -m 644 -p $(MSIL_DLLFILE) $(INSTALL_MSIL_DLLFILE) @@ -166,6 +186,9 @@ install : $(TOOLS_JAR_ARCHIVE) $(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/gedit $(strip $(MIRROR) -m 644 -p -C $(GEDIT_ROOT) $(GEDIT_LIST) \ $(INSTALL_SUPPORTDIR)/gedit) + $(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/intellij + $(strip $(MIRROR) -m 644 -p -C $(INTELLIJ_ROOT) $(INTELLIJ_LIST) \ + $(INSTALL_SUPPORTDIR)/intellij) $(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/jedit $(strip $(MIRROR) -m 644 -p -C $(JEDIT_ROOT) $(JEDIT_LIST) \ $(INSTALL_SUPPORTDIR)/jedit) @@ -178,6 +201,9 @@ install : $(TOOLS_JAR_ARCHIVE) $(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/ultraedit $(strip $(MIRROR) -m 644 -p -C $(ULTRAEDIT_ROOT) $(ULTRAEDIT_LIST) \ $(INSTALL_SUPPORTDIR)/ultraedit) + $(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/vim + $(strip $(MIRROR) -m 644 -p -C $(VIM_ROOT) $(VIM_LIST) \ + $(INSTALL_SUPPORTDIR)/vim) $(INSTALL) -m 755 -d $(INSTALL_SUPPORTDIR)/xcode $(strip $(MIRROR) -m 644 -p -C $(XCODE_ROOT) $(XCODE_LIST) \ $(INSTALL_SUPPORTDIR)/xcode) |