Merge pull request #36 from rabbitmq/project-app-extra-keys

Handle PROJECT_APP_EXTRA_KEYS when auto-importing erlang.mk apps

Author: HoloRin

app_file.bzl

@@ -2,11 +2,22 @@ load("//private:app_file.bzl", "app_file_private")
 
 _stamp_condition = str(Label("//private:private_stamp_detect"))
 
-def app_file(**kwargs):
+def app_file(
+        app_extra_keys = [],
+        app_extra = "",
+        **kwargs):
+    if len(app_extra_keys) > 0 and app_extra != "":
+        all_app_extra = ",".join(app_extra_keys + [app_extra])
+    elif len(app_extra_keys) > 0:
+        all_app_extra = ",".join(app_extra_keys)
+    else:
+        all_app_extra = app_extra
+
     app_file_private(
         private_stamp_detect = select({
             _stamp_condition: True,
             "//conditions:default": False,
         }),
+        app_extra_keys = all_app_extra,
         **kwargs
     )

bzlmod/extensions.bzl

@@ -367,6 +367,7 @@ erlang_app(
     app_description = \"""$(PROJECT_DESCRIPTION)\""",
     app_version = "$(PROJECT_VERSION)",
     app_env = \"""$(PROJECT_ENV)\""",
+    app_extra = \"""$(PROJECT_APP_EXTRA_KEYS)\""",
     extra_apps = [
 $(foreach dep,$(LOCAL_DEPS),        "$(dep)",\n)    ],
     erlc_opts = [

erlang_app.bzl

@@ -36,6 +36,7 @@ def erlang_app(
         app_registered = [],
         app_env = "",
         app_extra_keys = [],
+        app_extra = "",
         extra_apps = [],
         erlc_opts = DEFAULT_ERLC_OPTS,
         first_srcs = [],
@@ -80,6 +81,7 @@ def erlang_app(
             app_registered = app_registered,
             app_env = app_env,
             app_extra_keys = app_extra_keys,
+            app_extra = app_extra,
             extra_apps = extra_apps,
             app_src = native.glob(["src/{}.app.src".format(app_name)]),
             modules = all_beam,
@@ -110,6 +112,7 @@ def test_erlang_app(
         app_registered = [],
         app_env = "",
         app_extra_keys = [],
+        app_extra = "",
         extra_apps = [],
         erlc_opts = DEFAULT_TEST_ERLC_OPTS,
         first_srcs = [],

private/app_file.bzl

@@ -35,10 +35,6 @@ def _impl(ctx):
         applications.append(dep[ErlangAppInfo].app_name)
     applications_list = "[" + ",".join(applications) + "]"
 
-    app_extra_keys_list = ""
-    if len(ctx.attr.app_extra_keys) > 0:
-        app_extra_keys_list = "[" + ",".join(ctx.attr.app_extra_keys) + "]"
-
     stamp = ctx.attr.stamp == 1 or (ctx.attr.stamp == -1 and
                                     ctx.attr.private_stamp_detect)
 
@@ -51,10 +47,9 @@ else
 fi
 
 if [ -n '{description}' ]; then
-    echo '"{description}".' | \\
-        "{erlang_home}"/bin/escript {app_file_tool} \\
-        description \\
-        {out} > {out}.tmp && mv {out}.tmp {out}
+    cat << 'EOF' | "{erlang_home}"/bin/escript {app_file_tool} description {out} > {out}.tmp && mv {out}.tmp {out}
+"{description}".
+EOF
 fi
 
 # set the version env var from the stable-status.txt
@@ -108,9 +103,11 @@ if [ -n '{env}' ]; then
 EOF
 fi
 
-if [ -n '{extra_tuples}' ]; then
+if [ -n '{extra_keys}' ]; then
     cat << 'EOF' | "{erlang_home}"/bin/escript {app_file_tool} {out} > {out}.tmp && mv {out}.tmp {out}
-{extra_tuples}.
+[
+{extra_keys}
+].
 EOF
 fi
 """.format(
@@ -126,7 +123,7 @@ fi
         applications = applications_list,
         app_module = app_module,
         env = ctx.attr.app_env,
-        extra_tuples = app_extra_keys_list,
+        extra_keys = ctx.attr.app_extra_keys,
         src = src,
         out = app_file.path,
     )
@@ -161,7 +158,7 @@ app_file_private = rule(
         "app_module": attr.string(),
         "app_registered": attr.string_list(),
         "app_env": attr.string(),
-        "app_extra_keys": attr.string_list(),
+        "app_extra_keys": attr.string(),
         "extra_apps": attr.string_list(),
         "app_src": attr.label_list(allow_files = [".app.src"]),
         "modules": attr.label_list(allow_files = [".beam"]),