diff options
author | michelou <michelou@epfl.ch> | 2005-11-01 10:29:39 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2005-11-01 10:29:39 +0000 |
commit | 25152f0884db1a9854f3c6237a8805b9c2bb3099 (patch) | |
tree | 15b94021c4c3586d380fabf387d8f58340ba9428 | |
parent | b09684a1879bf09a79b07459c62558f22c3a14c4 (diff) | |
download | scala-25152f0884db1a9854f3c6237a8805b9c2bb3099.tar.gz scala-25152f0884db1a9854f3c6237a8805b9c2bb3099.tar.bz2 scala-25152f0884db1a9854f3c6237a8805b9c2bb3099.zip |
- added 'jars' command to build 'scala.jar' and...
- added 'jars' command to build 'scala.jar' and 'tools.jar'.
-rw-r--r-- | Makefile | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -136,6 +136,7 @@ scalap : main.scalap scala4ant : main.scala4ant scalatest : main.scalatest tools : main.tools +jars : main.jars $(prefix).all : $(latest)all $(prefix).scripts : $(latest)scripts @@ -153,6 +154,7 @@ $(prefix).scalap : $(latest)scalap $(prefix).scala4ant : $(latest)scala4ant $(prefix).scalatest : $(latest)scalatest $(prefix).tools : $(latest)tools +$(prefix).jars : $(latest)jars meta.% : ; @$(make) prefix="meta" $@; boot.% : ; @$(make) prefix="boot" $@; @@ -180,6 +182,7 @@ test.% : ; @$(make) prefix="test" $@; .PHONY : scala4ant .PHONY : scalatest .PHONY : tools +.PHONY : jars .PHONY : $(prefix).all .PHONY : $(prefix).scripts @@ -197,6 +200,7 @@ test.% : ; @$(make) prefix="test" $@; .PHONY : $(prefix).scala4ant .PHONY : $(prefix).scalatest .PHONY : $(prefix).tools +.PHONY : $(prefix).jars ############################################################################## # Commands - version management @@ -779,6 +783,19 @@ $(TOOLS_JAR_ARCHIVE) : endif ############################################################################## +# Targets - scala jars + +$(latest)jars : $(latest)library +$(latest)jars : $(latest)tools + @$(ECHO) " [jar] Building jar: $(LIBRARY_JAR_ARCHIVE)" + @$(make) jar target=LIBRARY \ + LIBRARY_JAR=@$(JAR) + @$(ECHO) " [jar] Building jar: $(TOOLS_JAR_ARCHIVE)" + @$(make) jar target=TOOLS \ + TOOLS_JAR=@$(JAR) + @$(TOUCH) $@ + +############################################################################## # Targets - template expansion # generation of Function<n>.scala |