Dissolve top level gitiles-* directories
The current layout of having gitiles-* directories with separate java
source trees dates back to the bad era of Maven, when this specific
layout was necessary to decompose the build into separate pom.xml files.
Moreover, src/{main,test}/java are also Maven artifacts, so that we go
even further and create three top level directories:
* java
* javatests
* resources
Change-Id: I4421096428db1e3de019a9b6c1253217cf7e4fbe
diff --git a/tools/bazlets.bzl b/tools/bazlets.bzl
index e14e488..b5c240c 100644
--- a/tools/bazlets.bzl
+++ b/tools/bazlets.bzl
@@ -1,7 +1,7 @@
NAME = "com_googlesource_gerrit_bazlets"
def load_bazlets(
- commit,
+ commit = None,
local_path = None
):
if not local_path:
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index 45ad493..f6a1b35 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -2,8 +2,8 @@
load("@com_googlesource_gerrit_bazlets//tools:py_binary_path.bzl", "py_binary_path")
DEPS = [
- "//gitiles-servlet:servlet",
- "//gitiles-dev:lib",
+ "//java/com/google/gitiles:servlet",
+ "//java/com/google/gitiles/dev:lib",
]
java_library(
@@ -15,7 +15,7 @@
name = "main_classpath_collect",
testonly = 1,
deps = DEPS + [
- "//gitiles-servlet:servlet_tests",
+ "//javatests/com/google/gitiles:servlet_tests",
],
)
diff --git a/tools/maven/BUILD b/tools/maven/BUILD
index 5efc003..b2d424a 100644
--- a/tools/maven/BUILD
+++ b/tools/maven/BUILD
@@ -3,17 +3,17 @@
maven_package(
src = {
- "blame-cache": "//blame-cache:libblame-cache-src.jar",
- "gitiles-servlet": "//gitiles-servlet:libservlet-src.jar",
+ "blame-cache": "//java/com/google/gitiles:libblame-cache-src.jar",
+ "gitiles-servlet": "//java/com/google/gitiles:libservlet-src.jar",
},
doc = {
- "blame-cache": "//blame-cache:javadoc",
- "gitiles-servlet": "//gitiles-servlet:javadoc",
+ "blame-cache": "//java/com/google/gitiles:blame-cache-javadoc",
+ "gitiles-servlet": "//java/com/google/gitiles:servlet-javadoc",
},
group = "com.google.gitiles",
jar = {
- "blame-cache": "//blame-cache:blame-cache",
- "gitiles-servlet": "//gitiles-servlet:servlet",
+ "blame-cache": "//java/com/google/gitiles:blame-cache",
+ "gitiles-servlet": "//java/com/google/gitiles:servlet",
},
repository = "gerrit-maven-repository",
url = "gs://gerrit-maven",
diff --git a/tools/run_dev.sh b/tools/run_dev.sh
index ce1afa3..497e9d3 100755
--- a/tools/run_dev.sh
+++ b/tools/run_dev.sh
@@ -26,7 +26,7 @@
(
cd "$ROOT"
- bazel build gitiles-dev:dev
+ bazel build java/com/google/gitiles/dev
)
-"$ROOT/bazel-bin/gitiles-dev/dev" $PROPERTIES
+"$ROOT/bazel-bin/java/com/google/gitiles/dev/dev" $PROPERTIES