From 31b20cac498b98d40ed2bb15bb5259cb3c33a422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 5 Jul 2013 14:53:01 +0200
Subject: Add erts app-file

---
 erts/preloaded/.gitignore       |  2 ++
 erts/preloaded/Makefile         |  1 -
 erts/preloaded/src/Makefile     | 15 ++++++++++++---
 erts/preloaded/src/erts.app.src | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 erts/preloaded/.gitignore
 create mode 100644 erts/preloaded/src/erts.app.src

(limited to 'erts')

diff --git a/erts/preloaded/.gitignore b/erts/preloaded/.gitignore
new file mode 100644
index 0000000000..40e4c68638
--- /dev/null
+++ b/erts/preloaded/.gitignore
@@ -0,0 +1,2 @@
+ebin/erts.app
+src/prim_eval.abstr
diff --git a/erts/preloaded/Makefile b/erts/preloaded/Makefile
index 4235a7fe57..31fdeb96c5 100644
--- a/erts/preloaded/Makefile
+++ b/erts/preloaded/Makefile
@@ -18,7 +18,6 @@
 # 
 include $(ERL_TOP)/make/target.mk
 
-
 SUB_DIRECTORIES = src
 
 include $(ERL_TOP)/make/otp_subdir.mk
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
index 7a7b7fb644..c1580b1495 100644
--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
@@ -55,9 +55,15 @@ ERL_FILES= $(PRE_LOADED_ERL_MODULES:%=%.erl)
 BEAM_FILES= $(PRE_LOADED_BEAM_MODULES:%=%.S)
 STUBS_FILES= $(PRE_LOADED_BEAM_MODULES:%=%.erl)
 
-TARGET_FILES = $(PRE_LOADED_MODULES:%=$(EBIN)/%.$(EMULATOR))
+TARGET_FILES = $(PRE_LOADED_MODULES:%=$(EBIN)/%.$(EMULATOR)) \
+    $(APP_TARGET)
 STATIC_TARGET_FILES = $(PRE_LOADED_MODULES:%=$(STATIC_EBIN)/%.$(EMULATOR))
 
+APP_FILE= erts.app
+APP_SRC= $(APP_FILE).src
+APP_TARGET= $(STATIC_EBIN)/$(APP_FILE)
+
+
 KERNEL_SRC=$(ERL_TOP)/lib/kernel/src
 KERNEL_INCLUDE=$(ERL_TOP)/lib/kernel/include
 STDLIB_INCLUDE=$(ERL_TOP)/lib/stdlib/include
@@ -72,14 +78,17 @@ clean:
 copy:
 	cp *.beam $(STATIC_EBIN)
 
+$(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+
 
 include $(ERL_TOP)/make/otp_release_targets.mk
 
-release_spec: 
+release_spec: $(APP_TARGET)
 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
 	$(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src"
 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-	$(INSTALL_DATA) $(STATIC_TARGET_FILES) "$(RELSYSDIR)/ebin"
+	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
 
 release_docs_spec:
 
diff --git a/erts/preloaded/src/erts.app.src b/erts/preloaded/src/erts.app.src
new file mode 100644
index 0000000000..fd3e8cb692
--- /dev/null
+++ b/erts/preloaded/src/erts.app.src
@@ -0,0 +1,41 @@
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 2013. All Rights Reserved.
+%% 
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%% 
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%% 
+%% %CopyrightEnd%
+%%
+{application, erts, [
+	{description, "ERTS  CXC 138 10"},
+	{vsn, "%VSN%"},
+	{modules, [
+		%% preloaded
+		erlang,
+		erl_prim_loader,
+		erts_internal,
+		init,
+		otp_ring0,
+		prim_eval,
+		prim_file,
+		prim_inet,
+		prim_zip,
+		zlib
+	    ]},
+	{registered, []},
+	{applications, []},
+	{env, []},
+	{mod, {erts, []}}
+    ]}.
+
+%% vim: ft=erlang
-- 
cgit v1.2.3