From a56be81a338b450d55cb30df703bd01da9e91851 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Wed, 19 Sep 2018 12:44:24 +0800 Subject: [PATCH] Use Bazel to build GMavenToBazel --- BUILD | 7 +++++++ README.md | 5 ++--- WORKSPACE | 10 ++++++++-- .../com/google/gmaven/GMavenToBazel.java | 2 ++ 4 files changed, 19 insertions(+), 5 deletions(-) rename GMavenToBazel.java => java/com/google/gmaven/GMavenToBazel.java (99%) diff --git a/BUILD b/BUILD index 2cd5ddf3..c66c68b1 100644 --- a/BUILD +++ b/BUILD @@ -1 +1,8 @@ licenses(["notice"]) # Apache 2.0 + + +java_binary( + name = "gmaven_to_bazel", + srcs = ["java/com/google/gmaven/GMavenToBazel.java"], + main_class = "com.google.gmaven.GMavenToBazel", +) diff --git a/README.md b/README.md index 0daea8d3..c5cdcae7 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,12 @@ You can see the full list of generated targets in # Updating gmaven.bzl -To update `gmaven.bzl`, run the following command. It will take about 5 minutes. +To update `gmaven.bzl`, run the following command. It will take about 3 minutes. ``` -rm gmaven.bzl && javac GMavenToBazel.java && java GMavenToBazel +bazel build //:gmaven_to_bazel_deploy.jar && java -jar bazel-bin/gmaven_to_bazel_deploy.jar ``` - # Known issues Currently, cross-repository dependency resolution is not supported. Some of the diff --git a/WORKSPACE b/WORKSPACE index 556c7e73..6db8902a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,4 +1,10 @@ -android_sdk_repository(name = 'androidsdk') -local_repository(name = 'gmaven_rules', path = '.') +android_sdk_repository( + name = 'androidsdk', +) + +local_repository( + name = 'gmaven_rules', + path = '.', +) load('@gmaven_rules//:gmaven.bzl', 'gmaven_rules') gmaven_rules() diff --git a/GMavenToBazel.java b/java/com/google/gmaven/GMavenToBazel.java similarity index 99% rename from GMavenToBazel.java rename to java/com/google/gmaven/GMavenToBazel.java index c507dc26..9e3844d9 100644 --- a/GMavenToBazel.java +++ b/java/com/google/gmaven/GMavenToBazel.java @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License.import java.io.FileWriter; +package com.google.gmaven; + import java.io.BufferedInputStream; import java.io.BufferedWriter; import java.io.FileWriter;