Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/38bfbe9cf65fb6913b609e37ef9d5d6320201c54
...commit
http://git.netsurf-browser.org/netsurf.git/commit/38bfbe9cf65fb6913b609e37ef9d5d6320201c54
...tree
http://git.netsurf-browser.org/netsurf.git/tree/38bfbe9cf65fb6913b609e37ef9d5d6320201c54
The branch, master has been updated
via 38bfbe9cf65fb6913b609e37ef9d5d6320201c54 (commit)
via 0ee5e23184d21bdadcbb24c769db09dd46b85356 (commit)
via b2a1aa9b884ebe2b1283ba54a7864335539b66d7 (commit)
from f31fb08c73b9f4c93f3f89fa865715502afcf390 (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=38bfbe9cf65fb6913b609e37ef9d5d6320201c54
commit 38bfbe9cf65fb6913b609e37ef9d5d6320201c54
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove perl split-messages tool usage
diff --git a/Makefile b/Makefile
index 21e1f2a..1af792a 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 66bfd68..6de15b6 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 e035afb..f4a7494 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 80a9478..4e74edd 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: $@"
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=0ee5e23184d21bdadcbb24c769db09dd46b85356
commit 0ee5e23184d21bdadcbb24c769db09dd46b85356
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
change to using compiled split messages to remove a build time perl
dependancy
diff --git a/Makefile b/Makefile
index 9aee147..21e1f2a 100644
--- a/Makefile
+++ b/Makefile
@@ -676,11 +676,11 @@ S_COMMON := \
# 1 = Language
define split_messages
-$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages
+$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages
$$(TOOLROOT)/split-messages
$$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
$$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1)
$$(Q)$$(RM) $$@
- $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o
$$@ -z $$<
+ $$(Q)$$(TOOLROOT)/split-messages -l $(1) -p $$(MESSAGES_FILTER) -f
messages -o $$@ -z $$<
CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=b2a1aa9b884ebe2b1283ba54a7864335539b66d7
commit b2a1aa9b884ebe2b1283ba54a7864335539b66d7
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
improvements from review
diff --git a/utils/split-messages.c b/utils/split-messages.c
index fa384fe..5811514 100644
--- a/utils/split-messages.c
+++ b/utils/split-messages.c
@@ -172,8 +172,13 @@ static nserror process_cmdline(int argc, char **argv,
struct param *param)
return NSERROR_OK;
}
-/***
- * extract key/value from a line
+
+/**
+ * extract key/value from a line of input
+ *
+ * \retun NSERROR_OK and key_out and value_out updated
+ * NSERROR_NOT_FOUND if not a key/value input line
+ * NSERROR_INVALID if the line is and invalid format (missing colon)
*/
static nserror
get_key_value(char *line, ssize_t linelen, char **key_out, char **value_out)
@@ -223,6 +228,10 @@ get_key_value(char *line, ssize_t linelen, char **key_out,
char **value_out)
return NSERROR_OK;
}
+
+/**
+ * extract language, platform and token elements from a string
+ */
static nserror
get_lang_plat_tok(char *str, char **lang_out, char **plat_out, char **tok_out)
{
@@ -259,6 +268,9 @@ get_lang_plat_tok(char *str, char **lang_out, char
**plat_out, char **tok_out)
}
+/**
+ * reverse order of entries in a translation list
+ */
static nserror
translation_list_reverse(struct trnsltn_entry **tlist)
{
@@ -281,6 +293,7 @@ translation_list_reverse(struct trnsltn_entry **tlist)
return NSERROR_OK;
}
+
/**
* find a translation entry from a key
*
@@ -312,6 +325,9 @@ translation_from_key(struct trnsltn_entry *tlist,
}
+/**
+ * create and link an entry into translation list
+ */
static nserror
translation_add(struct trnsltn_entry **tlist,
const char *lang,
@@ -334,6 +350,9 @@ translation_add(struct trnsltn_entry **tlist,
}
+/**
+ * replace key and value on a translation entry
+ */
static nserror
translation_replace(struct trnsltn_entry *tran,
const char *lang,
@@ -350,6 +369,7 @@ translation_replace(struct trnsltn_entry *tran,
return NSERROR_OK;
}
+
/**
* process a line of the input file
*
@@ -395,7 +415,8 @@ messageline(struct param *param,
* new entry is in selected language and
* current entry is not
*/
- res = translation_replace(tran, lang, tok,
value); } else if ((strcmp(lang, param->fallback) != 0) &&
+ res = translation_replace(tran, lang, tok,
value);
+ } else if ((strcmp(lang, param->fallback) != 0) &&
(strcmp(tran->lang, param->fallback) != 0)) {
/*
* new entry is in fallback language and
@@ -417,6 +438,9 @@ messageline(struct param *param,
}
+/**
+ * read fatmessages file and create a translation entry list
+ */
static nserror
fatmessages_read(struct param *param, struct trnsltn_entry **tlist)
{
@@ -454,6 +478,10 @@ fatmessages_read(struct param *param, struct trnsltn_entry
**tlist)
return res;
}
+
+/**
+ * write output in NetSurf messages format
+ */
static nserror
message_write(struct param *param, struct trnsltn_entry *tlist)
{
-----------------------------------------------------------------------
Summary of changes:
Makefile | 5 ++---
frontends/atari/Makefile | 15 +++++++++------
frontends/framebuffer/Makefile | 3 +--
frontends/windows/Makefile | 7 +++----
utils/split-messages.c | 34 +++++++++++++++++++++++++++++++---
5 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 9aee147..1af792a 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)
@@ -676,11 +675,11 @@ S_COMMON := \
# 1 = Language
define split_messages
-$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages
+$$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessages
$$(TOOLROOT)/split-messages
$$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
$$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1)
$$(Q)$$(RM) $$@
- $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o
$$@ -z $$<
+ $$(Q)$$(TOOLROOT)/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 66bfd68..6de15b6 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 e035afb..f4a7494 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 80a9478..4e74edd 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: $@"
diff --git a/utils/split-messages.c b/utils/split-messages.c
index fa384fe..5811514 100644
--- a/utils/split-messages.c
+++ b/utils/split-messages.c
@@ -172,8 +172,13 @@ static nserror process_cmdline(int argc, char **argv,
struct param *param)
return NSERROR_OK;
}
-/***
- * extract key/value from a line
+
+/**
+ * extract key/value from a line of input
+ *
+ * \retun NSERROR_OK and key_out and value_out updated
+ * NSERROR_NOT_FOUND if not a key/value input line
+ * NSERROR_INVALID if the line is and invalid format (missing colon)
*/
static nserror
get_key_value(char *line, ssize_t linelen, char **key_out, char **value_out)
@@ -223,6 +228,10 @@ get_key_value(char *line, ssize_t linelen, char **key_out,
char **value_out)
return NSERROR_OK;
}
+
+/**
+ * extract language, platform and token elements from a string
+ */
static nserror
get_lang_plat_tok(char *str, char **lang_out, char **plat_out, char **tok_out)
{
@@ -259,6 +268,9 @@ get_lang_plat_tok(char *str, char **lang_out, char
**plat_out, char **tok_out)
}
+/**
+ * reverse order of entries in a translation list
+ */
static nserror
translation_list_reverse(struct trnsltn_entry **tlist)
{
@@ -281,6 +293,7 @@ translation_list_reverse(struct trnsltn_entry **tlist)
return NSERROR_OK;
}
+
/**
* find a translation entry from a key
*
@@ -312,6 +325,9 @@ translation_from_key(struct trnsltn_entry *tlist,
}
+/**
+ * create and link an entry into translation list
+ */
static nserror
translation_add(struct trnsltn_entry **tlist,
const char *lang,
@@ -334,6 +350,9 @@ translation_add(struct trnsltn_entry **tlist,
}
+/**
+ * replace key and value on a translation entry
+ */
static nserror
translation_replace(struct trnsltn_entry *tran,
const char *lang,
@@ -350,6 +369,7 @@ translation_replace(struct trnsltn_entry *tran,
return NSERROR_OK;
}
+
/**
* process a line of the input file
*
@@ -395,7 +415,8 @@ messageline(struct param *param,
* new entry is in selected language and
* current entry is not
*/
- res = translation_replace(tran, lang, tok,
value); } else if ((strcmp(lang, param->fallback) != 0) &&
+ res = translation_replace(tran, lang, tok,
value);
+ } else if ((strcmp(lang, param->fallback) != 0) &&
(strcmp(tran->lang, param->fallback) != 0)) {
/*
* new entry is in fallback language and
@@ -417,6 +438,9 @@ messageline(struct param *param,
}
+/**
+ * read fatmessages file and create a translation entry list
+ */
static nserror
fatmessages_read(struct param *param, struct trnsltn_entry **tlist)
{
@@ -454,6 +478,10 @@ fatmessages_read(struct param *param, struct trnsltn_entry
**tlist)
return res;
}
+
+/**
+ * write output in NetSurf messages format
+ */
static nserror
message_write(struct param *param, struct trnsltn_entry *tlist)
{
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
