remove perl split-messages tool usage

This commit is contained in:
Vincent Sanders 2020-06-22 00:03:25 +01:00
parent 0ee5e23184
commit 38bfbe9cf6
4 changed files with 13 additions and 13 deletions

View File

@ -138,7 +138,6 @@ MKDIR=mkdir
TOUCH=touch
STRIP?=strip
INSTALL?=install
SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
# build verbosity
ifeq ($(V),1)

View File

@ -123,8 +123,16 @@ S_FRONTEND := \
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND)
# ---------------------------------------------------------------------------
# Target setup
# ---------------------------------------------------------------------------
EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX)
# The filter and target for split messages
MESSAGES_FILTER=atari
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
@ -140,10 +148,6 @@ ATARI_FONT_SOURCE_DIR := $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME)/
ATARI_GENERIC_RESOURCES := de en it ja nl
ATARI_RESOURCES := $(addprefix resources/,$(ATARI_GENERIC_RESOURCES))
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
install-atari:
# ----------------------------------------------------------------------------
@ -196,8 +200,7 @@ endif
$(Q)cp resources/internal.css $(ATARI_TARGET_DIR)res/internal.css
$(Q)cp resources/SearchEngines $(ATARI_TARGET_DIR)res/search
$(Q)cp resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
$(Q)$(RM) $(ATARI_TARGET_DIR)res/messages
$(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages -o $(ATARI_TARGET_DIR)res/messages resources/FatMessages
$(Q)$(INSTALL) -m 644 -T $(MESSAGES_TARGET)/en/Messages $(ATARI_TARGET_DIR)res/messages
$(Q)cp resources/en/welcome.html $(ATARI_TARGET_DIR)res/welcome.html
$(Q)cp resources/en/licence.html $(ATARI_TARGET_DIR)res/licence.html
$(Q)cp resources/en/credits.html $(ATARI_TARGET_DIR)res/credits.html

View File

@ -225,8 +225,7 @@ install-framebuffer:
$(Q)$(INSTALL) -T $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)/netsurf-fb
$(Q)$(INSTALL) -d $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)
$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do $(INSTALL) -m 644 $(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
$(Q)$(RM) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages
$(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages -o $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages -z resources/FatMessages
$(Q)$(INSTALL) -m 644 -T $(MESSAGES_TARGET)/en/Messages $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES)/Messages
# ----------------------------------------------------------------------------
# Package target

View File

@ -86,10 +86,9 @@ NSIS_VERBOSE := 0
endif
# installer messages generation
$(OBJROOT)/messages-en: resources/FatMessages
$(VQ)echo "MSGSPLIT: Language: en Filter: win"
$(Q)$(RM) $@
$(Q)$(SPLIT_MESSAGES) -l en -p win -f messages -o $@ $<
$(OBJROOT)/messages-en: $(MESSAGES_TARGET)/en/Messages
$(VQ)echo " MSGCP: $< $@"
$(Q)$(INSTALL) -m 644 -T $< $@
netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
$(VQ)echo "MAKENSIS: $@"