From 23fb42bb0d9b89f74a52e7d67693620c86b49e1d Mon Sep 17 00:00:00 2001 From: "Lee, Jeong Han" Date: Fri, 18 Oct 2024 11:48:12 -0700 Subject: [PATCH] focus phoebus first, major alarm rules was off --- configure/RULES_INSTALL | 2 +- configure/RULES_PHOEBUS | 4 ++-- configure/RULES_SRC | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure/RULES_INSTALL b/configure/RULES_INSTALL index ad30475..d59b2c3 100644 --- a/configure/RULES_INSTALL +++ b/configure/RULES_INSTALL @@ -45,7 +45,7 @@ install.alarm-config-logger: src_version src_preinst.alarm-config-logger .PHONY: uninstall uninstall.alarm-server uninstall.alarm-logger uninstall.alarm-config-logger -uninstall: uninstall.alarm-server uninstall.alarm-logger uninstall.alarm-config-logger +uninstall: uninstall.phoebus uninstall.alarm-server uninstall.alarm-logger uninstall.alarm-config-logger uninstall.alarm-server: sd_stop.alarm-server sd_disable.alarm-server sd_remove.alarm-server src_postrm.alarm-server diff --git a/configure/RULES_PHOEBUS b/configure/RULES_PHOEBUS index ae2c3d8..d45f8bf 100644 --- a/configure/RULES_PHOEBUS +++ b/configure/RULES_PHOEBUS @@ -28,8 +28,8 @@ depverify: # Alarm Log Table Customization (Table header, default visible options) prop.alarm-log-table: $(QUIET)echo ">>> Remove the existing messages*.properties" - rm $(PS_SRC_ROOT)/app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages.properties - rm $(PS_SRC_ROOT)/app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages_fr.properties + -rm $(PS_SRC_ROOT)/app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages.properties + -rm $(PS_SRC_ROOT)/app/alarm/logging-ui/src/main/resources/org/phoebus/applications/alarm/logging/ui/messages_fr.properties $(QUIET)echo ">>> Copy the site customized messages.properties" 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.properties diff --git a/configure/RULES_SRC b/configure/RULES_SRC index 4987f86..a28934f 100644 --- a/configure/RULES_SRC +++ b/configure/RULES_SRC @@ -75,7 +75,7 @@ info.maven: .PHONY: build build.alarm-server build.alarm-logger build.alarm-config-logger -build: build.alarm-server build.alarm-logger build.alarm-config-logger +build: build.phoebus build.alarm-server build.alarm-logger build.alarm-config-logger build.alarm-server: $(QUIET)JAVA_HOME=$(JAVA_HOME) $(MAVEN_CMD) -f $(SRC_PATH_SERVER)/pom.xml $(MVN_OPTS) clean install -Dmaven.test.skip=true --also-make @@ -87,13 +87,13 @@ build.alarm-config-logger: $(QUIET)JAVA_HOME=$(JAVA_HOME) $(MAVEN_CMD) -f $(SRC_PATH_CONFIGLOGGER)/pom.xml $(MVN_OPTS) clean install -Dmaven.test.skip=true --also-make -restart: restart.alarm-server restart.alarm-logger restart.alarm-config-logger +#restart: restart.alarm-server restart.alarm-logger restart.alarm-config-logger -restart.alarm-server: uninstall.alarm-server build.alarm-server sd_config.alarm-server install.alarm-server sd_start.alarm-server +#restart.alarm-server: uninstall.alarm-server build.alarm-server sd_config.alarm-server install.alarm-server sd_start.alarm-server -restart.alarm-logger: uninstall.alarm-logger build.alarm-logger sd_config.alarm-logger install.alarm-logger sd_start.alarm-logger +#restart.alarm-logger: uninstall.alarm-logger build.alarm-logger sd_config.alarm-logger install.alarm-logger sd_start.alarm-logger -restart.alarm-config-logger: uninstall.alarm-config-logger build.alarm-config-logger sd_config.alarm-config-logger install.alarm-config-logger sd_start.alarm-config-logger +#restart.alarm-config-logger: uninstall.alarm-config-logger build.alarm-config-logger sd_config.alarm-config-logger install.alarm-config-logger sd_start.alarm-config-logger # .PHONY: build $(SRC_PATHS)