From 38bfbe9cf65fb6913b609e37ef9d5d6320201c54 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 22 Jun 2020 00:03:25 +0100 Subject: remove perl split-messages tool usage --- Makefile | 1 - frontends/atari/Makefile | 15 +++++++++------ frontends/framebuffer/Makefile | 3 +-- frontends/windows/Makefile | 7 +++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 21e1f2a80..1af792ade 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,6 @@ MKDIR=mkdir TOUCH=touch STRIP?=strip INSTALL?=install -SPLIT_MESSAGES=$(PERL) utils/split-messages.pl # build verbosity ifeq ($(V),1) diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 66bfd6868..6de15b62e 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -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 diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile index e035afb00..f4a7494e2 100644 --- a/frontends/framebuffer/Makefile +++ b/frontends/framebuffer/Makefile @@ -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 diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile index 80a947867..4e74edd7a 100644 --- a/frontends/windows/Makefile +++ b/frontends/windows/Makefile @@ -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: $@" -- cgit v1.2.3