Merge branch 'prepare_next_release' into 'master'

E3-962: Apply changes for the next e3 release

See merge request !11

ADPointGrey.Makefile

@@ -24,15 +24,7 @@
 
 where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include $(E3_REQUIRE_TOOLS)/driver.makefile
-include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
 
-ifneq ($(strip $(ASYN_DEP_VERSION)),)
-asyn_VERSION=$(ASYN_DEP_VERSION)
-endif
-
-ifneq ($(strip $(ADCORE_DEP_VERSION)),)
-adcore_VERSION=$(ADCORE_DEP_VERSION)
-endif
 
 # Exclude linux-ppc64e6500
 EXCLUDE_ARCHS = linux-ppc64e6500
@@ -125,27 +117,11 @@ USR_DBFLAGS += -I $(APPDB)
 
 # pointGrey.template includes ADCore.template
 #
-USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adcore/$(call FETCH_BUILD_NUMBER,$(E3_SITEMODS_PATH),adcore)/db
+USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adcore/$(call FETCH_REVISION_NUMBER,$(E3_SITEMODS_PATH),adcore)/db
 
 SUBS=$(wildcard $(APPDB)/*.substitutions)
 TMPS=$(wildcard $(APPDB)/*.template)
 
-db: $(SUBS) $(TMPS)
-
-$(SUBS):
-	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db -S $@  > $(basename $(@)).db.d
-	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db -S $@
-
-$(TMPS):
-	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@  > $(basename $(@)).db.d
-	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db $@
-
-
-.PHONY: db $(SUBS) $(TMPS)
 
 
 # Overwrite

configure/CONFIG

@@ -14,7 +14,7 @@ include $(TOP)/configure/CONFIG_MODULE
 endif
 
 E3_REQUIRE_LOCATION := $(EPICS_BASE)/$(E3_REQUIRE_NAME)/$(E3_REQUIRE_VERSION)
-REQUIRE_CONFIG := $(E3_REQUIRE_LOCATION)/configure
 
-include $(REQUIRE_CONFIG)/CONFIG
+
+include $(E3_REQUIRE_LOCATION)/configure/CONFIG
 

configure/RULES

 
-include $(REQUIRE_CONFIG)/RULES_SITEMODS
+include $(E3_REQUIRE_CONFIG)/RULES_SITEMODS
 
 include $(TOP)/configure/module/RULES_MODULE
 -include $(TOP)/configure/module/RULES_DKMS_L

configure/module/RULES_MODULE

 #
-.PHONY: db hdrs epics epics-clean
-
-db: conf
-	#install -m 644 $(TOP)/template/pointGreyPG1-ess.substitutions  $(E3_MODULE_SRC_PATH)/pointGreyApp/Db/
-	#install -m 644 $(TOP)/template/pointGreyPG2-ess.substitutions  $(E3_MODULE_SRC_PATH)/pointGreyApp/Db/
-	install -m 644 $(TOP)/template/*-ess.substitutions  $(E3_MODULE_SRC_PATH)/pointGreyApp/Db/
-	$(QUIET) $(E3_MODULE_MAKE_CMDS) db
+.PHONY: hdrs epics epics-clean
 
 hdrs:
 #	$(SUDO) install -m 755 -d $(E3_MODULES_INSTALL_LOCATION_INC)/pv