diff --git a/configure/RULES_INSTALL b/configure/RULES_INSTALL index caa7613..b801474 100644 --- a/configure/RULES_INSTALL +++ b/configure/RULES_INSTALL @@ -91,7 +91,7 @@ src_version: FORCE $(QUIET)echo "- SRC REMOTE URL : $(PS_SRC_GITURL)" >> $(PS_SITE_TEMPLATE_PATH)/.versions $(QUIET)echo "- SRC SITE VERSION : $(PS_SRC_TAG)" >> $(PS_SITE_TEMPLATE_PATH)/.versions $(QUIET)echo "- SRC GIT VERSION : " >> $(PS_SITE_TEMPLATE_PATH)/.versions - $(QUIET)cd $(PS_SRC_ROOT) && git describe --tags >> $(PS_SITE_TEMPLATE_PATH)/.versions + $(QUIET)-cd $(PS_SRC_ROOT) && git describe --always >> $(PS_SITE_TEMPLATE_PATH)/.versions clean: diff --git a/configure/RULES_PHOEBUS b/configure/RULES_PHOEBUS index f795e79..836fe47 100644 --- a/configure/RULES_PHOEBUS +++ b/configure/RULES_PHOEBUS @@ -19,11 +19,16 @@ ifeq ($(UNAME_S),Darwin) endif endif -build.phoebus: depverify phoebus +build.phoebus: prop.alarm-log-table depverify phoebus +# Java Dependency verification depverify: $(QUIET)JAVA_HOME=$(JAVA_HOME) $(MAVEN_CMD) clean verify -f $(PS_SRC_ROOT)/dependencies/pom.xml +# Alarm Log Table Customization (Table header, default visible options) +prop.alarm-log-table: + cp $(PS_SITE_TEMPLATE_PATH)/$(LOGGER_LOGTABLE_MSG_PROPERTIES) $(PS_SRC_ROOT)/app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages.properities + .PHONY: install.phoebus uninstall.phoebus sh.phoebus sh_clean.phoebus prop.phoebus prop_clean.phoebus install.phoebus: src_version sh.phoebus @@ -84,3 +89,4 @@ prop.phoebus.clean: $(PHOEBUS_SETTINGS).in prop.phoebus.show: $(PHOEBUS_SETTINGS).in $(QUIET)cat -b $(basename $<) +