From e310677df7b3ce6506b35044abafcb507caa7e07 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 10 Mar 2014 17:44:25 +0100
Subject: Verify runtime_dependencies when running 'otp_build patch_app'

---
 erts/Makefile.in                 | 5 +++++
 erts/doc/src/erlang.xml          | 4 ++--
 erts/etc/win32/nsis/erlang.nsi   | 1 -
 erts/etc/win32/nsis/erlang20.nsi | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'erts')

diff --git a/erts/Makefile.in b/erts/Makefile.in
index e3db37d3fd..47298cccba 100644
--- a/erts/Makefile.in
+++ b/erts/Makefile.in
@@ -48,6 +48,7 @@ debug opt clean:
 			( cd $$d && $(MAKE) $@ FLAVOR=$(FLAVOR) ) || exit $$? ; \
 		fi ; \
 	done
+	(cd preloaded/src && $(MAKE) ../ebin/erts.app)
 
 # ----------------------------------------------------------------------
 # These are "convenience targets", provided as shortcuts for developers
@@ -135,6 +136,10 @@ release:
 			( cd $$d && $(MAKE) $@ ) || exit $$? ; \
 		fi ; \
 	 done
+	( $(MAKE) -f "$(ERL_TOP)/make/otp_released_app.mk"	\
+		APP_PWD="$(ERL_TOP)/erts" APP_VSN=VSN APP=erts	\
+		TESTROOT="$(TESTROOT)" update)			\
+	 || exit $$?
 
 .PHONY: release_docs
 release_docs:
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index aeded7c719..b06d5aeb12 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6121,8 +6121,8 @@ ok
 	    <c>erlang:system_info()</c> argument giving the exact OTP
 	    version. This since the exact OTP version in the general case
 	    is hard to determine.  For more information see 
-	    <seealso marker="doc/installation_guide:otp_version">the
-	    documentation of the OTP version in the installation
+	    <seealso marker="doc/system_principles:versions">the
+	    documentation of versions in the system principles
 	    guide</seealso>.</p>
           </item>
 	  <tag><marker id="system_info_port_parallelism"><c>port_parallelism</c></marker></tag>
diff --git a/erts/etc/win32/nsis/erlang.nsi b/erts/etc/win32/nsis/erlang.nsi
index 162e634148..f4fd2b4cdb 100644
--- a/erts/etc/win32/nsis/erlang.nsi
+++ b/erts/etc/win32/nsis/erlang.nsi
@@ -93,7 +93,6 @@ SectionIn 1 RO
 skip_silent_mode:
 
   	SetOutPath "$INSTDIR"
-  	File "${TESTROOT}\OTP_VERSION"
   	File "${TESTROOT}\Install.ini"
   	File "${TESTROOT}\Install.exe"
   	File /r "${TESTROOT}\releases"
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
index 3ee33e8121..3333c4a9aa 100644
--- a/erts/etc/win32/nsis/erlang20.nsi
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -144,7 +144,6 @@ Section "Development" SecErlangDev
 SectionIn 1 RO
 
   	SetOutPath "$INSTDIR"
-  	File "${TESTROOT}\OTP_VERSION"
   	File "${TESTROOT}\Install.ini"
   	File "${TESTROOT}\Install.exe"
 	SetOutPath "$INSTDIR\releases"
-- 
cgit v1.2.3