aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/BUILD2
-rw-r--r--src/main/java/com/google/devtools/build/lib/Constants.java17
2 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/BUILD b/src/main/java/BUILD
index c908b47af5..58e6ce0132 100644
--- a/src/main/java/BUILD
+++ b/src/main/java/BUILD
@@ -110,6 +110,6 @@ genrule(
cmd = ("$(location docgen_bin)" +
" $$PWD/src/main/java/com/google/devtools/build/lib" +
" $$PWD" +
- "; cp $$PWD/build-encyclopedia.html $@"),
+ " && cp $$PWD/build-encyclopedia.html $@"),
tools = [":docgen_bin"],
)
diff --git a/src/main/java/com/google/devtools/build/lib/Constants.java b/src/main/java/com/google/devtools/build/lib/Constants.java
index 5437dae682..8161874b5c 100644
--- a/src/main/java/com/google/devtools/build/lib/Constants.java
+++ b/src/main/java/com/google/devtools/build/lib/Constants.java
@@ -33,19 +33,18 @@ public class Constants {
public static final ImmutableList<String> WATCHFS_BLACKLIST = ImmutableList.of();
public static final String PRELUDE_FILE_DEPOT_RELATIVE_PATH = "tools/build_rules/prelude_bazel";
-
+
/**
- * List of common attributes documentation, relative to {@link com.google.devtools.build.docgen}.
+ * List of common attributes documentation, relative to {@link com.google.devtools.build.docgen}.
*/
public static final ImmutableList<String> COMMON_ATTRIBUTES_DOCFILES = ImmutableList.of(
- "templates/attributes/common/deps.html",
"templates/attributes/common/data.html",
- "templates/attributes/common/licenses.html",
+ "templates/attributes/common/deprecation.html",
+ "templates/attributes/common/deps.html",
"templates/attributes/common/distribs.html",
- "templates/attributes/common/deprecation.html",
- "templates/attributes/common/obsolete.html",
- "templates/attributes/common/testonly.html",
- "templates/attributes/common/tags.html",
+ "templates/attributes/common/licenses.html",
+ "templates/attributes/common/tags.html",
+ "templates/attributes/common/testonly.html",
"templates/attributes/common/visibility.html");
/**
@@ -53,7 +52,7 @@ public class Constants {
* {@link com.google.devtools.build.docgen}.
*/
public static final ImmutableList<String> BINARY_ATTRIBUTES_DOCFILES = ImmutableList.of(
- "templates/attributes/binary/args.html",
+ "templates/attributes/binary/args.html",
"templates/attributes/binary/output_licenses.html");
/**