diff options
| author |  John Cater <jcater@google.com> | 2017-01-31 16:08:39 +0000 |
|---|---|---|
| committer |  Yun Peng <pcloudy@google.com> | 2017-02-01 08:54:55 +0000 |
| commit | e9552d4e09906d5abd823e8dd278483a095f956d (patch) | |
| tree | 20ddbe5376c8b451183931afcad9dc27d7890442 /scripts | |
| parent | 72c4071ebd436d4a043cc812221b36993dceb58e (diff) | |
Moved bazelrc and version.txt to scripts/packages to be more effectively shared.
--
Change-Id: I8c6d5cdbe9e2fc19ca6a626bea26944efa36e4db
Reviewed-on: https://cr.bazel.build/8550
PiperOrigin-RevId: 146120078
MOS_MIGRATED_REVID=146120078
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/packages/BUILD | 13 | ||||
| -rw-r--r-- | scripts/packages/bazel.bazelrc (renamed from scripts/packages/debian/bazel.bazelrc) | 0 | ||||
| -rw-r--r-- | scripts/packages/debian/BUILD | 12 |
3 files changed, 18 insertions, 7 deletions
diff --git a/scripts/packages/BUILD b/scripts/packages/BUILD index 2f240a0a09..1a9b05cdd1 100644 --- a/scripts/packages/BUILD +++ b/scripts/packages/BUILD @@ -88,3 +88,16 @@ self_extract_binary( ], launcher = ":launcher_bin.sh", ) + +genrule( + name = "embedded_label", + srcs = [], + outs = [ + "version.txt", + ], + cmd = + "find -L . -name stable-status.txt -exec cat '{}' ';'" + + " | grep EMBED_LABEL | cut -d ' ' -f 2-" + + " > $@\n", + stamp = 1, +) diff --git a/scripts/packages/debian/bazel.bazelrc b/scripts/packages/bazel.bazelrc index 9c5ab5a54d..9c5ab5a54d 100644 --- a/scripts/packages/debian/bazel.bazelrc +++ b/scripts/packages/bazel.bazelrc diff --git a/scripts/packages/debian/BUILD b/scripts/packages/debian/BUILD index ca822ff900..14030aaff7 100644 --- a/scripts/packages/debian/BUILD +++ b/scripts/packages/debian/BUILD @@ -19,10 +19,10 @@ pkg_tar( pkg_tar( name = "bazel-rc", - files = ["bazel.bazelrc"], + files = ["//scripts/packages:bazel.bazelrc"], mode = "0644", package_dir = "/etc", - strip_prefix = "debian", + strip_prefix = "/scripts/packages", ) genrule( @@ -50,14 +50,13 @@ pkg_tar( ) genrule( - name = "embedded_label", - srcs = [":debian-data"], + name = "debian_version", + srcs = ["//scripts/packages:version.txt"], outs = [ "version.txt", ], cmd = - "find -L . -name stable-status.txt -exec cat '{}' ';'" + - " | grep EMBED_LABEL | cut -d ' ' -f 2-" + + "cat $(location //scripts/packages:version.txt) " + # Debian package manager does not order our rcs correctly, insert a tilde # Non RC version number are not matched by the regex, example translations: # 0.1.2 0.1.2 @@ -65,7 +64,6 @@ genrule( # 0.1.2rc2-jdk7 0.1.2~rc2-jdk7 " | sed -E 's/^([0-9\\.]+)([^0-9\\.].*)$$/\\1~\\2/'" + " > $@\n", - stamp = 1, ) pkg_deb( |