aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2016-10-07 17:19:42 +0000
committerGravatar John Cater <jcater@google.com>2016-10-07 17:47:45 +0000
commit6aa2c274c1ca80e3f34bf02ef6d6c3e785a2ceaf (patch)
treebf91c8f74334f7c58168b27c217028d32a5b01ab /src
parenta33bea34c134084b37a16c842c1400a5c9b0d2ab (diff)
Fix build on Windows
As a fallout of commit 6f23b13fb27b5eecaaf624cb82dd85f9c1cd8f3b, the windows build was broken because it somehow try to build the skylark shell which was no longer buildable. Adding the necessary target to the BUILD files -- MOS_MIGRATED_REVID=135488847
Diffstat (limited to 'src')
-rw-r--r--src/BUILD1
-rw-r--r--src/main/java/com/google/devtools/skylark/BUILD19
-rw-r--r--src/test/java/com/google/devtools/build/lib/BUILD12
3 files changed, 20 insertions, 12 deletions
diff --git a/src/BUILD b/src/BUILD
index 29054f6ad0..5c730f185e 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -300,6 +300,7 @@ filegroup(
"//src/main/java/com/google/devtools/build/lib:srcs",
"//src/main/java/com/google/devtools/build/skyframe:srcs",
"//src/main/java/com/google/devtools/common/options:srcs",
+ "//src/main/java/com/google/devtools/skylark:srcs",
"//src/main/native:srcs",
"//src/main/protobuf:srcs",
"//src/main/tools:srcs",
diff --git a/src/main/java/com/google/devtools/skylark/BUILD b/src/main/java/com/google/devtools/skylark/BUILD
new file mode 100644
index 0000000000..6a05f40d18
--- /dev/null
+++ b/src/main/java/com/google/devtools/skylark/BUILD
@@ -0,0 +1,19 @@
+# The Skylark interpreter
+# Open-sourced as part of Bazel.
+
+package(default_visibility = ["//src:__subpackages__"])
+
+java_binary(
+ name = "Skylark",
+ srcs = ["Skylark.java"],
+ main_class = "com.google.devtools.skylark.Skylark",
+ deps = [
+ "//src/main/java/com/google/devtools/build/lib:events",
+ "//src/main/java/com/google/devtools/build/lib:packages-internal",
+ ],
+)
+
+filegroup(
+ name = "srcs",
+ srcs = glob(["**"]),
+)
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index aebe6e1a14..137bfe8638 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -732,18 +732,6 @@ java_test(
],
)
-java_binary(
- name = "skylarkshell",
- srcs = ["syntax/SkylarkShell.java"],
- main_class = "com.google.devtools.build.lib.syntax.SkylarkShell",
- deps = [
- "//src/main/java/com/google/devtools/build/lib:bazel-main",
- "//src/main/java/com/google/devtools/build/lib:bazel-rules",
- "//src/main/java/com/google/devtools/build/lib:events",
- "//src/main/java/com/google/devtools/build/lib:packages",
- ],
-)
-
java_test(
name = "syntax_test",
srcs = glob([