8:37 a.m.
Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6b7d724311bb785b0893f...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6b7d724311bb785b0893f1d...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6b7d724311bb785b0893f1db9...
The branch, master has been updated
via 6b7d724311bb785b0893f1db900db9e9595bd176 (commit)
via 694baf4bc7f7871b49b0a2f823554f73d2f1bfb7 (commit)
via 5142d59d412a191e97b6c683c135f8593e40345d (commit)
via fa6fed166df85eece10d67f79f39fa0b94893518 (commit)
via 748efc0c40c7067651c92091155dd020bf3cfff4 (commit)
via 05c742df09825079be2d21b8e52726f68cc5343c (commit)
from d3c4eb73631b0f3fb5b08400592f438f0cf71f79 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=6b7d724311bb785b089...
commit 6b7d724311bb785b0893f1db900db9e9595bd176
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
update beos meakfile to filter split messages
diff --git a/beos/Makefile.target b/beos/Makefile.target
index bab6429..8b41a96 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -121,6 +121,9 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+# The filter and target for split messages
+MESSAGES_FILTER=beos
+
# ----------------------------------------------------------------------------
# Resources
# ----------------------------------------------------------------------------
@@ -153,7 +156,6 @@ install-beos:
@cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
@cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- $(call split_install_messages, beos, $(DESTDIR)$(NETSURF_BEOS_RESOURCES))
# ----------------------------------------------------------------------------
# Package target
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=694baf4bc7f7871b49b...
commit 694baf4bc7f7871b49b0a2f823554f73d2f1bfb7
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update amiga makefile to set filter for split messages
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index bca0c30..9c7b8f5 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -61,6 +61,9 @@ endif
EXETARGET := NetSurf
+# The filter and target for split messages
+MESSAGES_FILTER=ami
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -116,7 +119,6 @@ netsurf.lha: $(EXETARGET)
$(Q)cp \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
$(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
$(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
- $(call split_install_messages, ami, $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/)
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5142d59d412a191e97b...
commit 5142d59d412a191e97b6c683c135f8593e40345d
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update RISC OS make target to filter split messages
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index e40795c..de848cf 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -36,7 +36,7 @@ $(eval $(call
pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
!NetSurf/Resources/$(TPL)/Templates$(TPLEXT))
-RESOURCES = $(TPD_RISCOS) split-messages
+RESOURCES = $(TPD_RISCOS)
CFLAGS += -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
-mpoke-function-name -fno-strict-aliasing
@@ -89,6 +89,9 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS)
EXETARGET := !NetSurf/!RunImage$(EXEEXT)
+# The filter and target for split messages
+MESSAGES_FILTER=ro
+
!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET)
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
@@ -115,10 +118,6 @@ clean-help:
CLEANS += clean-run clean-help
-split-messages:
- $(call split_install_messages, ro, !NetSurf/Resources/)
-.PHONY: split-messages
-
# ----------------------------------------------------------------------------
# Template targets
# ----------------------------------------------------------------------------
@@ -127,6 +126,7 @@ split-messages:
TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
+# Template target creation macro
define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(2)"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=fa6fed166df85eece10...
commit fa6fed166df85eece10d67f79f39fa0b94893518
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
squash
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 480f04c..23c0145 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -156,7 +156,6 @@ install-gtk:
$(Q)install -m 0644 gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
$(Q)tar -c -h -C gtk/res -f - themes | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f
-
$(Q)tar -c -h -C gtk/res -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
- $(call split_install_messages, gtk, $(DESTDIR)$(NETSURF_GTK_RESOURCES))
$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES)
# ----------------------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=748efc0c40c7067651c...
commit 748efc0c40c7067651c92091155dd020bf3cfff4
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Improve split message generation
Changes the way message files are generated to be driven by make as
rules rather than from explicit macro calls causing their regeneration
every build.
A secondary benefit is that errors in message generation actually stop
the build instead of being ignored
Each frontend will require its filter settings updated to avoid
getting the default message filter of "any". Initially gtk has been
adapted as proof of concept.
diff --git a/.gitignore b/.gitignore
index 43881bd..4102f3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,11 @@ windows/res/preferences
\!NetSurf/Resources/nl/Templates,fec
\!NetSurf/Resources/nl/Messages
\!NetSurf/Resources/it/Messages
+gtk/res/en/Messages
+gtk/res/fr/Messages
+gtk/res/de/Messages
+gtk/res/nl/Messages
+gtk/res/it/Messages
test/nsoption
test/nsurl
test/urldbtest
diff --git a/Makefile b/Makefile
index d54bfd4..549bfb5 100644
--- a/Makefile
+++ b/Makefile
@@ -122,9 +122,23 @@ ifeq ($(filter $(VLDTARGET),$(TARGET)),)
$(error Unknown TARGET "$(TARGET)", Must be one of $(VLDTARGET))
endif
-SUBTARGET =
-RESOURCES =
-
+# ensure empty values for base variables
+
+# Sub target for build
+SUBTARGET=
+# Resources executable target depends upon
+RESOURCES=
+# Messages executable target depends on
+MESSAGES:=
+
+# The filter applied to the fat (full) messages to generate split messages
+MESSAGES_FILTER=any
+# The languages in the fat messages to convert
+MESSAGES_LANGUAGES=de en fr it nl
+# The target directory for the split messages
+MESSAGES_TARGET=!NetSurf/Resources
+
+# Defaults for tools
PERL=perl
MKDIR=mkdir
TOUCH=touch
@@ -521,8 +535,7 @@ $(TOOLROOT)/created: $(OBJROOT)/created
$(Q)$(MKDIR) $(TOOLROOT)
$(Q)$(TOUCH) $(TOOLROOT)/created
-CLEANS := clean-target clean-testament
-
+CLEANS :=
POSTEXES :=
# ----------------------------------------------------------------------------
@@ -568,6 +581,39 @@ S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER)
$(S_UTILS) \
# ----------------------------------------------------------------------------
+# Message targets
+# ----------------------------------------------------------------------------
+
+# Message splitting rule generation macro
+# 1 = Language
+define split_messages
+.INTERMEDIATE:$$(MESSAGES_TARGET)/$(1)/Messages.tmp
+
+$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
+ $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
+ $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1)
+ $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ $$<
+
+$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
+ $$(VQ)echo "COMPRESS: $$@"
+ $$(VQ)gzip -9n < $$< > $$@
+
+CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
+MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
+
+endef
+
+# geenrate the message file rules
+$(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \
+ $(call split_messages,$(LANG))))
+
+clean-messages:
+ $(VQ)echo " CLEAN: $(CLEAN_MESSAGES)"
+ $(Q)$(RM) $(CLEAN_MESSAGES)
+CLEANS += clean-messages
+
+
+# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -580,7 +626,7 @@ endif
OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst
%.cpp,%.o,$(patsubst %.m,%.o,$(patsubst %.s,%.o,$(SOURCES))))))))
-$(EXETARGET): $(OBJECTS) $(RESOURCES)
+$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
$(VQ)echo " LINK: $(EXETARGET)"
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
@@ -615,11 +661,12 @@ endif
clean-target:
$(VQ)echo " CLEAN: $(EXETARGET)"
$(Q)$(RM) $(EXETARGET)
- $(call clean_install_messages, !NetSurf/Resources)
+CLEANS += clean-target
clean-testament:
$(VQ)echo " CLEAN: testament.h"
$(Q)$(RM) $(OBJROOT)/testament.h
+CLEANS += clean-testament
clean-builddir:
$(VQ)echo " CLEAN: $(OBJROOT)"
@@ -627,15 +674,12 @@ clean-builddir:
CLEANS += clean-builddir
-.PHONY: all-program all-messages testament
+.PHONY: all-program testament
testament $(OBJROOT)/testament.h:
$(Q)$(PERL) utils/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h
-all-messages:
- $(call split_install_messages, any, !NetSurf/Resources)
-
-all-program: all-messages $(EXETARGET) $(POSTEXES)
+all-program: $(EXETARGET) $(POSTEXES)
.SUFFIXES:
@@ -758,25 +802,6 @@ clean: $(CLEANS)
# Target builds a distribution package
package: all-program package-$(TARGET)
-FAT_LANGUAGES=de en fr it nl
-# 1 = front end name (gtk, ro, ami, etc)
-# 2 = Destination directory (where resources being installed, creates en/Messages etc)
-# 3 = suffix after language name
-define split_install_messages
- $(foreach LANG, $(FAT_LANGUAGES), @echo MSGSPLIT: $(1)/$(LANG) to $(2)
- $(Q)mkdir -p $(2)/$(LANG)$(3)
- $(Q)$(SPLIT_MESSAGES) -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n
> $(2)$(3)/$(LANG)/Messages
- )
-endef
-
-# Clean Message target
-# 1 = Destination directory (where resources being installed, creates en/Messages etc)
-# 2 = suffix after language name
-define clean_install_messages
- $(foreach LANG, $(FAT_LANGUAGES), @echo MSGCLEAN: $(LANG) in $(1)
- $(Q)$(RM) -f $(1)$(2)/$(LANG)/Messages
- )
-endef
.PHONY: messages-split-tfx messages-fetch-tfx messages-import-tfx
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index e69f6c2..480f04c 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -121,8 +121,14 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PIXBUF) $(S_GTK)
+
+# The gtk binary target
EXETARGET := nsgtk
+# The filter and target for split messages
+MESSAGES_FILTER=gtk
+MESSAGES_TARGET=gtk/res
+
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
diff --git a/gtk/res/de/Messages b/gtk/res/de/Messages
deleted file mode 120000
index 2f1fc39..0000000
--- a/gtk/res/de/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/de/Messages
\ No newline at end of file
diff --git a/gtk/res/en/Messages b/gtk/res/en/Messages
deleted file mode 120000
index 72c9eff..0000000
--- a/gtk/res/en/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/en/Messages
\ No newline at end of file
diff --git a/gtk/res/fr/Messages b/gtk/res/fr/Messages
deleted file mode 120000
index a42cf08..0000000
--- a/gtk/res/fr/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/fr/Messages
\ No newline at end of file
diff --git a/gtk/res/it/Messages b/gtk/res/it/Messages
deleted file mode 120000
index d4c5c29..0000000
--- a/gtk/res/it/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/it/Messages
\ No newline at end of file
diff --git a/gtk/res/nl/Messages b/gtk/res/nl/Messages
deleted file mode 120000
index d484ebd..0000000
--- a/gtk/res/nl/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/nl/Messages
\ No newline at end of file
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=05c742df09825079be2...
commit 05c742df09825079be2d21b8e52726f68cc5343c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Improve the make target validation
diff --git a/Makefile b/Makefile
index 3321086..d54bfd4 100644
--- a/Makefile
+++ b/Makefile
@@ -114,29 +114,17 @@ ifeq ($(TARGET),)
TARGET := gtk
endif
-SUBTARGET =
-RESOURCES =
+# valid values for the TARGET
+VLDTARGET := riscos gtk beos amiga amigaos3 framebuffer windows atari cocoa monkey
-ifneq ($(TARGET),riscos)
- ifneq ($(TARGET),gtk)
- ifneq ($(TARGET),beos)
- ifneq ($(findstring amiga,$(TARGET)),amiga)
- ifneq ($(TARGET),framebuffer)
- ifneq ($(TARGET),windows)
- ifneq ($(TARGET),atari)
- ifneq ($(TARGET),cocoa)
- ifneq ($(TARGET),monkey)
- $(error Unknown TARGET "$(TARGET)", should either be
"riscos", "gtk", "beos", "amiga",
"framebuffer", "windows", "atari" or "cocoa" or
"monkey")
- endif
- endif
- endif
- endif
- endif
- endif
- endif
- endif
+# Check for valid TARGET
+ifeq ($(filter $(VLDTARGET),$(TARGET)),)
+ $(error Unknown TARGET "$(TARGET)", Must be one of $(VLDTARGET))
endif
+SUBTARGET =
+RESOURCES =
+
PERL=perl
MKDIR=mkdir
TOUCH=touch
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 5 +++
Makefile | 111 +++++++++++++++++++++++++++---------------------
amiga/Makefile.target | 4 +-
beos/Makefile.target | 4 +-
gtk/Makefile.target | 7 ++-
gtk/res/de/Messages | 1 -
gtk/res/en/Messages | 1 -
gtk/res/fr/Messages | 1 -
gtk/res/it/Messages | 1 -
gtk/res/nl/Messages | 1 -
riscos/Makefile.target | 10 ++---
11 files changed, 84 insertions(+), 62 deletions(-)
delete mode 120000 gtk/res/de/Messages
delete mode 120000 gtk/res/en/Messages
delete mode 120000 gtk/res/fr/Messages
delete mode 120000 gtk/res/it/Messages
delete mode 120000 gtk/res/nl/Messages
diff --git a/.gitignore b/.gitignore
index 43881bd..4102f3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,11 @@ windows/res/preferences
\!NetSurf/Resources/nl/Templates,fec
\!NetSurf/Resources/nl/Messages
\!NetSurf/Resources/it/Messages
+gtk/res/en/Messages
+gtk/res/fr/Messages
+gtk/res/de/Messages
+gtk/res/nl/Messages
+gtk/res/it/Messages
test/nsoption
test/nsurl
test/urldbtest
diff --git a/Makefile b/Makefile
index 3321086..549bfb5 100644
--- a/Makefile
+++ b/Makefile
@@ -114,29 +114,31 @@ ifeq ($(TARGET),)
TARGET := gtk
endif
-SUBTARGET =
-RESOURCES =
-
-ifneq ($(TARGET),riscos)
- ifneq ($(TARGET),gtk)
- ifneq ($(TARGET),beos)
- ifneq ($(findstring amiga,$(TARGET)),amiga)
- ifneq ($(TARGET),framebuffer)
- ifneq ($(TARGET),windows)
- ifneq ($(TARGET),atari)
- ifneq ($(TARGET),cocoa)
- ifneq ($(TARGET),monkey)
- $(error Unknown TARGET "$(TARGET)", should either be
"riscos", "gtk", "beos", "amiga",
"framebuffer", "windows", "atari" or "cocoa" or
"monkey")
- endif
- endif
- endif
- endif
- endif
- endif
- endif
- endif
+# valid values for the TARGET
+VLDTARGET := riscos gtk beos amiga amigaos3 framebuffer windows atari cocoa monkey
+
+# Check for valid TARGET
+ifeq ($(filter $(VLDTARGET),$(TARGET)),)
+ $(error Unknown TARGET "$(TARGET)", Must be one of $(VLDTARGET))
endif
+# ensure empty values for base variables
+
+# Sub target for build
+SUBTARGET=
+# Resources executable target depends upon
+RESOURCES=
+# Messages executable target depends on
+MESSAGES:=
+
+# The filter applied to the fat (full) messages to generate split messages
+MESSAGES_FILTER=any
+# The languages in the fat messages to convert
+MESSAGES_LANGUAGES=de en fr it nl
+# The target directory for the split messages
+MESSAGES_TARGET=!NetSurf/Resources
+
+# Defaults for tools
PERL=perl
MKDIR=mkdir
TOUCH=touch
@@ -533,8 +535,7 @@ $(TOOLROOT)/created: $(OBJROOT)/created
$(Q)$(MKDIR) $(TOOLROOT)
$(Q)$(TOUCH) $(TOOLROOT)/created
-CLEANS := clean-target clean-testament
-
+CLEANS :=
POSTEXES :=
# ----------------------------------------------------------------------------
@@ -580,6 +581,39 @@ S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER)
$(S_UTILS) \
# ----------------------------------------------------------------------------
+# Message targets
+# ----------------------------------------------------------------------------
+
+# Message splitting rule generation macro
+# 1 = Language
+define split_messages
+.INTERMEDIATE:$$(MESSAGES_TARGET)/$(1)/Messages.tmp
+
+$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
+ $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
+ $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1)
+ $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ $$<
+
+$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
+ $$(VQ)echo "COMPRESS: $$@"
+ $$(VQ)gzip -9n < $$< > $$@
+
+CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
+MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
+
+endef
+
+# geenrate the message file rules
+$(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \
+ $(call split_messages,$(LANG))))
+
+clean-messages:
+ $(VQ)echo " CLEAN: $(CLEAN_MESSAGES)"
+ $(Q)$(RM) $(CLEAN_MESSAGES)
+CLEANS += clean-messages
+
+
+# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -592,7 +626,7 @@ endif
OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst
%.cpp,%.o,$(patsubst %.m,%.o,$(patsubst %.s,%.o,$(SOURCES))))))))
-$(EXETARGET): $(OBJECTS) $(RESOURCES)
+$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
$(VQ)echo " LINK: $(EXETARGET)"
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
@@ -627,11 +661,12 @@ endif
clean-target:
$(VQ)echo " CLEAN: $(EXETARGET)"
$(Q)$(RM) $(EXETARGET)
- $(call clean_install_messages, !NetSurf/Resources)
+CLEANS += clean-target
clean-testament:
$(VQ)echo " CLEAN: testament.h"
$(Q)$(RM) $(OBJROOT)/testament.h
+CLEANS += clean-testament
clean-builddir:
$(VQ)echo " CLEAN: $(OBJROOT)"
@@ -639,15 +674,12 @@ clean-builddir:
CLEANS += clean-builddir
-.PHONY: all-program all-messages testament
+.PHONY: all-program testament
testament $(OBJROOT)/testament.h:
$(Q)$(PERL) utils/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h
-all-messages:
- $(call split_install_messages, any, !NetSurf/Resources)
-
-all-program: all-messages $(EXETARGET) $(POSTEXES)
+all-program: $(EXETARGET) $(POSTEXES)
.SUFFIXES:
@@ -770,25 +802,6 @@ clean: $(CLEANS)
# Target builds a distribution package
package: all-program package-$(TARGET)
-FAT_LANGUAGES=de en fr it nl
-# 1 = front end name (gtk, ro, ami, etc)
-# 2 = Destination directory (where resources being installed, creates en/Messages etc)
-# 3 = suffix after language name
-define split_install_messages
- $(foreach LANG, $(FAT_LANGUAGES), @echo MSGSPLIT: $(1)/$(LANG) to $(2)
- $(Q)mkdir -p $(2)/$(LANG)$(3)
- $(Q)$(SPLIT_MESSAGES) -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n
> $(2)$(3)/$(LANG)/Messages
- )
-endef
-
-# Clean Message target
-# 1 = Destination directory (where resources being installed, creates en/Messages etc)
-# 2 = suffix after language name
-define clean_install_messages
- $(foreach LANG, $(FAT_LANGUAGES), @echo MSGCLEAN: $(LANG) in $(1)
- $(Q)$(RM) -f $(1)$(2)/$(LANG)/Messages
- )
-endef
.PHONY: messages-split-tfx messages-fetch-tfx messages-import-tfx
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index bca0c30..9c7b8f5 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -61,6 +61,9 @@ endif
EXETARGET := NetSurf
+# The filter and target for split messages
+MESSAGES_FILTER=ami
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -116,7 +119,6 @@ netsurf.lha: $(EXETARGET)
$(Q)cp \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
$(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
$(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
- $(call split_install_messages, ami, $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/)
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
diff --git a/beos/Makefile.target b/beos/Makefile.target
index bab6429..8b41a96 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -121,6 +121,9 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+# The filter and target for split messages
+MESSAGES_FILTER=beos
+
# ----------------------------------------------------------------------------
# Resources
# ----------------------------------------------------------------------------
@@ -153,7 +156,6 @@ install-beos:
@cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
@cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- $(call split_install_messages, beos, $(DESTDIR)$(NETSURF_BEOS_RESOURCES))
# ----------------------------------------------------------------------------
# Package target
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index e69f6c2..23c0145 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -121,8 +121,14 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PIXBUF) $(S_GTK)
+
+# The gtk binary target
EXETARGET := nsgtk
+# The filter and target for split messages
+MESSAGES_FILTER=gtk
+MESSAGES_TARGET=gtk/res
+
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
@@ -150,7 +156,6 @@ install-gtk:
$(Q)install -m 0644 gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
$(Q)tar -c -h -C gtk/res -f - themes | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f
-
$(Q)tar -c -h -C gtk/res -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C
$(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
- $(call split_install_messages, gtk, $(DESTDIR)$(NETSURF_GTK_RESOURCES))
$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES)
# ----------------------------------------------------------------------------
diff --git a/gtk/res/de/Messages b/gtk/res/de/Messages
deleted file mode 120000
index 2f1fc39..0000000
--- a/gtk/res/de/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/de/Messages
\ No newline at end of file
diff --git a/gtk/res/en/Messages b/gtk/res/en/Messages
deleted file mode 120000
index 72c9eff..0000000
--- a/gtk/res/en/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/en/Messages
\ No newline at end of file
diff --git a/gtk/res/fr/Messages b/gtk/res/fr/Messages
deleted file mode 120000
index a42cf08..0000000
--- a/gtk/res/fr/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/fr/Messages
\ No newline at end of file
diff --git a/gtk/res/it/Messages b/gtk/res/it/Messages
deleted file mode 120000
index d4c5c29..0000000
--- a/gtk/res/it/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/it/Messages
\ No newline at end of file
diff --git a/gtk/res/nl/Messages b/gtk/res/nl/Messages
deleted file mode 120000
index d484ebd..0000000
--- a/gtk/res/nl/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/nl/Messages
\ No newline at end of file
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index e40795c..de848cf 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -36,7 +36,7 @@ $(eval $(call
pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
!NetSurf/Resources/$(TPL)/Templates$(TPLEXT))
-RESOURCES = $(TPD_RISCOS) split-messages
+RESOURCES = $(TPD_RISCOS)
CFLAGS += -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
-mpoke-function-name -fno-strict-aliasing
@@ -89,6 +89,9 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS)
EXETARGET := !NetSurf/!RunImage$(EXEEXT)
+# The filter and target for split messages
+MESSAGES_FILTER=ro
+
!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET)
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
@@ -115,10 +118,6 @@ clean-help:
CLEANS += clean-run clean-help
-split-messages:
- $(call split_install_messages, ro, !NetSurf/Resources/)
-.PHONY: split-messages
-
# ----------------------------------------------------------------------------
# Template targets
# ----------------------------------------------------------------------------
@@ -127,6 +126,7 @@ split-messages:
TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
+# Template target creation macro
define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(2)"
--
NetSurf Browser