Merge pull request #307 from pjk25/fix-app_src-default

Only apply the default for app_src of erlang_app_sources if unset
rabbitmq · Aug 13, 2024 · 4a234ef · 4a234ef
2 parents 7782917 + 6cf35ec
commit 4a234ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/erlang_app_sources.bzl b/erlang_app_sources.bzl
@@ -12,10 +12,10 @@ def erlang_app_sources(
         priv = None,
         license_files = None,
         **kwargs):
-
-    app_src_paths = native.glob(["src/%s.app.src" % app_name])
-    if len(app_src_paths) == 1:
-        app_src = app_src_paths[0]
+    if app_src == None:
+        app_src_paths = native.glob(["src/%s.app.src" % app_name])
+        if len(app_src_paths) == 1:
+            app_src = app_src_paths[0]
 
     if public_hdrs == None:
         public_hdrs = native.glob([

diff --git a/examples/basic/BUILD.bazel b/examples/basic/BUILD.bazel
@@ -44,15 +44,13 @@ erlc_opts_file(
 erlang_app_sources(
     name = "%s_srcs" % APP_NAME,
     app_name = APP_NAME,
-    app_src = ":app_src",
     erlc_opts_file = ":erlc_opts_file",
     visibility = ["//visibility:public"],
 )
 
 erlang_app_sources(
     name = "test_%s_srcs" % APP_NAME,
     app_name = APP_NAME,
-    app_src = ":app_src",
     erlc_opts_file = ":test_erlc_opts_file",
     visibility = ["//visibility:public"],
 )