Remove Buck based build Bug: Issue https://github.com/google/gitiles/issues/88 Change-Id: Ifdb48360e62f416cfdd9c8c470c55e3b0f8020e3
diff --git a/.buckversion b/.buckversion deleted file mode 120000 index 6203e53..0000000 --- a/.buckversion +++ /dev/null
@@ -1 +0,0 @@ -bucklets/buckversion \ No newline at end of file
diff --git a/.gitignore b/.gitignore index d68222d..359d093 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,10 +1,8 @@ /.classpath /.project /.settings -/buck-out /eclipse-out /gitiles.config -/.buckd /.idea *.iml *~
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f5537df..0000000 --- a/.gitmodules +++ /dev/null
@@ -1,3 +0,0 @@ -[submodule "bucklets"] - path = bucklets - url = ../bucklets
diff --git a/.watchmanconfig b/.watchmanconfig deleted file mode 120000 index 65be7a7..0000000 --- a/.watchmanconfig +++ /dev/null
@@ -1 +0,0 @@ -bucklets/watchmanconfig \ No newline at end of file
diff --git a/BUCK b/BUCK deleted file mode 100644 index a8ccb68..0000000 --- a/BUCK +++ /dev/null
@@ -1,59 +0,0 @@ -include_defs('//VERSION') - -DEPS = [ - '//blame-cache:lib', - '//blame-cache:src', - '//blame-cache:javadoc', - '//gitiles-dev:dev', - '//gitiles-servlet:servlet', - '//gitiles-servlet:src', - '//gitiles-servlet:javadoc', -] - -java_library( - name = 'classpath', - deps = [ - '//gitiles-servlet:servlet', - '//gitiles-servlet:servlet_tests', - '//gitiles-dev:lib', - ] -) - -maven_package( - repository = 'gerrit-maven-repository', - url = 'gs://gerrit-maven', - version = GITILES_VERSION, - group = 'com.google.gitiles', - jar = { - 'blame-cache': '//blame-cache:lib', - 'gitiles-servlet': '//gitiles-servlet:servlet', - }, - src = { - 'blame-cache': '//blame-cache:src', - 'gitiles-servlet': '//gitiles-servlet:src', - }, - doc = { - 'blame-cache': '//blame-cache:javadoc', - 'gitiles-servlet': '//gitiles-servlet:javadoc', - }, -) - -def b(): - a = set() - for d in DEPS: - n,t = d.split(':') - q = "%s-%s" % (n[2:], t) - a.add(q) - out = "%s.jar" % q - genrule( - name = q, - cmd = 'ln -s $(location %s) $OUT' % d, - out = out, - ) - - zip_file( - name = 'all', - srcs = [':%s' % e for e in a], - ) - -b()
diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md index 2817dbb..f64b7d8 100644 --- a/Documentation/developer-guide.md +++ b/Documentation/developer-guide.md
@@ -4,19 +4,14 @@ ## Building -Gitiles requires [Buck](http://facebook.github.io/buck/) to build. +Gitiles requires [Bazel](https://bazel.build/) to build. + +You need to use Java for building Gitiles. You can install Bazel from the bazel.io: +https://bazel.build/versions/master/docs/install.html ``` -sudo apt-get install ant -cd ${HOME} -git clone https://github.com/facebook/buck.git -cd buck -ant -sudo ln -s ${PWD}/bin/buck /usr/bin/buck -cd /path/to/gitiles -git submodule update --init -buck build all -buck test + bazel build //... + bazel test //... ``` @@ -31,7 +26,7 @@ http://localhost:8080/ to view your local copy of gitiles, which will serve any repositories under `/path/to/repositories`. -To run unit tests, run `buck test`. +To run unit tests, run `bazel test ...`. ## Eclipse IDE @@ -39,7 +34,7 @@ If you'd like to use Eclipse to edit Gitiles, first generate a project file: ``` -./bucklets/tools/eclipse.py --src --exclude=servlet-api_2_5 +tools/eclipse/project.sh ``` Import the project in Eclipse:
diff --git a/VERSION b/VERSION deleted file mode 100644 index 61d6a75..0000000 --- a/VERSION +++ /dev/null
@@ -1 +0,0 @@ -include_defs('//version.bzl')
diff --git a/blame-cache/BUCK b/blame-cache/BUCK deleted file mode 100644 index e3a6428..0000000 --- a/blame-cache/BUCK +++ /dev/null
@@ -1,29 +0,0 @@ -SRCS = glob(['src/main/java/**/*.java']) -DEPS = [ - '//lib:guava', - '//lib/jgit:jgit', -] - -java_library( - name = 'lib', - srcs = SRCS, - deps = DEPS, - visibility = ['PUBLIC'], -) - -java_sources( - name = 'src', - srcs = SRCS, - visibility = ['//:'], -) - -java_doc( - name = 'javadoc', - title = 'Blame Cache API Documentation', - pkgs = ['com.google.gitiles.blame'], - paths = ['blame-cache/src/main/java'], - srcs = SRCS, - deps = DEPS, - visibility = ['//:'], - do_it_wrong = True, -)
diff --git a/bucklets b/bucklets deleted file mode 160000 index d93f264..0000000 --- a/bucklets +++ /dev/null
@@ -1 +0,0 @@ -Subproject commit d93f264f2e133e49d066814597f3fe682da3670f
diff --git a/bucklets.defs b/bucklets.defs deleted file mode 100644 index 20479b8..0000000 --- a/bucklets.defs +++ /dev/null
@@ -1,26 +0,0 @@ -import os -import sys - -d = os.getcwd() -while not os.path.lexists(os.path.join(d, '.buckversion')): - d = os.path.dirname(d) - -bd = os.path.join(d, 'bucklets') -if not os.path.isdir(bd) or not os.listdir(bd): - sys.stderr.write(('Bucklets directory is missing or empty: %s\n' - 'Run `git submodule update --init`') % bd) - sys.exit(1) - -bucklets = [ - 'java_doc.bucklet', - 'java_sources.bucklet', - 'maven_jar.bucklet', - 'maven_package.bucklet', -] - -for bucklet in bucklets: - path = os.path.join(bd, bucklet) - if not os.path.isfile(path): - sys.stderr.write('Missing bucklet: %s\n' % path) - sys.exit(1) - include_defs('//bucklets/%s' % bucklet)
diff --git a/fake_pom_deploy.xml b/fake_pom_deploy.xml deleted file mode 100644 index bd3ba0e..0000000 --- a/fake_pom_deploy.xml +++ /dev/null
@@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"> - <modelVersion>4.0.0</modelVersion> - <groupId>com.google.gitiles</groupId> - <artifactId>gitiles</artifactId> - <version>1</version> <!-- Do not edit; see VERSION. --> - <build> - <extensions> - <extension> - <groupId>com.googlesource.gerrit</groupId> - <artifactId>gs-maven-wagon</artifactId> - <version>3.3</version> - </extension> - </extensions> - </build> - <pluginRepositories> - <pluginRepository> - <id>gerrit-maven-repository</id> - <url>https://gerrit-maven.storage.googleapis.com/</url> - </pluginRepository> - </pluginRepositories> -</project>
diff --git a/fake_pom_install.xml b/fake_pom_install.xml deleted file mode 120000 index a10b576..0000000 --- a/fake_pom_install.xml +++ /dev/null
@@ -1 +0,0 @@ -fake_pom_deploy.xml \ No newline at end of file
diff --git a/gitiles-dev/BUCK b/gitiles-dev/BUCK deleted file mode 100644 index 76775ed..0000000 --- a/gitiles-dev/BUCK +++ /dev/null
@@ -1,25 +0,0 @@ -java_library( - name = 'lib', - srcs = glob(['src/main/java/**/*.java']), - deps = [ - '//blame-cache:lib', - '//gitiles-servlet:servlet', - '//lib:guava', - '//lib:servlet-api_3_0', - '//lib/jgit:jgit', - '//lib/jgit:jgit-servlet', - '//lib/jetty:server', - '//lib/jetty:servlet', - '//lib/slf4j:slf4j-api', - '//lib/slf4j:slf4j-simple', - '//lib/soy:soy', - ], - visibility = ['PUBLIC'], -) - -java_binary( - name = 'dev', - deps = [':lib'], - main_class = 'com.google.gitiles.dev.Main', - visibility = ['PUBLIC'], -)
diff --git a/gitiles-servlet/BUCK b/gitiles-servlet/BUCK deleted file mode 100644 index 97dde01..0000000 --- a/gitiles-servlet/BUCK +++ /dev/null
@@ -1,70 +0,0 @@ -SRCS = glob(['src/main/java/**/*.java']) -RSRC = glob(['src/main/resources/**/*']) -DEPS = [ - '//blame-cache:lib', - '//lib:commons-lang', - '//lib:gson', - '//lib:guava', - '//lib:joda-time', - '//lib:jsr305', - '//lib:commonmark', - '//lib:cm-autolink', - '//lib:gfm-tables', - '//lib:gfm-strikethrough', - '//lib:prettify', - '//lib/jgit:jgit', - '//lib/jgit:jgit-servlet', - '//lib/slf4j:slf4j-api', - '//lib/soy:soy', -] - -DEPS_ALL = DEPS + [ - '//lib/jgit:jgit-archive', - '//lib/guice:guice', -] - -java_library( - name = 'servlet', - srcs = SRCS, - resources = RSRC, - deps = DEPS_ALL, - provided_deps = ['//lib:servlet-api_2_5'], - visibility = ['PUBLIC'], -) - -java_test( - name = 'servlet_tests', - srcs = glob(['src/test/java/**/*.java']), - deps = DEPS_ALL + [ - ':servlet', - # Gitiles is designed to compile against the Servlet API v2.5. - '//lib:servlet-api_2_5', - '//lib:truth', - '//lib/jgit:junit', - '//lib/junit:junit', - ], - visibility = ['//:classpath'], -) - -java_sources( - name = 'src', - srcs = SRCS + RSRC, - visibility = ['PUBLIC'], -) - -java_doc( - name = 'javadoc', - title = 'Gitiles API Documentation', - pkgs = ['com.google.gitiles'], - paths = ['gitiles-servlet/src/main/java'], - srcs = SRCS, - deps = DEPS + [ - '//lib/guice:guice_library', - '//lib/guice:guice-assistedinject', - '//lib/guice:javax-inject', - '//lib/jgit:jgit-archive_library', - '//lib:servlet-api_2_5', - ], - visibility = ['PUBLIC'], - do_it_wrong = True, -)
diff --git a/lib/BUCK b/lib/BUCK deleted file mode 100644 index fadcefd..0000000 --- a/lib/BUCK +++ /dev/null
@@ -1,109 +0,0 @@ -maven_jar( - name = 'commons-lang', - id = 'org.apache.commons:commons-lang3:3.1', - sha1 = '905075e6c80f206bbe6cf1e809d2caa69f420c76', -) - -maven_jar( - name = 'gson', - id = 'com.google.code.gson:gson:2.7', - sha1 = '751f548c85fa49f330cecbb1875893f971b33c4e', -) - -maven_jar( - name = 'guava', - id = 'com.google.guava:guava:19.0', - sha1 = '6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9', -) - -maven_jar( - name = 'joda-time', - id = 'joda-time:joda-time:2.9.4', - sha1 = '1c295b462f16702ebe720bbb08f62e1ba80da41b', - exclude = [ - 'META-INF/LICENSE.txt', - 'META-INF/NOTICE.txt', - ], -) - -maven_jar( - name = 'jsr305', - id = 'com.google.code.findbugs:jsr305:3.0.0', - sha1 = '5871fb60dc68d67da54a663c3fd636a10a532948', - attach_source = False, -) - -maven_jar( - name = 'prettify', - id = 'prettify:java-prettify:1.2.1', - sha1 = '29ad8d072f9d0b83d1a2e9aa6ccb0905e6d543c6', - repository = GERRIT, -) - -COMMONMARK_VERSION = '0.6.0' -# When upgrading commonmark it should also be updated in plugins/gitiles -maven_jar( - name = 'commonmark', - id = 'com.atlassian.commonmark:commonmark:' + COMMONMARK_VERSION, - sha1 = '5df3f6fa3073966620685924aa22d08ece7213f2', - license = 'commonmark', -) - -maven_jar( - name = 'cm-autolink', - id = 'com.atlassian.commonmark:commonmark-ext-autolink:' + COMMONMARK_VERSION, - sha1 = '4d7e828a4651e2f590b4a059925991be58e62da6', - license = 'commonmark', - deps = [ - ':commonmark', - ':autolink', - ], -) - -maven_jar( - name = 'autolink', - id = 'org.nibor.autolink:autolink:0.5.0', - sha1 = 'dab74ea929a5fb4c99189af18c9528faf8d5340b', - license = 'autolink', -) - -maven_jar( - name = 'gfm-strikethrough', - id = 'com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:' + COMMONMARK_VERSION, - sha1 = '75a95aaec77810496de41239bcc773adfb13285f', - license = 'commonmark', - deps = [':commonmark'], -) - -maven_jar( - name = 'gfm-tables', - id = 'com.atlassian.commonmark:commonmark-ext-gfm-tables:' + COMMONMARK_VERSION, - sha1 = 'ae1c701517e8116bc205b561b9b215a53df8abc7', - license = 'commonmark', - deps = [':commonmark'], -) - -maven_jar( - name = 'servlet-api_2_5', - id = 'org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518', - sha1 = '9c16011c06bc6fe5e9dba080fcb40ddb4b75dc85', - unsign = True, -) - -maven_jar( - name = 'servlet-api_3_0', - id = 'org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016', - sha1 = '0aaaa85845fb5c59da00193f06b8e5278d8bf3f8', - unsign = True, -) - -maven_jar( - name = 'truth', - id = 'com.google.truth:truth:0.28', - sha1 = '0a388c7877c845ff4b8e19689dda5ac9d34622c4', - license = 'DO_NOT_DISTRIBUTE', - exported_deps = [ - ':guava', - '//lib/junit:junit', - ], -)
diff --git a/lib/guice/BUCK b/lib/guice/BUCK deleted file mode 100644 index 35790d7..0000000 --- a/lib/guice/BUCK +++ /dev/null
@@ -1,65 +0,0 @@ -VERSION = '4.1.0' -EXCLUDE = [ - 'META-INF/DEPENDENCIES', - 'META-INF/LICENSE', - 'META-INF/NOTICE', -] - -java_library( - name = 'guice', - exported_deps = [ - ':guice_library', - ':guice-assistedinject', - ':multibindings', - ':javax-inject', - ':aopalliance', - ], - visibility = ['PUBLIC'], -) - -maven_jar( - name = 'multibindings', - id = 'com.google.inject.extensions:guice-multibindings:' + VERSION, - sha1 = '3b27257997ac51b0f8d19676f1ea170427e86d51', - exclude_java_sources = True, - exclude = EXCLUDE + [ - 'META-INF/maven/com.google.guava/guava/pom.properties', - 'META-INF/maven/com.google.guava/guava/pom.xml', - ], - visibility = ['PUBLIC'], -) - -maven_jar( - name = 'guice_library', - id = 'com.google.inject:guice:' + VERSION, - sha1 = 'eeb69005da379a10071aa4948c48d89250febb07', - deps = [':aopalliance'], - exclude_java_sources = True, - exclude = EXCLUDE + [ - 'META-INF/maven/com.google.guava/guava/pom.properties', - 'META-INF/maven/com.google.guava/guava/pom.xml', - ], - visibility = ['PUBLIC'], -) - -maven_jar( - name = 'guice-assistedinject', - id = 'com.google.inject.extensions:guice-assistedinject:' + VERSION, - sha1 = 'af799dd7e23e6fe8c988da12314582072b07edcb', - exclude = EXCLUDE, -) - -maven_jar( - name = 'aopalliance', - id = 'aopalliance:aopalliance:1.0', - sha1 = '0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8', - visibility = ['//lib/guice:guice'], -) - -maven_jar( - name = 'javax-inject', - id = 'javax.inject:javax.inject:1', - sha1 = '6975da39a7040257bd51d21a231b76c915872d38', - visibility = ['PUBLIC'], -) -
diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK deleted file mode 100644 index c85c100..0000000 --- a/lib/jetty/BUCK +++ /dev/null
@@ -1,65 +0,0 @@ -VERS = '9.2.14.v20151106' -EXCLUDE = ['about.html'] - -maven_jar( - name = 'servlet', - id = 'org.eclipse.jetty:jetty-servlet:' + VERS, - sha1 = '3a2cd4d8351a38c5d60e0eee010fee11d87483ef', - deps = [ - ':security', - '//lib:servlet-api_3_0', # Different from the rest of gitiles-server. - ], - exclude = EXCLUDE, -) - -maven_jar( - name = 'security', - id = 'org.eclipse.jetty:jetty-security:' + VERS, - sha1 = '2d36974323fcb31e54745c1527b996990835db67', - deps = [':server'], - exclude = EXCLUDE, - visibility = [], -) - -maven_jar( - name = 'server', - id = 'org.eclipse.jetty:jetty-server:' + VERS, - sha1 = '70b22c1353e884accf6300093362b25993dac0f5', - exported_deps = [ - ':continuation', - ':http', - ], - exclude = EXCLUDE, -) - -maven_jar( - name = 'continuation', - id = 'org.eclipse.jetty:jetty-continuation:' + VERS, - sha1 = '8909d62fd7e28351e2da30de6fb4105539b949c0', - exclude = EXCLUDE, -) - -maven_jar( - name = 'http', - id = 'org.eclipse.jetty:jetty-http:' + VERS, - sha1 = '699ad1f2fa6fb0717e1b308a8c9e1b8c69d81ef6', - exported_deps = [':io'], - exclude = EXCLUDE, -) - -maven_jar( - name = 'io', - id = 'org.eclipse.jetty:jetty-io:' + VERS, - sha1 = 'dfa4137371a3f08769820138ca1a2184dacda267', - exported_deps = [':util'], - exclude = EXCLUDE, - visibility = [], -) - -maven_jar( - name = 'util', - id = 'org.eclipse.jetty:jetty-util:' + VERS, - sha1 = '0057e00b912ae0c35859ac81594a996007706a0b', - exclude = EXCLUDE, - visibility = [], -)
diff --git a/lib/jgit/BUCK b/lib/jgit/BUCK deleted file mode 100644 index 6c7b58a..0000000 --- a/lib/jgit/BUCK +++ /dev/null
@@ -1,83 +0,0 @@ -REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.6.0.201612231935-r.30-gd3148f300' - -maven_jar( - name = 'jgit', - id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, - sha1 = 'a2b5970b853f8fee64589fc1103c0ceb7677ba63', - repository = REPO, - unsign = True, - deps = [':ewah'], - exclude = [ - 'META-INF/eclipse.inf', - 'about.html', - 'plugin.properties', - ], -) - -maven_jar( - name = 'jgit-servlet', - id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, - sha1 = 'd3aa54bd610db9a5c246aa8fef13989982c98628', - repository = REPO, - deps = [':jgit'], - unsign = True, - exclude = [ - 'about.html', - 'plugin.properties', - ], -) - -java_library( - name = 'jgit-archive', - exported_deps = [ - ':jgit-archive_library', - ':commons-compress', - ':tukaani-xz', - ], - visibility = ['PUBLIC'], -) - -maven_jar( - name = 'jgit-archive_library', - id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, - sha1 = 'a728cf277396f1227c5a8dffcf5dee0188fc0821', - repository = REPO, - deps = [':jgit'], - unsign = True, - exclude = [ - 'about.html', - 'plugin.properties', - ], -) - -maven_jar( - name = 'junit', - id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, - sha1 = '6c2b2f192c95d25a2e1576aee5d1169dd8bd2266', - repository = REPO, - unsign = True, - deps = [':jgit'], -) - -maven_jar( - name = 'ewah', - id = 'com.googlecode.javaewah:JavaEWAH:1.1.6', - sha1 = '94ad16d728b374d65bd897625f3fbb3da223a2b6', -) - -maven_jar( - name = 'commons-compress', - id = 'org.apache.commons:commons-compress:1.7', - sha1 = 'ab365c96ee9bc88adcc6fa40d185c8e15a31410d', - exclude = ['META-INF/LICENSE.txt', 'META-INF/NOTICE.txt'], - visibility = ['//lib/jgit:jgit-archive'], -) - -maven_jar( - name = 'tukaani-xz', - id = 'org.tukaani:xz:1.4', - sha1 = '18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3', - attach_source = False, - visibility = ['//lib/jgit:jgit-archive'], -)
diff --git a/lib/junit/BUCK b/lib/junit/BUCK deleted file mode 100644 index a2f4093..0000000 --- a/lib/junit/BUCK +++ /dev/null
@@ -1,13 +0,0 @@ -maven_jar( - name = 'junit', - id = 'junit:junit:4.11', - sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0', - deps = [':hamcrest-core'], -) - -maven_jar( - name = 'hamcrest-core', - id = 'org.hamcrest:hamcrest-core:1.3', - sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0', - visibility = ['//lib/junit:junit'], -)
diff --git a/lib/slf4j/BUCK b/lib/slf4j/BUCK deleted file mode 100644 index 877deed..0000000 --- a/lib/slf4j/BUCK +++ /dev/null
@@ -1,17 +0,0 @@ -VERS = '1.7.7' - -maven_jar( - name = 'slf4j-api', - id = 'org.slf4j:slf4j-api:' + VERS, - sha1 = '2b8019b6249bb05d81d3a3094e468753e2b21311', - visibility = ['PUBLIC'], -) - - -maven_jar( - name = 'slf4j-simple', - id = 'org.slf4j:slf4j-simple:' + VERS, - sha1 = '8095d0b9f7e0a9cd79a663c740e0f8fb31d0e2c8', - deps = [':slf4j-api'], - visibility = ['PUBLIC'], -)
diff --git a/lib/soy/BUCK b/lib/soy/BUCK deleted file mode 100644 index a55edd0..0000000 --- a/lib/soy/BUCK +++ /dev/null
@@ -1,16 +0,0 @@ -# Keep this version of Soy synchronized with the version used in Gerrit. -maven_jar( - name = 'soy', - id = 'com.google.template:soy:2016-08-09', - sha1 = '43d33651e95480d515fe26c10a662faafe3ad1e4', - deps = [ - ':icu4j', - '//lib:jsr305', - ], -) - -maven_jar( - name = 'icu4j', - id = 'com.ibm.icu:icu4j:57.1', - sha1 = '198ea005f41219f038f4291f0b0e9f3259730e92', -)
diff --git a/tools/run_bazel_dev.sh b/tools/run_bazel_dev.sh deleted file mode 100755 index 57f365e..0000000 --- a/tools/run_bazel_dev.sh +++ /dev/null
@@ -1,32 +0,0 @@ -#!/bin/sh -# -# Copyright 2016 Google Inc. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -ROOT="$(cd $(dirname "$0")/..; pwd)" -PROPERTIES= -if [ "x$1" != "x" ]; then - PROPERTIES="--jvm_flag=-Dcom.google.gitiles.configPath=$1" -fi - -PROPERTIES="$PROPERTIES --jvm_flag=-Dcom.google.gitiles.sourcePath=$ROOT" - -( - cd "$ROOT" - bazel build gitiles-dev:dev -) - -sh $ROOT/bazel-bin/gitiles-dev/dev $PROPERTIES
diff --git a/tools/run_dev.sh b/tools/run_dev.sh index 58493a6..57f365e 100755 --- a/tools/run_dev.sh +++ b/tools/run_dev.sh
@@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2012 Google Inc. All Rights Reserved. +# Copyright 2016 Google Inc. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,14 +19,14 @@ ROOT="$(cd $(dirname "$0")/..; pwd)" PROPERTIES= if [ "x$1" != "x" ]; then - PROPERTIES="-Dcom.google.gitiles.configPath=$1" + PROPERTIES="--jvm_flag=-Dcom.google.gitiles.configPath=$1" fi -PROPERTIES="$PROPERTIES -Dcom.google.gitiles.sourcePath=$ROOT" +PROPERTIES="$PROPERTIES --jvm_flag=-Dcom.google.gitiles.sourcePath=$ROOT" ( cd "$ROOT" - buck build gitiles-dev:dev + bazel build gitiles-dev:dev ) -exec java $PROPERTIES -jar "$ROOT/buck-out/gen/gitiles-dev/dev.jar" +sh $ROOT/bazel-bin/gitiles-dev/dev $PROPERTIES