Merge branch 'master' of github.com:thought-machine/please

thought-machine · Feb 10, 2016 · a3ea404 · a3ea404
2 parents 0b7a0ea + f2034d1
commit a3ea404
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/.plzconfig b/.plzconfig
@@ -16,7 +16,7 @@ buildfilename = BUILD_
 
 [go]
 version = 1.5.3
-testtool = //src/build/go:plz_go_test
+testtool = //src/build/go:please_go_test
 
 [cpp]
 defaultnamespace = thought_machine

diff --git a/BUILD b/BUILD
@@ -11,7 +11,7 @@ filegroup(
         '//src/cache/tools:cache_cleaner',
         '//src/cache/server:http_cache_server_bin',
         '//src/cache/server:rpc_cache_server_bin',
-        '//src/build/go:plz_go_test',
+        '//src/build/go:please_go_test',
         '//src/build/java:jarcat',
         '//src/build/java:please_maven',
         '//src/misc:plz_diff_graphs',

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Version 1.5.3
+-------------
+
+    * Fix tarballs to be consistent about /opt/please/please_go_test.
+
+
 Version 1.5.2
 -------------
 

diff --git a/install.sh b/install.sh
@@ -30,7 +30,7 @@ else
     chmod 0775 /opt/please/cache_cleaner
     cp plz-out/bin/src/misc/plz_diff_graphs /opt/please/please_diff_graphs
     chmod 0775 /opt/please/please_diff_graphs
-    cp plz-out/bin/src/build/go/plz_go_test /opt/please/please_go_test
+    cp plz-out/bin/src/build/go/please_go_test /opt/please/please_go_test
     chmod 0775 /opt/please/please_go_test
     ln -sf /opt/please/please /usr/local/bin/plz
     echo "Please installed"

diff --git a/package/BUILD b/package/BUILD
@@ -9,7 +9,7 @@ fpm_deb(
         '/opt/please/cache_cleaner': '//src/cache/tools:cache_cleaner',
         '/opt/please/jarcat': '//src/build/java:jarcat',
         '/opt/please/please_diff_graphs': '//src/misc:plz_diff_graphs',
-        '/opt/please/please_go_test': '//src/build/go:plz_go_test',
+        '/opt/please/please_go_test': '//src/build/go:please_go_test',
     },
     links = {
         '/usr/bin/plz': '/opt/please/please',
@@ -61,7 +61,7 @@ tarball(
         '//src/build/java:jarcat',
         '//src/build/java:please_maven',
         '//src/misc:plz_diff_graphs',
-        '//src/build/go:plz_go_test',
+        '//src/build/go:please_go_test',
     ],
     subdir = 'please',
     out = 'please.tar.gz',

diff --git a/src/build/go/BUILD b/src/build/go/BUILD
@@ -8,7 +8,7 @@ go_library(
 )
 
 go_binary(
-    name = 'plz_go_test',
+    name = 'please_go_test',
     main = 'plz_go_test.go',
     deps = [
         ':buildgo',