diff options
| author | Micael Karlberg <[email protected]> | 2011-11-15 11:56:08 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-15 11:56:08 +0100 |
| commit | ff305c1a15e34f1c8d4f923a8f0e532b4e946512 (patch) | |
| tree | a2278c08fc60ad4d62e512f350db68981bee496a /lib/inets/src/inets_app | |
| parent | 45305535f3348d8ea9a637b2236fd079e147971c (diff) | |
| parent | da49021ad3323f90c95a65962b6dfff5a7b139f6 (diff) | |
| download | otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.tar.gz otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.tar.bz2 otp-ff305c1a15e34f1c8d4f923a8f0e532b4e946512.zip | |
Merge branch 'bmk/inets/inets58_integration'
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/Makefile | 3 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.mk | 4 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets_service.erl | 19 |
3 files changed, 24 insertions, 2 deletions
diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile index 20e22917e2..63ab0a5bae 100644 --- a/lib/inets/src/inets_app/Makefile +++ b/lib/inets/src/inets_app/Makefile @@ -30,6 +30,7 @@ include ../../vsn.mk VSN = $(INETS_VSN) + # ---------------------------------------------------- # Release directory specification # ---------------------------------------------------- @@ -41,8 +42,8 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) # ---------------------------------------------------- MODULES = \ - inets_service \ inets \ + inets_service \ inets_app \ inets_sup \ inets_regexp diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk index b6e9fe1d96..35fb0d7eca 100644 --- a/lib/inets/src/inets_app/inets.mk +++ b/lib/inets/src/inets_app/inets.mk @@ -33,6 +33,10 @@ ifeq ($(WARN_UNUSED_WARS), true) ERL_COMPILE_FLAGS += +warn_unused_vars endif +ifeq ($(shell erl -noshell -eval 'io:format("~4s", [erlang:system_info(otp_release)])' -s init stop), R14B) +INETS_ERL_COMPILE_FLAGS += -D'OTP-R14B-COMPILER' +endif + INETS_APP_VSN_COMPILE_FLAGS = \ +'{parse_transform,sys_pre_attributes}' \ +'{attribute,insert,app_vsn,$(APP_VSN)}' diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl index f89dac195c..a057a51e2c 100644 --- a/lib/inets/src/inets_app/inets_service.erl +++ b/lib/inets/src/inets_app/inets_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2010. All Rights Reserved. +%% Copyright Ericsson AB 2007-2011. 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 @@ -20,6 +20,21 @@ -module(inets_service). +-ifdef('OTP-R14B-COMPILER'). + +-export([behaviour_info/1]). + +behaviour_info(callbacks) -> + [{start_standalone, 1}, + {start_service, 1}, + {stop_service, 1}, + {services, 0}, + {service_info, 1}]; +behaviour_info(_) -> + undefined. + +-else. + %% Starts service stand-alone %% start_standalone(Config) -> % {ok, Pid} | {error, Reason} %% <service>:start_link(Config). @@ -67,3 +82,5 @@ -callback service_info(Service :: term()) -> {ok, [{Property :: term(), Value :: term()}]} | {error, Reason :: term()}. + +-endif. |