diff options
| author | lana <none@none> | 2012-03-09 11:56:06 -0800 |
|---|---|---|
| committer | lana <none@none> | 2012-03-09 11:56:06 -0800 |
| commit | 73c4ec59dd8f227070600dae44b80b875159d57d (patch) | |
| tree | 57cf0fd50c7dfcce13f36fbf4b2c9e87329f1570 | |
| parent | d107a16c37d5089087b68332f80eae9785b377a7 (diff) | |
| parent | e44fae42dfc2945b665bc058b82c703bc797b159 (diff) | |
Mergejdk8-b30
| -rw-r--r-- | .hgignore | 1 | ||||
| -rw-r--r-- | make/Defs-internal.gmk | 2 | ||||
| -rw-r--r-- | make/jprt.properties | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -3,3 +3,4 @@ /nbproject/private/ ^webrev ^.hgtip +.DS_Store diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index 89ca1c1..bc3f32b 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -79,7 +79,7 @@ endef # Find all build_time_* files and print their contents in a list sorted # on the name of the sub repository. define ReportBuildTimes -$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ +$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \ $1 \ "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \ "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \ diff --git a/make/jprt.properties b/make/jprt.properties index b9c8d5b..abe0c1f 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -39,6 +39,7 @@ jprt.build.targets= \ solaris_x64_5.10-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ + macosx_x64_10.7-{product|fastdebug}, \ windows_i586_5.1-{product|fastdebug}, \ windows_x64_5.2-{product|fastdebug} @@ -53,6 +54,7 @@ jprt.my.test.target.set= \ solaris_x64_5.10-product-c2-TESTNAME, \ linux_i586_2.6-product-{c1|c2}-TESTNAME, \ linux_x64_2.6-product-c2-TESTNAME, \ + macosx_x64_10.7-product-c2-TESTNAME, \ windows_i586_5.1-product-c1-TESTNAME, \ windows_x64_5.2-product-c2-TESTNAME |