Minor improvements to the meas tools.

OTP-9604

Merge branch 'bmk/megaco/20111003/improving_mstone1/OTP-9604' into bmk/megaco/r15_integration

Conflicts:
	lib/megaco/doc/src/notes.xml

4 files changed, 44 insertions, 10 deletions

diff --git a/lib/megaco/examples/meas/Makefile b/lib/megaco/examples/meas/Makefile.in
index 0a6cbb44a6..6af7ef6c65 100644
--- a/lib/megaco/examples/meas/Makefile
+++ b/lib/megaco/examples/meas/Makefile.in
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-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
@@ -35,12 +35,19 @@ VSN=$(MEGACO_VSN)
 
 
 # ----------------------------------------------------
+# Configured variables
+# ----------------------------------------------------
+PERL = @PERL@
+
+
+# ----------------------------------------------------
 # Release directory specification
 # ----------------------------------------------------
 RELSYSDIR         = $(RELEASE_PATH)/lib/megaco-$(VSN)
 EXAMPLE_RELSYSDIR = $(RELSYSDIR)/examples
 MEAS_RELSYSDIR    = $(EXAMPLE_RELSYSDIR)/meas
 
+
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
@@ -49,9 +56,13 @@ include modules.mk
 
 ERL_FILES = $(MODULES:%=%.erl)
 
-TARGET_FILES =  \
+SCRIPT_SKELETONS = $(SCRIPT_SKELETON_SRC:%.src=%)
+
+ERL_TARGETS = \
 	$(ERL_FILES:%.erl=$(EBIN)/%.$(EMULATOR))
 
+TARGET_FILES = $(SCRIPT_SKELETONS) $(ERL_TARGETS)
+
 
 # ----------------------------------------------------
 # FLAGS
@@ -91,12 +102,27 @@ debug:
 
 opt: $(TARGET_FILES) 
 
+script_skeletons: $(SCRIPT_SKELETONS)
+
+info:
+	@echo "MODULES   = $(MODULES)"
+	@echo "ERL_FILED = $(ERL_FILES)"
+	@echo ""
+	@echo "SCRIPT_SKELETON_SRC = $(SCRIPT_SKELETON_SRC)"
+	@echo "SCRIPT_SKELETONS    = $(SCRIPT_SKELETONS)"
+	@echo ""
+	@echo "TARGET_FILES = $(TARGET_FILES)"
+	@echo ""
+
 clean:
 	rm -f $(TARGET_FILES) 
 	rm -f errs core *~
 
 docs:
 
+conf: 
+	cd ../..; $(MAKE) conf
+
 
 # ----------------------------------------------------
 # Release Target
@@ -120,6 +146,14 @@ release_docs_spec:
 # Include dependencies
 # ----------------------------------------------------
 
+meas.sh.skel: meas.sh.skel.src
+	@echo "transforming $< to $@"
+	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+
+mstone1.sh.skel: mstone1.sh.skel.src
+	@echo "transforming $< to $@"
+	$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+
 megaco_codec_transform.$(EMULATOR): megaco_codec_transform.erl
 
 megaco_codec_meas.$(EMULATOR): megaco_codec_meas.erl
diff --git a/lib/megaco/examples/meas/meas.sh.skel b/lib/megaco/examples/meas/meas.sh.skel.src
index 76745ed8f4..c7bd6cdd2a 100644
--- a/lib/megaco/examples/meas/meas.sh.skel
+++ b/lib/megaco/examples/meas/meas.sh.skel.src
@@ -2,7 +2,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
@@ -22,7 +22,7 @@
 #
 
 ERL_HOME=<path to otp top dir>
-MEGACO_HOME=$ERL_HOME/lib/erlang/lib/<megaco dir>
+MEGACO_HOME=$ERL_HOME/lib/erlang/lib/megaco-%VSN%
 MEAS_HOME=$MEGACO_HOME/examples/meas
 PATH=$ERL_HOME/bin:$PATH
 
diff --git a/lib/megaco/examples/meas/modules.mk b/lib/megaco/examples/meas/modules.mk
index 8f1b45c8a6..26979933d7 100644
--- a/lib/megaco/examples/meas/modules.mk
+++ b/lib/megaco/examples/meas/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-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
@@ -17,9 +17,9 @@
 # 
 # %CopyrightEnd%
 
-SCRIPT_SKELETONS = \
-	meas.sh.skel \
-	mstone1.sh.skel
+SCRIPT_SKELETON_SRC = \
+	meas.sh.skel.src \
+	mstone1.sh.skel.src
 
 MESSAGE_PACKAGES = \
 	time_test.msgs
diff --git a/lib/megaco/examples/meas/mstone1.sh.skel b/lib/megaco/examples/meas/mstone1.sh.skel.src
index b7c7e41007..54a6c61a58 100644
--- a/lib/megaco/examples/meas/mstone1.sh.skel
+++ b/lib/megaco/examples/meas/mstone1.sh.skel.src
@@ -3,7 +3,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2009. 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
@@ -59,7 +59,7 @@ Options:
 "
 
 ERL_HOME=<path to otp top dir>
-MEGACO_HOME=$ERL_HOME/lib/erlang/lib/<megaco dir>
+MEGACO_HOME=$ERL_HOME/lib/erlang/lib/megaco-%VSN%
 MEAS_HOME=$MEGACO_HOME/examples/meas
 PATH=$ERL_HOME/bin:$PATH