# HG changeset patch # User schien # Date 1304354147 25200 # Node ID c6569c5585851dfd39b8de8e021c3c312f51af12 # Parent 13db01f974ceee66a5197c87aa4efd3ddb330a51# Parent fb9ee99c43327d6f84a31111db35ab9869c4383c Merge diff -r 13db01f974ce -r c6569c558585 .hgignore --- 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 diff -r 13db01f974ce -r c6569c558585 Makefile --- 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)/*