Enforce UTF-8 encoding in bootstrapping
This is breaking our CI system. Also removed the UTF-8 quotes.
--
MOS_MIGRATED_REVID=103534994
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 1dbc287..57c5d29 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -211,7 +211,7 @@
run_silent "${JAVAC}" -classpath "${classpath}" -sourcepath "${sourcepath}" \
-d "${output}/classes" -source "$JAVA_VERSION" -target "$JAVA_VERSION" \
- "@${paramfile}"
+ -encoding UTF-8 "@${paramfile}"
log "Extracting helper classes for $name..."
for f in ${library_jars} ; do
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
index 89167dd..a315716 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/PackageIdentifier.java
@@ -111,8 +111,8 @@
}
pos++;
- // Disallow strings starting with “/”, “./”, or “../”
- // Disallow strings identical to ".", or “..”
+ // Disallow strings starting with "/", "./", or "../"
+ // Disallow strings identical to ".", or ".."
if (name.charAt(pos) == '/') {
return "workspace names are not allowed to start with '@/'";
} else if (name.charAt(pos) == '.') {
@@ -131,8 +131,8 @@
// This lexes the first letter a second time, to make sure it fulfills the general
// workspace name criteria (as well as the more strict criteria for the beginning of a
// workspace name).
- // Disallow strings containing “//”, “/./”, or “/../”
- // Disallow strings ending in “/”, "/.", or “/..”
+ // Disallow strings containing "//", "/./", or "/../"
+ // Disallow strings ending in "/", "/.", or "/.."
// name = @( <alphanum> | [/._-] )*
for (; pos < name.length(); pos++) {
char c = name.charAt(pos);
