File 2821-Fixup-development-runtime-dependencies.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2821-Fixup-development-runtime-dependencies.patch of Package erlang (Revision 3aaa84d7d540d57752db68644dc4a4df)

Currently displaying revision 3aaa84d7d540d57752db68644dc4a4df , Show latest

From 133830e9468e8ffeda6b8d553850a794082ad47f Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Tue, 16 Oct 2018 23:20:28 +0200
Subject: [PATCH] Fixup development runtime dependencies

The script 'make/fixup_development_runtime_dependencies' is run at
the end of a build of development branches in order to fixup future
not yet resolved versions (<app name>-@<ticket>(:<ticket>)+@) in
'runtime_dependencies'.
---
 Makefile.in                                 |  13 +++-
 configure.in                                |   4 +
 make/fixup_development_runtime_dependencies | 111 ++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100755 make/fixup_development_runtime_dependencies

diff --git a/Makefile.in b/Makefile.in
index d880bfefa2..9f053963c4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -161,6 +161,8 @@ ERLANG_LIBDIR     = $(DESTDIR)$(ERLANG_INST_LIBDIR)
 # Must be GNU make!
 MAKE		= @MAKE_PROG@
 
+PERL		= @PERL@
+
 NATIVE_LIBS_ENABLED = @NATIVE_LIBS_ENABLED@
 
 ifeq ($(NATIVE_LIBS_ENABLED),yes)
@@ -327,16 +329,16 @@ ifneq ($(CROSS_COMPILING),yes)
 # Not cross compiling
 
 ifeq ($(BOOTSTRAP_ONLY),yes)
-all: bootstrap
+all: bootstrap check_dev_rt_dep
 else
 # The normal case; not cross compiling, and not bootstrap only build.
-all: bootstrap libs local_setup
+all: bootstrap libs local_setup check_dev_rt_dep
 endif
 
 else
 # Cross compiling
 
-all: cross_check_erl depend emulator libs start_scripts
+all: cross_check_erl depend emulator libs start_scripts check_dev_rt_dep
 
 endif
 
@@ -356,7 +358,10 @@ erlang_inst_libdir_configured:
 
 bootstrap: depend all_bootstraps
 
-
+check_dev_rt_dep:
+	@if `grep DEVELOPMENT "$(ERL_TOP)/make/otp_version_tickets" 1>/dev/null 2>&1`; then \
+	  LANG=C "$(PERL)" "$(ERL_TOP)/make/fixup_development_runtime_dependencies" "$(ERL_TOP)"; \
+	fi
 
 ifeq ($(OTP_STRICT_INSTALL),yes)
 
diff --git a/configure.in b/configure.in
index 559049aca1..2a42477723 100644
--- a/configure.in
+++ b/configure.in
@@ -185,6 +185,10 @@ fi
 
 AC_PROG_LN_S
 AC_PROG_RANLIB
+LM_PROG_PERL5
+if test "$ac_cv_path_PERL" = false; then
+  AC_MSG_ERROR([Perl version 5 is required!])
+fi
 
 #
 # Get erts version from erts/vsn.mk
diff --git a/make/fixup_development_runtime_dependencies b/make/fixup_development_runtime_dependencies
new file mode 100755
index 0000000000..e06bd5faca
--- /dev/null
+++ b/make/fixup_development_runtime_dependencies
@@ -0,0 +1,111 @@
+#!/usr/bin/env perl
+
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2018. 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%
+#
+
+#
+# Replaces runtime_dependencies pointing to future not yet
+# resolved versions in the maint and master branches while under
+# development. Such dependencies may exist in .app files on the
+# form (<app name>-@<ticket>(:<ticket>)*@) and will be replaced
+# with the current version of the application in the source tree.
+# This in order not to break tests looking at runtime_dependencies.
+#
+
+use strict;
+use File::Basename;
+
+my $usage_text = <<"HERE";
+  usage: $0 <ERL_TOP>
+HERE
+
+my %app_vsn;
+my $exit_status = 0;
+
+@ARGV == 1 or die $usage_text;
+my $erl_top = shift @ARGV;
+
+chdir $erl_top or die "Failed to change directory into '$erl_top'";
+
+print "Fixup of development runtime dependencies\n";
+
+#
+# Determine versions of all applications in the source tree...
+#
+foreach my $vsn_mk (<lib/*/vsn.mk>, <erts/vsn.mk>) {
+    my $app_dir = dirname($vsn_mk);
+    my $app = basename($app_dir);
+
+    if (!open(VSN, $vsn_mk)) {
+        $exit_status = 1;
+        print STDERR "ERROR: Failed to open '$vsn_mk' for reading: $!\n";
+    }
+    else {
+	my $vsn = '';
+	while (<VSN>) {
+	    if (/VSN\s*=\s*(\S+)/) {
+		$vsn = $1;
+		last;
+	    }
+	}
+	close VSN;
+        if (!$vsn) {
+            $exit_status = 1;
+            print STDERR "ERROR: No version found in '$vsn_mk'\n"
+        }
+        else {
+            $app_vsn{$app} = "$app-$vsn";
+        }
+    }
+}
+
+my $valid_apps = join('|', keys %app_vsn);
+
+#
+# Replace all <app name>-@<ticket>(:<ticket>)*@ versions
+# in all *.app files with the versions currently used...
+#
+foreach my $app_file (<lib/*/ebin/*.app>, <erts/preloaded/ebin/erts.app>) {
+    if (!open(IN, "<", $app_file)) {
+        $exit_status = 1;
+        print STDERR "ERROR: Failed to open '$app_file' for reading: $!";
+    }
+    else {
+        local $/;
+        my $file = <IN>;
+        close IN;
+        my $old_file = $file;
+
+        $file =~ s/($valid_apps)-\@OTP-\d{4,5}(?::OTP-\d{4,5})*\@/$app_vsn{$1}/g;
+
+        if ($file ne $old_file) {
+            if (!open(OUT, ">", $app_file)) {
+                $exit_status = 1;
+                print STDERR "ERROR: Failed to open '$app_file' for writing: $!";
+            }
+            else {
+                print OUT $file;
+                close OUT;
+            }
+        }
+    }
+}
+
+exit $exit_status;
-- 
2.16.4

Places

File 2821-Fixup-development-runtime-dependencies.patch of Package erlang (Revision 3aaa84d7d540d57752db68644dc4a4df)

Places