Merge pull request #181 from mering/fix-new-bazel

Fix rules_cc and rules_shell usage

Author: aiuto

MODULE.bazel

@@ -17,5 +17,6 @@ bazel_dep(name = "rules_cc", version = "0.2.2", dev_dependency = True)
 bazel_dep(name = "rules_java", version = "8.16.1", dev_dependency = True)
 bazel_dep(name = "rules_pkg", version = "1.0.1", dev_dependency = True)
 bazel_dep(name = "rules_python", version = "0.35.0", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
 bazel_dep(name = "rules_testing", version = "0.6.0", dev_dependency = True)
 bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True)

examples/manifest/BUILD

@@ -30,6 +30,7 @@ android_binary(
     data = [
         ":licenses",
     ],
+    use_bash_launcher = True,
 )
 
 golden_cmd_test(

examples/manifest/android_mock.bzl

@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+load("@rules_shell//shell:sh_library.bzl", "sh_library")
 load("manifest.bzl", "manifest")
 
 """This is a proof of concept to show how to modify a macro definition to
@@ -15,7 +17,7 @@ def android_library(name, **kwargs):
     )
 
     # Inject the data dependency into the library, preserving any other data it has.
-    native.sh_library(
+    sh_library(
         name = name + "_w_licenses",
         data = data + [name + "_manifest.txt"],
         **kwargs
@@ -55,7 +57,7 @@ def android_binary(name, **kwargs):
     kwargs["data"] = newdeps
 
     # Compile the executable with the user's originally supplied name, but with the new content.
-    native.sh_binary(
+    sh_binary(
         name = name,
         **kwargs
     )

examples/manifest/license_display.sh

@@ -2,6 +2,6 @@
 
 function display_licenses {
   echo -n "Licenses: "
-  cat "$0.runfiles/rules_license/examples/manifest/licenses_manifest.txt"
+  cat "$(rlocation "rules_license/examples/manifest/licenses_manifest.txt")"
   echo
 }

examples/manifest/main.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 
-#source gbash.sh || exit
-
-#source "$RUNFILES/google3/tools/build_defs/license/examples/manifest/license_display.sh"
-source "$0.runfiles/rules_license/examples/manifest/license_display.sh"
-#source module google3/tools/build_defs/license/examples/manifest/license_display.sh
+source "$(rlocation "rules_license/examples/manifest/license_display.sh")"
 
 echo "I am a program that uses open source code."
 display_licenses

examples/vndor/acme/BUILD

@@ -13,6 +13,7 @@
 # limitations under the License.
 # A package with a commercial license.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_license//rules:license.bzl", "license")
 
 package(

examples/vndor/libhhgttg/BUILD

@@ -14,6 +14,7 @@
 # A package with all code under a single license. This is the most common case
 # we expect to see.
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
 load("@rules_license//rules:license.bzl", "license")
 
 # Using a package wide default ensure that all targets are associated with the

tools/test_helpers.bzl

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
+
 """Compare rule output to a golden version."""
 
 def golden_test(
@@ -25,7 +27,7 @@ def golden_test(
       golden: expected content of subect
       subject: build target
     """
-    native.sh_test(
+    sh_test(
         name = name,
         size = "medium",
         srcs = ["@rules_license//tools:diff_test.sh"],