Skip to content

Commit

Permalink
fixed git describe if there is no tag, add logtable messages.properti…
Browse files Browse the repository at this point in the history
…es for the site
  • Loading branch information
jeonghanlee committed Oct 18, 2024
1 parent cc098cc commit f2b81f2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion configure/RULES_INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion configure/RULES_PHOEBUS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -84,3 +89,4 @@ prop.phoebus.clean: $(PHOEBUS_SETTINGS).in

prop.phoebus.show: $(PHOEBUS_SETTINGS).in
$(QUIET)cat -b $(basename $<)

0 comments on commit f2b81f2

Please sign in to comment.