Merge

1dc2f6b3 · duke · 999bbbf2 · 4006fa68 · 1dc2f6b3 · 1dc2f6b3
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

.hgtags-top-repo .hgtags-top-repo +1 -0

hotspot/.hgtags hotspot/.hgtags +1 -0

jdk/.hgtags jdk/.hgtags +1 -0

make/sanity-rules.gmk make/sanity-rules.gmk +1 -1

未找到文件。
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -76,3 +76,4 @@ cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96
 e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
 b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100
 4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101
+a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -106,3 +106,4 @@ d38f45079fe98792a7381dbb4b64f5b589ec8c58 jdk7-b94
 ad1977f08c4d69162a0775fe3f9576b9fd521d10 jdk7-b100
 6c3a919105b68c15b7db923ec9a00006e9560910 jdk7-b101
 ad1977f08c4d69162a0775fe3f9576b9fd521d10 hs19-b03
+c5cadf1a07717955cf60dbaec16e35b529fd2cb0 jdk7-b102
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -76,3 +76,4 @@ b1903d7528d33b521df42bc9291bdcdd2f444a29 jdk7-b97
 2587c9f0b60dc3146b4247b8674ada456a643d6f jdk7-b99
 820b4e843d5168370a3bf166d19751a3271d8575 jdk7-b100
 d58354a69011f3d3354765fa3167567c4c4a9612 jdk7-b101
+13029a61b16bec06535d4f0aa98229b358684128 jdk7-b102
--- a/make/sanity-rules.gmk
+++ b/make/sanity-rules.gmk
@@ -228,7 +228,7 @@ endif
 ######################################################
 alt_bootdir:
 ifdef ALT_BOOTDIR
-	@if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -ci '^([a-z]:)?/'` -ne 1 ]; then \
+	@if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
 	  $(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \
 	    "      not a Relative Path Name. \n" \
 	    "      The current value of ALT_BOOTDIR is \n" \