diff options
| author | Siri Hansen <[email protected]> | 2012-02-16 14:58:57 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-19 09:48:54 +0100 |
| commit | a5240467ac0b5428063360fc4a3d67ab9ffa1413 (patch) | |
| tree | 38acda36f4e798399b5ce6223de7cbd48798b9ea /lib/reltool/src/reltool_target.erl | |
| parent | 0bc47607cad0c9ad475a7c0a8e7aa5633d00ceb5 (diff) | |
| download | otp-a5240467ac0b5428063360fc4a3d67ab9ffa1413.tar.gz otp-a5240467ac0b5428063360fc4a3d67ab9ffa1413.tar.bz2 otp-a5240467ac0b5428063360fc4a3d67ab9ffa1413.zip | |
[reltool] Link together escript with inlined application
OTP-9968
Make sure that inlined applications in an escript is included/excluded
as the escript itself, and forbid explicit configuration of the
inlined application.
Diffstat (limited to 'lib/reltool/src/reltool_target.erl')
| -rw-r--r-- | lib/reltool/src/reltool_target.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl index 0fcf89a360..40d1009733 100644 --- a/lib/reltool/src/reltool_target.erl +++ b/lib/reltool/src/reltool_target.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2009-2011. All Rights Reserved. +%% Copyright Ericsson AB 2009-2012. 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 @@ -101,7 +101,7 @@ do_gen_config(#sys{root_dir = RootDir, || A <- Apps, A#app.name =/= ?MISSING_APP_NAME, A#app.name =/= erts, - not A#app.is_escript], + A#app.is_escript =/= true], EscriptItems = [{escript, A#app.active_dir, emit(incl_cond, A#app.incl_cond, undefined, InclDefs)} @@ -895,7 +895,7 @@ spec_escripts(#sys{apps = Apps}, ErtsBin, BinFiles) -> if Name =:= ?MISSING_APP_NAME -> false; - not IsEscript -> + IsEscript =/= true -> false; IsIncl; IsPre -> {true, do_spec_escript(File, ErtsBin, BinFiles)}; @@ -957,7 +957,7 @@ spec_lib_files(#sys{apps = Apps} = Sys) -> if Name =:= ?MISSING_APP_NAME -> false; - IsEscript -> + IsEscript =/= false -> false; IsIncl; IsPre -> true; |