aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichaelm <none@none>2012-03-06 20:25:18 +0000
committermichaelm <none@none>2012-03-06 20:25:18 +0000
commit16257ffdb315c6aaea0548288d8d24a7f349a7b2 (patch)
tree778de77a04a50d2dae6f80abd3b15d136ad03d7a
parent8f283c4d9a0fe22ec4c3ad49e0bebe1bce121866 (diff)
7113349: Initial changeset for Macosx port to jdk
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks Contributed-by: Alan Bateman <alan.bateman@oracle.com>, Alexander Potochkin <alexander.potochkin@oracle.com>, Alexander Zuev <alexander.zuev@oracle.com>, Andrew Brygin <andrew.brygin@oracle.com>, Artem Ananiev <artem.ananiev@oracle.com>, Alex Strange <astrange@apple.com>, Bino George <bino@apple.com>, Christine Lu <christine.lu@oracle.com>, David Katleman <david.katleman@oracle.com>, David Durrence <david_durrence@apple.com>, Dmitry Cherepanov <dmitry.cherepanov@oracle.com>, Greg Lewis <glewis@eyesbeyond.com>, Kevin Miller <kevin_m_miller@apple.com>, Kurt Miller <kurt@intricatesoftware.com>, Landon Fuller <landonf@plausiblelabs.com>, Leonid Romanov <leonid.romanov@oracle.com>, Loefty Walkowiak <loefty@apple.com>, Mark Reinhold <mark.reinhold@oracle.com>, Naoto Sato <naoto.sato@oracle.com>, Philip Race <philip.race@oracle.com>, Roger Hoover <rhoover@apple.com>, Scott Kovatch <scott.kovatch@oracle.com>, Sergey ByloKhov <sergey.bylokhov@oracle.com>, Mike Swingler <swingler@apple.com>, Tomas Hurka <tomas.hurka@oracle.com>
-rw-r--r--.hgignore1
-rw-r--r--make/Defs-internal.gmk2
-rw-r--r--make/jprt.properties2
3 files changed, 4 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index 8fde2ca..156055a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -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