focus phoebus first, major alarm rules was off

jeonghanlee · Oct 18, 2024 · 23fb42b · 23fb42b
1 parent 31cc582
commit 23fb42b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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)