Some *_FOR_REBAR variables better named as *_FOR_OTP, some targets be…

…tter named regarding rebar/OTP.

GNUmakefile

@@ -133,7 +133,7 @@ stats:
 #all: compile
 
 
-compile: rebar3-create-app-file
+compile: create-app-file
 	@echo "  Compiling us_web from $$(pwd)"
 	@$(MYRIAD_REBAR_EXEC) compile
 
@@ -161,7 +161,7 @@ release: release-prod
 #
 # ('compile' is not needed either: same happens because of 'release')
 #
-release-dev: clean-otp-build-tree rebar3-create-app-file rebar.config #compile #update-release
+release-dev: clean-otp-build-tree create-app-file rebar.config #compile #update-release
 	@echo "  Generating OTP us_web release in development mode, using $(shell rebar3 -v)"
 	@$(MYRIAD_REBAR_EXEC) release
 	@cd $(US_WEB_DEFAULT_REL_DIR)/releases && /bin/ln -sf $(US_WEB_VERSION) latest-release
@@ -170,7 +170,7 @@ release-dev: clean-otp-build-tree rebar3-create-app-file rebar.config #compile #
 # Rebuilding all dependencies ('compile' implied):
 # (yes, 'tar', not 'release')
 #
-release-prod: real-clean rebar3-create-app-file set-rebar-conf
+release-prod: real-clean create-app-file set-rebar-conf
 	@echo "  Generating OTP us_web release $(US_WEB_VERSION) from scratch in production mode, using $(shell rebar3 -v)"
 	@$(MYRIAD_REBAR_EXEC) as prod tar
 
@@ -185,7 +185,8 @@ rebar.config: conf/rebar.config.template
 # (not updating rebar config for example to take into account changes in release
 # version, as the new release archive contains paths with the former version...)
 #
-# Note: 'rebar3 compile' / 'compile' dependency target not needed here (as implied).
+# Note: 'rebar3 compile' / 'compile' dependency target not needed here (as
+# implied).
 #
 release-prod-light:
 	@echo "  Generating OTP us_web release $(US_WEB_VERSION) in production mode"

conf/GNUmakefile

@@ -12,8 +12,8 @@ US_WEB_TOP = ..
 # substitutions are layer-specific)
 #
 %: %.template $(US_WEB_TOP)/GNUmakevars.inc
-	@echo "  Generating $@ from $< (VERSION_FOR_REBAR being $(VERSION_FOR_REBAR), US_COMMON_VERSION_FOR_REBAR being $(US_COMMON_VERSION), TRACES_VERSION_FOR_REBAR being $(TRACES_VERSION), WOOPER_VERSION_FOR_REBAR being $(WOOPER_VERSION), MYRIAD_VERSION_FOR_REBAR being $(MYRIAD_VERSION)); this file should be copied to the root of this layer in order to be taken into account."
-	@cat $< | sed "s|\"MYRIAD_VERSION_FOR_REBAR\"|\"$(MYRIAD_VERSION)\"|g" | sed "s|\"WOOPER_VERSION_FOR_REBAR\"|\"$(WOOPER_VERSION)\"|g" | sed "s|\"TRACES_VERSION_FOR_REBAR\"|\"$(TRACES_VERSION)\"|g" | sed "s|\"US_COMMON_VERSION_FOR_REBAR\"|\"$(US_COMMON_VERSION)\"|g" | sed "s|\"VERSION_FOR_REBAR\"|\"$(VERSION_FOR_REBAR)\"|g" | sed "s|FIRST_FILES_FOR_REBAR|$(MYRIAD_REBAR_FIRST_FILES)|g" | sed "s|DEBUG_KEY_FOR_REBAR|$(DEBUG_INFO_KEY)|g"| sed "s|INCS_FOR_REBAR|$(MYRIAD_REBAR_INCS)|g" > $@
+	@echo "  Generating $@ from $< (VERSION_FOR_OTP being $(VERSION_FOR_OTP), US_COMMON_VERSION_FOR_OTP being $(US_COMMON_VERSION), TRACES_VERSION_FOR_OTP being $(TRACES_VERSION), WOOPER_VERSION_FOR_OTP being $(WOOPER_VERSION), MYRIAD_VERSION_FOR_OTP being $(MYRIAD_VERSION)); this file should be copied to the root of this layer in order to be taken into account."
+	@cat $< | sed "s|\"MYRIAD_VERSION_FOR_OTP\"|\"$(MYRIAD_VERSION)\"|g" | sed "s|\"WOOPER_VERSION_FOR_OTP\"|\"$(WOOPER_VERSION)\"|g" | sed "s|\"TRACES_VERSION_FOR_OTP\"|\"$(TRACES_VERSION)\"|g" | sed "s|\"US_COMMON_VERSION_FOR_OTP\"|\"$(US_COMMON_VERSION)\"|g" | sed "s|\"VERSION_FOR_OTP\"|\"$(VERSION_FOR_OTP)\"|g" | sed "s|FIRST_FILES_FOR_REBAR|$(MYRIAD_REBAR_FIRST_FILES)|g" | sed "s|DEBUG_KEY_FOR_REBAR|$(DEBUG_INFO_KEY)|g" | sed "s|INCS_FOR_REBAR|$(MYRIAD_REBAR_INCS)|g" > $@
 
 
 clean: clean-local

conf/rebar.config.template

@@ -107,7 +107,7 @@
 {relx, [
 
   % Not 'us_web_release', otherwise plenty of paths will be cluttered:
-  {release, {us_web, "VERSION_FOR_REBAR"},
+  {release, {us_web, "VERSION_FOR_OTP"},
 
 	% Listing an application here seems necessary (otherwise its .app file will
 	% not be found), however it will also result in its automatic starting with

conf/us_web.app.src

@@ -10,8 +10,8 @@
 % ./ebin/us_web.app
 % ./src/us_web.app.src -> ../ebin/us_web.app
 %
-% For more information see the Ceylan-Myriad 'rebar3-create-app-file' make
-% target and its associated comments.
+% For more information see the Ceylan-Myriad 'create-app-file' make target and
+% its associated comments.
 
 % See also:
 % - http://erlang.org/doc/man/app.html
@@ -20,7 +20,7 @@
 
 {application, us_web,
  [{description, "US-Web, the OTP active application offering web services in the context of the Universal Server framework (see http://us-web.esperide.org)"},
-  {vsn, "VERSION_FOR_REBAR"},
+  {vsn, "VERSION_FOR_OTP"},
   {registered, [us_web]},
 
  % Active application:
@@ -55,7 +55,7 @@
   {env,[]},
 
   % Flat hierarchy in ebin here:
-  {modules, [MODULES_FOR_REBAR]},
+  {modules, [MODULES_FOR_OTP]},
 
   {licenses, ["US-Web is licensed by its author (Olivier Boudeville) under the GNU Affero General Public License (AGPL), version 3.0 or later"]},
 

ebin/us_web.app

@@ -10,8 +10,8 @@
 % ./ebin/us_web.app
 % ./src/us_web.app.src -> ../ebin/us_web.app
 %
-% For more information see the Ceylan-Myriad 'rebar3-create-app-file' make
-% target and its associated comments.
+% For more information see the Ceylan-Myriad 'create-app-file' make target and
+% its associated comments.
 
 % See also:
 % - http://erlang.org/doc/man/app.html
@@ -20,7 +20,7 @@
 
 {application, us_web,
  [{description, "US-Web, the OTP active application offering web services in the context of the Universal Server framework (see http://us-web.esperide.org)"},
-  {vsn, "1.1.2"},
+  {vsn, "1.1.3"},
   {registered, [us_web]},
 
  % Active application: