From 551c1c2c6937ab2dbc1b3e77382c64e74774d3e6 Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Sat, 9 Jun 2018 22:54:09 +0200
Subject: Simplify app-file generation

Don't bother generating applications/runtime_dependencies: what's lost
in duplication is gained in clarity.

SSL in runtime_applications but not applications in questionable, but
it's been this way for a long time with no apparent ill effects or
protests.
---
 lib/diameter/src/Makefile         |  5 ++---
 lib/diameter/src/app.sed          | 41 ---------------------------------------
 lib/diameter/src/diameter.app.src | 15 ++++++++++----
 3 files changed, 13 insertions(+), 48 deletions(-)
 delete mode 100644 lib/diameter/src/app.sed

(limited to 'lib')

diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
index 3af856f63e..f78a163591 100644
--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
@@ -149,7 +149,7 @@ gen/$(DICT_YRL).erl: compiler/$(DICT_YRL).yrl
 	$(ERLC) -Werror -o $(@D) $<
 
 # Generate the app file.
-$(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk app.sed
+$(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk
 	$(gen_verbose) \
 	M=`echo $(notdir $(APP_MODULES)) | tr ' ' ,`; \
 	C=`echo $(COMPILER_MODULES) | tr ' ' ,`; \
@@ -160,8 +160,7 @@ $(APP_TARGET): $(APP_SRC) ../vsn.mk modules.mk app.sed
 	    -e "s;%COMPILER%;$$C;" \
 	    -e "s;%INFO%;$$I;" \
 	    -e "s;%REGISTERED%;$$R;" \
-	  $< \
-	| sed -f app.sed > $@
+	  $< > $@
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 	$(vsn_verbose) \
diff --git a/lib/diameter/src/app.sed b/lib/diameter/src/app.sed
deleted file mode 100644
index dd3806f5f1..0000000000
--- a/lib/diameter/src/app.sed
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# %CopyrightBegin%
-#
-# Copyright Ericsson AB 2014-2016. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# %CopyrightEnd%
-
-#
-# Generate runtime_dependencies from applications to avoid having to
-# specify the same application more than once.
-#
-
-/{runtime_dependencies,/b v
-/{[-a-z]*, "[0-9.]*"}/!b
-/{vsn,/b
-
-/%%/!H
-s/{\([^,]*\)[^}]*}/\1/g
-s/%%/%,/
-b
-
-:v
-
-p
-x
-s/\n//
-s/%//g
-s/\n */ /g
-s/{\([^,]*\), "\([^"]*"\)}/"\1-\2/g
diff --git a/lib/diameter/src/diameter.app.src b/lib/diameter/src/diameter.app.src
index 5a90e89e44..18202f033e 100644
--- a/lib/diameter/src/diameter.app.src
+++ b/lib/diameter/src/diameter.app.src
@@ -28,14 +28,21 @@
       ]},
   {registered, [%REGISTERED%]},
   {applications, [
-      {stdlib, "2.4"}, {kernel, "3.2"}%, {erts, "10.0"}
-      %% {syntax-tools, "1.6,18"}
-      %% {runtime-tools, "1.8.16"}
-      %, {ssl, "9.0"}
+      stdlib,
+      kernel
+      %, ssl
+      %, syntax-tools
+      %, runtime-tools
       ]},
   {env, []},
   {mod, {diameter_app, []}},
   {runtime_dependencies, [
+      "erts-10.0",
+      "stdlib-2.4",
+      "kernel-3.2",
+      "ssl-9.0"
+      %, "syntax-tools-1.6.18"
+      %, "runtime-tools-1.8.16"
       ]}
   %%
   %% Note that ssl is only required if configured on TCP transports,
-- 
cgit v1.2.3