Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/5094a3fd048e06a49bb232ae7eb09821c512c8a0
...commit
http://git.netsurf-browser.org/netsurf.git/commit/5094a3fd048e06a49bb232ae7eb09821c512c8a0
...tree
http://git.netsurf-browser.org/netsurf.git/tree/5094a3fd048e06a49bb232ae7eb09821c512c8a0
The branch, master has been updated
via 5094a3fd048e06a49bb232ae7eb09821c512c8a0 (commit)
via 83e8f377ad4fd99bab6da6eca0228762bc4e630e (commit)
from 42f5bb6182f90313eceb3c1b60bfd4792bbba3d5 (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=5094a3fd048e06a49bb232ae7eb09821c512c8a0
commit 5094a3fd048e06a49bb232ae7eb09821c512c8a0
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Rework use of split-messages to clean up and use -z
diff --git a/Makefile b/Makefile
index 0ce9cdd..a4c5949 100644
--- a/Makefile
+++ b/Makefile
@@ -651,16 +651,12 @@ S_COMMON := \
# Message splitting rule generation macro
# 1 = Language
define split_messages
-.INTERMEDIATE:$$(MESSAGES_TARGET)/$(1)/Messages.tmp
-$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
+$$(MESSAGES_TARGET)/$(1)/Messages: 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: $$@"
- $$(Q)gzip -9n < $$< > $$@
+ $$(Q)$$(RM) $$@
+ $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o
$$@ -z $$<
CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index a2f27e2..f07543e 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -177,7 +177,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)$(SPLIT_MESSAGES) -l en -p atari -f messages resources/FatMessages
> $(ATARI_TARGET_DIR)res/messages
+ $(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)cp \!NetSurf/Resources/en/welcome.html,faf
$(ATARI_TARGET_DIR)res/welcome.html
$(Q)cp \!NetSurf/Resources/en/maps.html,faf
$(ATARI_TARGET_DIR)res/maps.html
$(Q)cp \!NetSurf/Resources/en/licence.html,faf
$(ATARI_TARGET_DIR)res/licence.html
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 323ca6c..055ef90 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -177,7 +177,8 @@ install-framebuffer:
$(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb
$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL
$(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
- $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages |
gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
+ $(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
# ----------------------------------------------------------------------------
# Package target
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 50d0d4b..de01ce3 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -84,6 +84,7 @@ 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 $@ $<
netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=83e8f377ad4fd99bab6da6eca0228762bc4e630e
commit 83e8f377ad4fd99bab6da6eca0228762bc4e630e
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Support compression on output stream
diff --git a/utils/split-messages.pl b/utils/split-messages.pl
index 570ae03..4b50dde 100644
--- a/utils/split-messages.pl
+++ b/utils/split-messages.pl
@@ -34,6 +34,8 @@ use strict;
use Getopt::Long ();
use Fcntl qw( O_CREAT O_EXCL O_WRONLY O_APPEND O_RDONLY O_WRONLY );
+use IO::Compress::Gzip;
+
use constant GETOPT_OPTS => qw( auto_abbrev no_getopt_compat bundling );
use constant GETOPT_SPEC =>
qw( output|o=s
@@ -43,6 +45,7 @@ use constant GETOPT_SPEC =>
plat|platform|p=s
format|fmt|f=s
warning|W=s
+ gzip|z
help|h|? );
# default option values:
@@ -214,7 +217,7 @@ sub input_stream ()
return \*STDIN;
}
-sub output_stream ()
+sub underlying_output_stream ()
{
if( $opt{output} )
{
@@ -229,6 +232,18 @@ sub output_stream ()
return \*STDOUT;
}
+sub output_stream ()
+{
+ my $ofh = underlying_output_stream();
+
+ if( $opt{gzip} )
+ {
+ $ofh = new IO::Compress::Gzip( $ofh, AutoClose => 1, -Level => 9 );
+ }
+
+ return $ofh;
+}
+
sub formatter ()
{
my $name = $opt{format};
-----------------------------------------------------------------------
Summary of changes:
Makefile | 10 +++-------
frontends/atari/Makefile | 3 ++-
frontends/framebuffer/Makefile | 3 ++-
frontends/windows/Makefile | 1 +
utils/split-messages.pl | 17 ++++++++++++++++-
5 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 0ce9cdd..a4c5949 100644
--- a/Makefile
+++ b/Makefile
@@ -651,16 +651,12 @@ S_COMMON := \
# Message splitting rule generation macro
# 1 = Language
define split_messages
-.INTERMEDIATE:$$(MESSAGES_TARGET)/$(1)/Messages.tmp
-$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
+$$(MESSAGES_TARGET)/$(1)/Messages: 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: $$@"
- $$(Q)gzip -9n < $$< > $$@
+ $$(Q)$$(RM) $$@
+ $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o
$$@ -z $$<
CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index a2f27e2..f07543e 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -177,7 +177,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)$(SPLIT_MESSAGES) -l en -p atari -f messages resources/FatMessages
> $(ATARI_TARGET_DIR)res/messages
+ $(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)cp \!NetSurf/Resources/en/welcome.html,faf
$(ATARI_TARGET_DIR)res/welcome.html
$(Q)cp \!NetSurf/Resources/en/maps.html,faf
$(ATARI_TARGET_DIR)res/maps.html
$(Q)cp \!NetSurf/Resources/en/licence.html,faf
$(ATARI_TARGET_DIR)res/licence.html
diff --git a/frontends/framebuffer/Makefile b/frontends/framebuffer/Makefile
index 323ca6c..055ef90 100644
--- a/frontends/framebuffer/Makefile
+++ b/frontends/framebuffer/Makefile
@@ -177,7 +177,8 @@ install-framebuffer:
$(Q)$(MKDIR) -p $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)
$(Q)cp -v $(EXETARGET) $(DESTDIR)/$(NETSURF_FRAMEBUFFER_BIN)netsurf-fb
$(Q)for F in $(NETSURF_FRAMEBUFFER_RESOURCE_LIST); do cp -vL
$(FRONTEND_RESOURCES_DIR)/$$F $(DESTDIR)/$(NETSURF_FRAMEBUFFER_RESOURCES); done
- $(Q)$(SPLIT_MESSAGES) -l en -p fb -f messages resources/FatMessages |
gzip -9n > $(DESTDIR)$(NETSURF_FRAMEBUFFER_RESOURCES)messages
+ $(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
# ----------------------------------------------------------------------------
# Package target
diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile
index 50d0d4b..de01ce3 100644
--- a/frontends/windows/Makefile
+++ b/frontends/windows/Makefile
@@ -84,6 +84,7 @@ 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 $@ $<
netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ)
diff --git a/utils/split-messages.pl b/utils/split-messages.pl
index 570ae03..4b50dde 100644
--- a/utils/split-messages.pl
+++ b/utils/split-messages.pl
@@ -34,6 +34,8 @@ use strict;
use Getopt::Long ();
use Fcntl qw( O_CREAT O_EXCL O_WRONLY O_APPEND O_RDONLY O_WRONLY );
+use IO::Compress::Gzip;
+
use constant GETOPT_OPTS => qw( auto_abbrev no_getopt_compat bundling );
use constant GETOPT_SPEC =>
qw( output|o=s
@@ -43,6 +45,7 @@ use constant GETOPT_SPEC =>
plat|platform|p=s
format|fmt|f=s
warning|W=s
+ gzip|z
help|h|? );
# default option values:
@@ -214,7 +217,7 @@ sub input_stream ()
return \*STDIN;
}
-sub output_stream ()
+sub underlying_output_stream ()
{
if( $opt{output} )
{
@@ -229,6 +232,18 @@ sub output_stream ()
return \*STDOUT;
}
+sub output_stream ()
+{
+ my $ofh = underlying_output_stream();
+
+ if( $opt{gzip} )
+ {
+ $ofh = new IO::Compress::Gzip( $ofh, AutoClose => 1, -Level => 9 );
+ }
+
+ return $ofh;
+}
+
sub formatter ()
{
my $name = $opt{format};
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
