Use auto-detected Erlang OTP library version numbers.
Use auto-detected ERTS version.
Signed-off-by: Mikael Magnusson <mi...@users.sourceforge.net>
---
src/Makefile.in | 19 +++++++++++++++----
src/appserver.rel-in | 10 +++++-----
src/event/Makefile.in | 19 +++++++++++++++----
src/event/eventserver.rel-in | 12 ++++++------
src/incomingproxy.rel-in | 12 ++++++------
src/outgoingproxy.rel-in | 10 +++++-----
src/pstnproxy.rel-in | 12 ++++++------
src/start_ssl.rel-in | 8 ++++----
8 files changed, 62 insertions(+), 40 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index e2dd70b..6750e31 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,6 +30,15 @@ INSTALL = @INSTALL@
install_DATA = @INSTALL_DATA@
install_PROGRAM = @INSTALL_PROGRAM@
+ERLANG_ERTS_VER = @ERLANG_ERTS_VER@
+ERLANG_LIB_VER_asn1 = @ERLANG_LIB_VER_asn1@
+ERLANG_LIB_VER_kernel = @ERLANG_LIB_VER_kernel@
+ERLANG_LIB_VER_mnesia = @ERLANG_LIB_VER_mnesia@
+ERLANG_LIB_VER_ssl = @ERLANG_LIB_VER_ssl@
+ERLANG_LIB_VER_stdlib = @ERLANG_LIB_VER_stdlib@
+ERLANG_LIB_VER_yaws = @ERLANG_LIB_VER_yaws@
+ERLANG_LIB_VER_SUBST = @ERLANG_LIB_VER_SUBST@
+
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
systools_make_script = \
@@ -174,7 +183,7 @@ distclean: clean distclean-recursive
clean: clean-recursive
rm -f core *.core *~
- rm -f *.beam *.script *.start *.boot *.app
+ rm -f *.beam *.script *.start *.boot *.app *.rel
rm -f *.o ktrace.out erl_crash.dump
rm -f $(addsuffix .tar.gz, $(basename $(rel_FILES)))
rm -f $(rel_FILES) start_ssl.rel sys.config
@@ -184,9 +193,9 @@ clean: clean-recursive
$(beam_FILES): $(yxa_hrl_FILES)
$(boot_FILES): $(beam_FILES)
-SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
+SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .rel-in
.SUFFIXES:
-.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
+.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .rel-in
$(ebin_dir)/%.beam: $(srcdir)/%.erl
$(ERLC) $(L_ERLC_FLAGS) $<
@@ -202,7 +211,9 @@ $(ebin_dir)/%.app: $(srcdir)/%.app-in
-e 's!%versio...@package_version@!' < $< > $@
$(ebin_dir)/%.rel: $(srcdir)/%.rel-in
- sed -e 's!%versio...@package_version@!' < $< > $@
+ sed -e 's!%versio...@package_version@!' \
+ -e 's,[...@]erlang_erts_ver[@],$(ERLANG_ERTS_VER),g' \
+ $(ERLANG_LIB_VER_SUBST) < $< > $@
%.boot: $(ebin_dir)/%.app $(ebin_dir)/yxa.app $(ebin_dir)/%.rel
$(systools_make_script)
diff --git a/src/appserver.rel-in b/src/appserver.rel-in
index a978fa5..0be9a81 100644
--- a/src/appserver.rel-in
+++ b/src/appserver.rel-in
@@ -1,10 +1,10 @@
%% Erlang OTP R12B-2 library versions
{release, {"YXA appserver","YXA-appserver-%VERSION%"},
- {erts, "5.5.2"},
- [{kernel,"2.12.2"},
- {stdlib,"1.15.2"},
- {ssl, "3.9"},
- {mnesia, "4.4.2"},
+ {erts, "@ERLANG_ERTS_VER@"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
+ {mnesia, "@ERLANG_LIB_VER_mnesia@"},
{yxa, "%VERSION%"},
{appserver, "%VERSION%"}
]
diff --git a/src/event/Makefile.in b/src/event/Makefile.in
index b81575e..cdd6455 100644
--- a/src/event/Makefile.in
+++ b/src/event/Makefile.in
@@ -30,6 +30,15 @@ INSTALL = @INSTALL@
install_DATA = @INSTALL_DATA@
install_PROGRAM = @INSTALL_PROGRAM@
+ERLANG_ERTS_VER = @ERLANG_ERTS_VER@
+ERLANG_LIB_VER_asn1 = @ERLANG_LIB_VER_asn1@
+ERLANG_LIB_VER_kernel = @ERLANG_LIB_VER_kernel@
+ERLANG_LIB_VER_mnesia = @ERLANG_LIB_VER_mnesia@
+ERLANG_LIB_VER_ssl = @ERLANG_LIB_VER_ssl@
+ERLANG_LIB_VER_stdlib = @ERLANG_LIB_VER_stdlib@
+ERLANG_LIB_VER_yaws = @ERLANG_LIB_VER_yaws@
+ERLANG_LIB_VER_SUBST = @ERLANG_LIB_VER_SUBST@
+
mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
systools_make_script = \
@@ -104,7 +113,7 @@ distclean: clean
clean:
rm -f core *.core *~
- rm -f *.beam *.script *.start
+ rm -f *.beam *.script *.start *.rel
rm -f *.o ktrace.out erl_crash.dump
rm -f $(addsuffix .tar.gz, $(basename $(rel_FILES)))
rm -f $(start_FILES)
@@ -125,15 +134,17 @@ doc:
$(beam_FILES): $(yxa_hrl_FILES)
$(boot_FILES): $(beam_FILES)
-SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
+SUFFIXES = .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .app-in
.SUFFIXES:
-.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in
+.SUFFIXES: .c .o .hrl .beam .erl .boot .rel .rel-in .app .app-in .app-in
$(ebin_dir)/%.beam: $(srcdir)/%.erl
$(ERLC) $(L_ERLC_FLAGS) $<
$(ebin_dir)/%.rel: $(srcdir)/%.rel-in
- sed -e 's!%versio...@package_version@!' < $< > $@
+ sed -e 's!%versio...@package_version@!' \
+ -e 's,[...@]erlang_erts_ver[@],$(ERLANG_ERTS_VER),g' \
+ $(ERLANG_LIB_VER_SUBST) < $< > $@
$(ebin_dir)/%.app: $(srcdir)/%.app-in
sed -e 's!%versio...@package_version@!' < $< > $@
diff --git a/src/event/eventserver.rel-in b/src/event/eventserver.rel-in
index f1a60fb..7f51c10 100644
--- a/src/event/eventserver.rel-in
+++ b/src/event/eventserver.rel-in
@@ -1,11 +1,11 @@
%% Erlang OTP R12B-2 library versions
{release, {"YXA eventserver", "YXA-eventserver-%VERSION%"},
- {erts, "5.5.2"},
- [{kernel,"2.12.2"},
- {stdlib,"1.15.2"},
- {ssl, "3.9"},
- {asn1, "1.5.1"},
- {mnesia, "4.4.2"},
+ {erts, "@ERLANG_ERTS_VER@"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
+ {asn1, "@ERLANG_LIB_VER_asn1@"},
+ {mnesia, "@ERLANG_LIB_VER_mnesia@"},
{yxa, "%VERSION%"},
{eventserver, "%VERSION%", [yxa]}
]
diff --git a/src/incomingproxy.rel-in b/src/incomingproxy.rel-in
index 5b493bd..587d8df 100644
--- a/src/incomingproxy.rel-in
+++ b/src/incomingproxy.rel-in
@@ -1,11 +1,11 @@
%% Erlang OTP R12B-2 library versions
{release, {"YXA incomingproxy","YXA-incomingproxy-%VERSION%"},
- {erts, "5.5.2"},
- [{kernel,"2.12.2"},
- {stdlib,"1.15.2"},
- {ssl, "3.9"},
- {asn1, "1.5.1"},
- {mnesia, "4.4.2"},
+ {erts, "@ERLANG_ERTS_VER@"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
+ {asn1, "@ERLANG_LIB_VER_asn1@"},
+ {mnesia, "@ERLANG_LIB_VER_mnesia@"},
{yxa, "%VERSION%", load},
{incomingproxy, "%VERSION%", permanent}
]
diff --git a/src/outgoingproxy.rel-in b/src/outgoingproxy.rel-in
index a7f6f1a..7e55eb8 100644
--- a/src/outgoingproxy.rel-in
+++ b/src/outgoingproxy.rel-in
@@ -1,10 +1,10 @@
%% Erlang OTP R12B-2 library versions
{release, {"YXA outgoingproxy","YXA-outgoingproxy-%VERSION%"},
- {erts, "5.5.2"},
- [{kernel,"2.12.2"},
- {stdlib,"1.15.2"},
- {ssl, "3.9"},
- {mnesia, "4.4.2"},
+ {erts, "@ERLANG_ERTS_VER@"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
+ {mnesia, "@ERLANG_LIB_VER_mnesia@"},
{yxa, "%VERSION%"},
{outgoingproxy, "%VERSION%"}
]
diff --git a/src/pstnproxy.rel-in b/src/pstnproxy.rel-in
index 6becdc6..e411852 100644
--- a/src/pstnproxy.rel-in
+++ b/src/pstnproxy.rel-in
@@ -1,11 +1,11 @@
%% Erlang OTP R12B-2 library versions
{release, {"YXA pstnproxy","YXA-pstnproxy-%VERSION%"},
- {erts, "5.5.2"},
- [{kernel,"2.12.2"},
- {stdlib,"1.15.2"},
- {ssl, "3.9"},
- {asn1, "1.5.1"},
- {mnesia, "4.4.2"},
+ {erts, "@ERLANG_ERTS_VER@"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"},
+ {asn1, "@ERLANG_LIB_VER_asn1@"},
+ {mnesia, "@ERLANG_LIB_VER_mnesia@"},
{yxa, "%VERSION%"},
{pstnproxy, "%VERSION%"}
]
diff --git a/src/start_ssl.rel-in b/src/start_ssl.rel-in
index 177dff5..71afa53 100644
--- a/src/start_ssl.rel-in
+++ b/src/start_ssl.rel-in
@@ -1,9 +1,9 @@
%% Erlang OTP R12B-2 library versions
%% File to get Erlang distribution using SSL started
{release, {"YXA start_ssl","YXA-start_ssl-%VERSION%"},
- {erts, "5.5.2"},
- [{kernel,"2.12.2"},
- {stdlib,"1.15.2"},
- {ssl, "3.9"}
+ {erts, "@ERLANG_ERTS_VER@"},
+ [{kernel,"@ERLANG_LIB_VER_kernel@"},
+ {stdlib,"@ERLANG_LIB_VER_stdlib@"},
+ {ssl, "@ERLANG_LIB_VER_ssl@"}
]
}.
--
tg: (92bca97..) t/fix/erlang-auto-rel (depends on: t/fix/autoconf)
_______________________________________________
Yxa-devel mailing list
Yxa-devel@lists.su.se
https://lists.su.se/mailman/listinfo/yxa-devel
