OpenJDK / amber / amber
changeset 9349:ae1dcd2f8345
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 17:42:37 +0200 |
| parents | dbc77e0dc173 0f69dca4aa47 |
| children | 581a4aeb69c7 |
| files | |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Tue May 03 16:03:37 2011 -0700 +++ b/.hgignore Wed Jul 05 17:42:37 2017 +0200 @@ -2,3 +2,4 @@ ^dist/ /nbproject/private/ ^webrev +^.hgtip
--- a/.hgtags-top-repo Tue May 03 16:03:37 2011 -0700 +++ b/.hgtags-top-repo Wed Jul 05 17:42:37 2017 +0200 @@ -114,3 +114,4 @@ 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139 +dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
--- a/Makefile Tue May 03 16:03:37 2011 -0700 +++ b/Makefile Wed Jul 05 17:42:37 2017 +0200 @@ -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)/*