[kaffe] CVS kaffe (robilad): Fixed the build with precompiled rt.jar

Kaffe CVS cvs-commits at kaffe.org
Sat Apr 2 11:25:47 PST 2005


PatchSet 5646 
Date: 2005/04/02 19:20:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed the build with precompiled rt.jar

2005-04-02  Dalibor Topic  <topic at localhost.localdomain>

* libraries/javalib/Makefile.am.in
[USE_PRECOMPILED_RT_JAR] (compile-tools-classes):
New target.
(tools.jar) Build only tools.jar classes.

Reported by:  Riccardo Mottola <zuse at libero.it>

Members: 
	ChangeLog:1.3816->1.3817 
	libraries/javalib/Makefile.am:1.332->1.333 
	libraries/javalib/Makefile.am.in:1.40->1.41 
	libraries/javalib/Makefile.in:1.420->1.421 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3816 kaffe/ChangeLog:1.3817
--- kaffe/ChangeLog:1.3816	Sat Apr  2 17:44:40 2005
+++ kaffe/ChangeLog	Sat Apr  2 19:20:41 2005
@@ -1,3 +1,12 @@
+2005-04-02  Dalibor Topic  <topic at localhost.localdomain>
+
+	* libraries/javalib/Makefile.am.in 
+	[USE_PRECOMPILED_RT_JAR] (compile-tools-classes): 
+	New target. 
+	(tools.jar) Build only tools.jar classes.
+
+	Reported by:  Riccardo Mottola <zuse at libero.it>
+
 2005-04-02  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/systems/unix-jthreads/jthread.c,
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.332 kaffe/libraries/javalib/Makefile.am:1.333
--- kaffe/libraries/javalib/Makefile.am:1.332	Sat Apr  2 16:38:25 2005
+++ kaffe/libraries/javalib/Makefile.am	Sat Apr  2 19:20:43 2005
@@ -5095,16 +5095,6 @@
 rebuildLib = ./rebuildLib
 
 .PHONY: compile-classes classes
-## classes is provided for backward compatibility; use compile-classes
-compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
-	rm -rf $(LIBDIR)
-	mkdir $(LIBDIR)
-	if test "$(PROFILE)" = default; then \
-		$(SHELL) $(rebuildLib) @all.files `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
-	else \
-		$(SHELL) $(rebuildLib) @$(PROFILE) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
-	fi
-	echo timestamp > $(LIBDIR)/stamp
 
 JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
 JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class)
@@ -5119,7 +5109,29 @@
 jar-classes: rt.jar
 rt.jar: $(PATH_TO_RT_JAR)
 	cp $< $@
+
+compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS)
+	rm -rf $(LIBDIR)
+	mkdir $(LIBDIR)
+	$(SHELL) $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
+	echo timestamp > $(LIBDIR)/stamp
+
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+	rm -f tools.jar
+	$(JAR_CMD7)
+	mv $@.new $@
 else
+## classes is provided for backward compatibility; use compile-classes
+compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
+	rm -rf $(LIBDIR)
+	mkdir $(LIBDIR)
+	if test "$(PROFILE)" = default; then \
+		$(SHELL) $(rebuildLib) @all.files `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
+	else \
+		$(SHELL) $(rebuildLib) @$(PROFILE) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
+	fi
+	echo timestamp > $(LIBDIR)/stamp
+
 jar-classes: rt.jar
 rt.jar: $(LIBDIR)/stamp $(Klasses_jar_SRCS)
 	rm -f rt.jar
@@ -5130,7 +5142,6 @@
 	$(JAR_CMD5)
 	$(JAR_CMD6)
 	mv $@.new $@
-endif
 
 # Put gnu.bytecode into tools.jar to avoid problems
 # with applications using their own version of it.
@@ -5138,6 +5149,7 @@
 	rm -f tools.jar
 	$(JAR_CMD7)
 	mv $@.new $@
+endif
 
 .PHONY: build-classes Klasses
 build-classes Klasses: rt.jar
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.40 kaffe/libraries/javalib/Makefile.am.in:1.41
--- kaffe/libraries/javalib/Makefile.am.in:1.40	Sat Apr  2 16:38:26 2005
+++ kaffe/libraries/javalib/Makefile.am.in	Sat Apr  2 19:20:44 2005
@@ -183,16 +183,6 @@
 rebuildLib = ./rebuildLib
 
 .PHONY: compile-classes classes
-## classes is provided for backward compatibility; use compile-classes
-compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
-	rm -rf $(LIBDIR)
-	mkdir $(LIBDIR)
-	if test "$(PROFILE)" = default; then \
-		$(SHELL) $(rebuildLib) @all.files `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
-	else \
-		$(SHELL) $(rebuildLib) @$(PROFILE) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
-	fi
-	echo timestamp > $(LIBDIR)/stamp
 
 JAR_CMD1 = (cd $(srcdir) && $(ZIP) -q -r $(CURDIR)/$@.new META-INF)
 JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -q -DX -r $(CURDIR)/$@.new $(SRCDIRS) -x gnu/bytecode/*.class -x gnu/classpath/tools/javap/*.class)
@@ -207,7 +197,29 @@
 jar-classes: rt.jar
 rt.jar: $(PATH_TO_RT_JAR)
 	cp $< $@
+
+compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS)
+	rm -rf $(LIBDIR)
+	mkdir $(LIBDIR)
+	$(SHELL) $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
+	echo timestamp > $(LIBDIR)/stamp
+
+tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+	rm -f tools.jar
+	$(JAR_CMD7)
+	mv $@.new $@
 else
+## classes is provided for backward compatibility; use compile-classes
+compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
+	rm -rf $(LIBDIR)
+	mkdir $(LIBDIR)
+	if test "$(PROFILE)" = default; then \
+		$(SHELL) $(rebuildLib) @all.files `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
+	else \
+		$(SHELL) $(rebuildLib) @$(PROFILE) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
+	fi
+	echo timestamp > $(LIBDIR)/stamp
+
 jar-classes: rt.jar
 rt.jar: $(LIBDIR)/stamp $(Klasses_jar_SRCS)
 	rm -f rt.jar
@@ -218,7 +230,6 @@
 	$(JAR_CMD5)
 	$(JAR_CMD6)
 	mv $@.new $@
-endif
 
 # Put gnu.bytecode into tools.jar to avoid problems
 # with applications using their own version of it.
@@ -226,6 +237,7 @@
 	rm -f tools.jar
 	$(JAR_CMD7)
 	mv $@.new $@
+endif
 
 .PHONY: build-classes Klasses
 build-classes Klasses: rt.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.420 kaffe/libraries/javalib/Makefile.in:1.421
--- kaffe/libraries/javalib/Makefile.in:1.420	Sat Apr  2 16:38:26 2005
+++ kaffe/libraries/javalib/Makefile.in	Sat Apr  2 19:20:44 2005
@@ -6077,20 +6077,32 @@
 	cd $(srcdir) && $(SHELL) $(top_srcdir)/developers/update-class-list
 
 .PHONY: compile-classes classes
-compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
-	rm -rf $(LIBDIR)
-	mkdir $(LIBDIR)
-	if test "$(PROFILE)" = default; then \
-		$(SHELL) $(rebuildLib) @all.files `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
-	else \
-		$(SHELL) $(rebuildLib) @$(PROFILE) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
-	fi
-	echo timestamp > $(LIBDIR)/stamp
 
 .PHONY: jar-classes
 @USE_PRECOMPILED_RT_JAR_TRUE at jar-classes: rt.jar
 @USE_PRECOMPILED_RT_JAR_TRUE at rt.jar: $(PATH_TO_RT_JAR)
 @USE_PRECOMPILED_RT_JAR_TRUE@	cp $< $@
+
+ at USE_PRECOMPILED_RT_JAR_TRUE@compile-tools-classes $(LIBDIR)/stamp: $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS)
+ at USE_PRECOMPILED_RT_JAR_TRUE@	rm -rf $(LIBDIR)
+ at USE_PRECOMPILED_RT_JAR_TRUE@	mkdir $(LIBDIR)
+ at USE_PRECOMPILED_RT_JAR_TRUE@	$(SHELL) $(rebuildLib) $(gnu_bytecode_SRCS) $(gnu_classpath_tools_javap_SRCS) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java
+ at USE_PRECOMPILED_RT_JAR_TRUE@	echo timestamp > $(LIBDIR)/stamp
+
+ at USE_PRECOMPILED_RT_JAR_TRUE@tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+ at USE_PRECOMPILED_RT_JAR_TRUE@	rm -f tools.jar
+ at USE_PRECOMPILED_RT_JAR_TRUE@	$(JAR_CMD7)
+ at USE_PRECOMPILED_RT_JAR_TRUE@	mv $@.new $@
+ at USE_PRECOMPILED_RT_JAR_FALSE@compile-classes $(LIBDIR)/stamp classes: $(rebuildLib) $(Klasses_jar_SRCS)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	rm -rf $(LIBDIR)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	mkdir $(LIBDIR)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	if test "$(PROFILE)" = default; then \
+ at USE_PRECOMPILED_RT_JAR_FALSE@		$(SHELL) $(rebuildLib) @all.files `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
+ at USE_PRECOMPILED_RT_JAR_FALSE@	else \
+ at USE_PRECOMPILED_RT_JAR_FALSE@		$(SHELL) $(rebuildLib) @$(PROFILE) `cd $(LIBDIR) && pwd`/../gnu/classpath/Configuration.java; \
+ at USE_PRECOMPILED_RT_JAR_FALSE@	fi
+ at USE_PRECOMPILED_RT_JAR_FALSE@	echo timestamp > $(LIBDIR)/stamp
+
 @USE_PRECOMPILED_RT_JAR_FALSE at jar-classes: rt.jar
 @USE_PRECOMPILED_RT_JAR_FALSE at rt.jar: $(LIBDIR)/stamp $(Klasses_jar_SRCS)
 @USE_PRECOMPILED_RT_JAR_FALSE@	rm -f rt.jar
@@ -6104,10 +6116,10 @@
 
 # Put gnu.bytecode into tools.jar to avoid problems
 # with applications using their own version of it.
-tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
-	rm -f tools.jar
-	$(JAR_CMD7)
-	mv $@.new $@
+ at USE_PRECOMPILED_RT_JAR_FALSE@tools.jar: $(LIBDIR)/stamp $(gnu_bytecode_SRCS)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	rm -f tools.jar
+ at USE_PRECOMPILED_RT_JAR_FALSE@	$(JAR_CMD7)
+ at USE_PRECOMPILED_RT_JAR_FALSE@	mv $@.new $@
 
 .PHONY: build-classes Klasses
 build-classes Klasses: rt.jar



More information about the kaffe mailing list