diff options
| author | Lars Thorsen <[email protected]> | 2014-06-12 12:52:20 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2014-06-23 08:51:29 +0200 |
| commit | 5f129ff7bb5f80bcead08ff6224ff701e3fe3442 (patch) | |
| tree | 60005939fd2c70799b292f6dd93e7a7bcb311894 /lib/orber | |
| parent | ed3927c0db4b59cebdf10049f4b03a7e96383a88 (diff) | |
| download | otp-5f129ff7bb5f80bcead08ff6224ff701e3fe3442.tar.gz otp-5f129ff7bb5f80bcead08ff6224ff701e3fe3442.tar.bz2 otp-5f129ff7bb5f80bcead08ff6224ff701e3fe3442.zip | |
[orber] Remove a define of ORBVSN when compiling orbers erlang modules
Diffstat (limited to 'lib/orber')
| -rw-r--r-- | lib/orber/src/Makefile | 3 | ||||
| -rw-r--r-- | lib/orber/src/orber_env.erl | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile index d96350f4d5..398e481138 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -194,8 +194,7 @@ ERL_IDL_FLAGS += -pa $(ERL_TOP)/lib/orber/ebin ERL_COMPILE_FLAGS += $(ERL_IDL_FLAGS) \ -I$(ERL_TOP)/lib/orber/include \ +'{parse_transform,sys_pre_attributes}' \ - +'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}' \ - -D'ORBVSN="$(ORBER_VSN)"' + +'{attribute,insert,app_vsn,"orber_$(ORBER_VSN)"}' ASN_FLAGS = -bber +der +compact_bit_string +nowarn_unused_record diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl index 1c8a90bc81..16dbb74253 100644 --- a/lib/orber/src/orber_env.erl +++ b/lib/orber/src/orber_env.erl @@ -204,9 +204,9 @@ info(IoDevice) -> _ -> lists:flatten( io_lib:format("======= Orber Execution Environment ======~n" - " *** Orber-~s is not running ***~n" + " *** Orber is not running ***~n" "==========================================~n", - [?ORBVSN])) + [])) end, case IoDevice of info_msg -> @@ -223,6 +223,7 @@ info(IoDevice) -> create_main_info() -> {Major, Minor} = giop_version(), + {orber, _, OrberVsn} = lists:keyfind(orber, 1, application:loaded_applications()), [io_lib:format("======= Orber Execution Environment ======~n" "Orber version.................: ~s~n" "Orber domain..................: ~s~n" @@ -257,7 +258,7 @@ create_main_info() -> "Debug Level...................: ~p~n" "orbInitRef....................: ~p~n" "orbDefaultInitRef.............: ~p~n", - [?ORBVSN, domain(), iiop_port(), nat_iiop_port(), host(), + [OrberVsn, domain(), iiop_port(), nat_iiop_port(), host(), nat_host(), ip_address_local(), orber:orber_nodes(), Major, Minor, iiop_timeout(), iiop_connection_timeout(), |