diff options
| author |  László Csomor <laszlocsomor@google.com> | 2017-10-09 09:11:08 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-10-09 10:06:54 +0200 |
| commit | aa0299092d8a4692cb89be2d9e2e890a2e8d7aeb (patch) | |
| tree | 3297a19b2f533ec9046cd41377f589034756d1e2 /src/main | |
| parent | b45d5f536048db0e568e16417f4fb1d50f01e1ac (diff) | |
Clean up TODOs.
In this commit:
* buildenv.sh: restore its state to that as of
commit 511c35b46cead500d4e76706e0a709e50995ceba
* CommonCommandOptions.java: remove a deprecated
no-op flag
* WindowsPathFragment.java: implement an
ASCII-only isLetter function, use that instead
of Character.isLetter, because the latter
returns true for some Unicode characters too
* bazel_bootstrap_distfile_test: remove logging
that we no longer need, since the bugfix for
issue #3618 will be pushed to GitHub later today
Change-Id: Ibda70219e974f0c47bc82addc647d8951f4bd701
PiperOrigin-RevId: 171498977
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 19 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java index 0800367703..492cef9a1d 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java @@ -154,20 +154,6 @@ public class CommonCommandOptions extends OptionsBase { ) public List<Map.Entry<String, String>> clientEnv; - @Deprecated - @Option( - name = "ignore_client_env", - defaultValue = "false", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - metadataTags = {OptionMetadataTag.HIDDEN, OptionMetadataTag.DEPRECATED}, - effectTags = {OptionEffectTag.NO_OP}, - deprecationWarning = "Deprecated, no-op.", - help = "Deprecated, no-op." - ) - // TODO(laszlocsomor, dslomov) 2017-03-07: remove this flag after 2017-06-01 (~3 months from now) - // and all of its occurrences. - public boolean ignoreClientEnv; - @Option( name = "client_cwd", defaultValue = "", diff --git a/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java b/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java index 4f94535acf..695282f003 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/WindowsPathFragment.java @@ -56,11 +56,14 @@ abstract class WindowsPathFragment extends PathFragment { // primary separator char and do not use this. private static final char EXTRA_SEPARATOR_CHAR = '\\'; + private static boolean isDriveLetter(char c) { + return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); + } + @Override PathFragment create(String path) { - // TODO(laszlocsomor): Character#isLetter returns true for some non ASCII characters. char driveLetter = - path.length() >= 2 && path.charAt(1) == ':' && Character.isLetter(path.charAt(0)) + path.length() >= 2 && path.charAt(1) == ':' && isDriveLetter(path.charAt(0)) ? Character.toUpperCase(path.charAt(0)) : '\0'; if (driveLetter != '\0') { diff --git a/src/main/native/BUILD b/src/main/native/BUILD index ad60099671..b2f6536a3e 100644 --- a/src/main/native/BUILD +++ b/src/main/native/BUILD @@ -85,9 +85,6 @@ filegroup( visibility = ["//src:__pkg__"], ) -# TODO(laszlocsomor): move the common parts needed both by the Windows JNI lib -# and the Bazel client into a separate library, and only copy those to the -# embedded tools folder. filegroup( name = "embedded_tools", srcs = glob(["*.cc"]) + glob(["*.h"]) + [ |