Merge
authorschien
Mon, 02 May 2011 09:35:47 -0700
changeset 9312 0f69dca4aa47
parent 9311 30fbc94c5387 (current diff)
parent 9310 8394bb7065f9 (diff)
child 9349 ae1dcd2f8345
Merge
--- a/.hgignore	Thu Apr 28 17:44:13 2011 -0700
+++ b/.hgignore	Mon May 02 09:35:47 2011 -0700
@@ -2,3 +2,4 @@
 ^dist/
 /nbproject/private/
 ^webrev
+^.hgtip
--- a/Makefile	Thu Apr 28 17:44:13 2011 -0700
+++ b/Makefile	Mon May 02 09:35:47 2011 -0700
@@ -97,7 +97,7 @@
 endef
 
 # Generic build of basic repo series
-generic_build_repo_series::
+generic_build_repo_series:: $(SOURCE_TIPS)
 	$(MKDIR) -p $(OUTPUTDIR)
 	$(MKDIR) -p $(OUTPUTDIR)/j2sdk-image
 	@$(call StartTimer)
@@ -243,6 +243,14 @@
 debug_build:: build_debug_image
 fastdebug_build:: build_fastdebug_image
 
+# The source tips are stored with the relative path to the repo.
+#   This file will be used when constructing the jdk image.
+source_tips: $(SOURCE_TIPS)
+	$(CAT) $<
+$(SOURCE_TIPS): FRC
+	@$(prep-target)
+	@$(call GetSourceTips)
+
 clobber:: REPORT_BUILD_TIMES=
 clobber:: 
 	$(RM) -r $(OUTPUTDIR)/*