netsurf: branch master updated. release/3.0-22-g98369b7

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Thu May 2 09:25:02 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/98369b74e21fb5cf769fcfdf0e717cf6592736c1
...commit http://git.netsurf-browser.org/netsurf.git/commit/98369b74e21fb5cf769fcfdf0e717cf6592736c1
...tree http://git.netsurf-browser.org/netsurf.git/tree/98369b74e21fb5cf769fcfdf0e717cf6592736c1

The branch, master has been updated
       via  98369b74e21fb5cf769fcfdf0e717cf6592736c1 (commit)
      from  2f03a0bfaf10f3bba7c041d7d5189f764735d5fd (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=98369b74e21fb5cf769fcfdf0e717cf6592736c1
commit 98369b74e21fb5cf769fcfdf0e717cf6592736c1
Author: Vincent Sanders <vince at netsurf-browser.org>
Commit: Vincent Sanders <vince at netsurf-browser.org>

    fixup message splitting with updated tool

diff --git a/Makefile b/Makefile
index e57800b..88cb9bb 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ PERL=perl
 MKDIR=mkdir
 TOUCH=touch
 STRIP=strip
+SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
 
 # Override this only if the host compiler is called something different
 HOST_CC := gcc
@@ -744,7 +745,7 @@ FAT_LANGUAGES=de en fr it nl
 define split_install_messages
 	$(foreach LANG, $(FAT_LANGUAGES), @echo MSGSPLIT: $(1)/$(LANG) to $(2)
 		$(Q)mkdir -p $(2)/$(LANG)$(3)
-		$(Q)$(PERL) utils/split-messages.pl -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n > $(2)$(3)/$(LANG)/Messages
+		$(Q)$(SPLIT_MESSAGES) -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n > $(2)$(3)/$(LANG)/Messages
 	)
 endef
 
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index dcc130a..4f5eb84 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -27,8 +27,8 @@ makedir ram:NetSurf/SObjs
 copy sobjs:libjpeg.so.8 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone
 ;sobjs:libhpdf-2.2.0.so.0.0
 echo "Splitting Messages file"
-perl utils/split-messages.pl de ami < resources/FatMessages >RAM:NetSurf/Resources/de/Messages
-perl utils/split-messages.pl en ami < resources/FatMessages >RAM:NetSurf/Resources/en/Messages
-perl utils/split-messages.pl fr ami < resources/FatMessages >RAM:NetSurf/Resources/fr/Messages
-perl utils/split-messages.pl it ami < resources/FatMessages >RAM:NetSurf/Resources/it/Messages
-perl utils/split-messages.pl nl ami < resources/FatMessages >RAM:NetSurf/Resources/nl/Messages
+perl utils/split-messages.pl -l de -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/de/Messages
+perl utils/split-messages.pl -l en -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/en/Messages
+perl utils/split-messages.pl -l fr -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/fr/Messages
+perl utils/split-messages.pl -l it -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/it/Messages
+perl utils/split-messages.pl -l nl -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/nl/Messages
diff --git a/atari/Makefile.target b/atari/Makefile.target
index d339292..95d675f 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -191,9 +191,8 @@ endif
 	$(Q)cp \!NetSurf/Resources/internal.css,f79 $(ATARI_TARGET_DIR)res/internal.css
 	$(Q)cp \!NetSurf/Resources/SearchEngines $(ATARI_TARGET_DIR)res/search
 	$(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
-#	$(Q)cp resources/FatMessages $(ATARI_TARGET_DIR)res/messages
 	$(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
-	$(Q)$(PERL) utils/split-messages.pl en all < resources/FatMessages > $(ATARI_TARGET_DIR)res/messages
+	$(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages resources/FatMessages > $(ATARI_TARGET_DIR)res/messages
 	$(Q)cp \!NetSurf/Resources/en/welcome.html,faf $(ATARI_TARGET_DIR)res/welcome.html
 	$(Q)cp \!NetSurf/Resources/en/licence.html,faf $(ATARI_TARGET_DIR)res/licence.html
 	$(Q)cp \!NetSurf/Resources/en/credits.html,faf $(ATARI_TARGET_DIR)res/credits.html
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index 2da4c5b..7e2c198 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -168,7 +168,7 @@ $$(OBJROOT)/$(1).lproj: $(2)
 	$(VQ)echo Bundling language $(1)
 	$(Q)mkdir -p $$@
 	$(Q)cp -pLR $(2) $$@
-	$(Q)$(PERL) utils/split-messages.pl $(1) cocoa < resources/FatMessages > $$@/Messages
+	$(Q)$(SPLIT_MESSAGES) -l $(1) -p cocoa -f messages resources/FatMessages > $$@/Messages
 endef
 
 # compile_xib (xib) (lang)
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 8ab8804..1441710 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -171,7 +171,7 @@ install-framebuffer:
 	$(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
 	$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
 	$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
-	$(Q)$(PERL) utils/split-messages.pl en all < resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
+	$(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
 
 # ----------------------------------------------------------------------------
 # Package target
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 33a9492..defb765 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -92,7 +92,7 @@ WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css
 WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ)) $(OBJROOT)/messages
 
 $(OBJROOT)/messages: resources/FatMessages
-	$(PERL) utils/split-messages.pl en all < resources/FatMessages > $@
+	$(Q)$(SPLIT_MESSAGES) -l en -p win -f messages resources/FatMessages > $@
 
 netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
 	makensis -V4 -NOCD windows/res/installer.nsi 


-----------------------------------------------------------------------

Summary of changes:
 Makefile                    |    3 ++-
 amiga/pkg/makepackage       |   10 +++++-----
 atari/Makefile.target       |    3 +--
 cocoa/Makefile.target       |    2 +-
 framebuffer/Makefile.target |    2 +-
 windows/Makefile.target     |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index e57800b..88cb9bb 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,7 @@ PERL=perl
 MKDIR=mkdir
 TOUCH=touch
 STRIP=strip
+SPLIT_MESSAGES=$(PERL) utils/split-messages.pl
 
 # Override this only if the host compiler is called something different
 HOST_CC := gcc
@@ -744,7 +745,7 @@ FAT_LANGUAGES=de en fr it nl
 define split_install_messages
 	$(foreach LANG, $(FAT_LANGUAGES), @echo MSGSPLIT: $(1)/$(LANG) to $(2)
 		$(Q)mkdir -p $(2)/$(LANG)$(3)
-		$(Q)$(PERL) utils/split-messages.pl -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n > $(2)$(3)/$(LANG)/Messages
+		$(Q)$(SPLIT_MESSAGES) -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n > $(2)$(3)/$(LANG)/Messages
 	)
 endef
 
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index dcc130a..4f5eb84 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -27,8 +27,8 @@ makedir ram:NetSurf/SObjs
 copy sobjs:libjpeg.so.8 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so sobjs:libdom.so.0 sobjs:libhubbub.so.0 ram:NetSurf/SObjs clone
 ;sobjs:libhpdf-2.2.0.so.0.0
 echo "Splitting Messages file"
-perl utils/split-messages.pl de ami < resources/FatMessages >RAM:NetSurf/Resources/de/Messages
-perl utils/split-messages.pl en ami < resources/FatMessages >RAM:NetSurf/Resources/en/Messages
-perl utils/split-messages.pl fr ami < resources/FatMessages >RAM:NetSurf/Resources/fr/Messages
-perl utils/split-messages.pl it ami < resources/FatMessages >RAM:NetSurf/Resources/it/Messages
-perl utils/split-messages.pl nl ami < resources/FatMessages >RAM:NetSurf/Resources/nl/Messages
+perl utils/split-messages.pl -l de -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/de/Messages
+perl utils/split-messages.pl -l en -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/en/Messages
+perl utils/split-messages.pl -l fr -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/fr/Messages
+perl utils/split-messages.pl -l it -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/it/Messages
+perl utils/split-messages.pl -l nl -p ami -f messages resources/FatMessages >RAM:NetSurf/Resources/nl/Messages
diff --git a/atari/Makefile.target b/atari/Makefile.target
index d339292..95d675f 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -191,9 +191,8 @@ endif
 	$(Q)cp \!NetSurf/Resources/internal.css,f79 $(ATARI_TARGET_DIR)res/internal.css
 	$(Q)cp \!NetSurf/Resources/SearchEngines $(ATARI_TARGET_DIR)res/search
 	$(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
-#	$(Q)cp resources/FatMessages $(ATARI_TARGET_DIR)res/messages
 	$(Q)cp \!NetSurf/Resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle
-	$(Q)$(PERL) utils/split-messages.pl en all < resources/FatMessages > $(ATARI_TARGET_DIR)res/messages
+	$(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages resources/FatMessages > $(ATARI_TARGET_DIR)res/messages
 	$(Q)cp \!NetSurf/Resources/en/welcome.html,faf $(ATARI_TARGET_DIR)res/welcome.html
 	$(Q)cp \!NetSurf/Resources/en/licence.html,faf $(ATARI_TARGET_DIR)res/licence.html
 	$(Q)cp \!NetSurf/Resources/en/credits.html,faf $(ATARI_TARGET_DIR)res/credits.html
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index 2da4c5b..7e2c198 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -168,7 +168,7 @@ $$(OBJROOT)/$(1).lproj: $(2)
 	$(VQ)echo Bundling language $(1)
 	$(Q)mkdir -p $$@
 	$(Q)cp -pLR $(2) $$@
-	$(Q)$(PERL) utils/split-messages.pl $(1) cocoa < resources/FatMessages > $$@/Messages
+	$(Q)$(SPLIT_MESSAGES) -l $(1) -p cocoa -f messages resources/FatMessages > $$@/Messages
 endef
 
 # compile_xib (xib) (lang)
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 8ab8804..1441710 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -171,7 +171,7 @@ install-framebuffer:
 	$(Q)mkdir -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
 	$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf$(SUBTARGET)
 	$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL framebuffer/res/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
-	$(Q)$(PERL) utils/split-messages.pl en all < resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
+	$(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages | gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
 
 # ----------------------------------------------------------------------------
 # Package target
diff --git a/windows/Makefile.target b/windows/Makefile.target
index 33a9492..defb765 100644
--- a/windows/Makefile.target
+++ b/windows/Makefile.target
@@ -92,7 +92,7 @@ WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css
 WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ)) $(OBJROOT)/messages
 
 $(OBJROOT)/messages: resources/FatMessages
-	$(PERL) utils/split-messages.pl en all < resources/FatMessages > $@
+	$(Q)$(SPLIT_MESSAGES) -l en -p win -f messages resources/FatMessages > $@
 
 netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
 	makensis -V4 -NOCD windows/res/installer.nsi 


-- 
NetSurf Browser



More information about the netsurf-commits mailing list