Gitweb links:
...log
http://git.netsurf-browser.org/iconv.git/shortlog/8b8a4d55cecbbe47b147f6d26780de59af43d21c
...commit
http://git.netsurf-browser.org/iconv.git/commit/8b8a4d55cecbbe47b147f6d26780de59af43d21c
...tree
http://git.netsurf-browser.org/iconv.git/tree/8b8a4d55cecbbe47b147f6d26780de59af43d21c
The branch, master has been updated
via 8b8a4d55cecbbe47b147f6d26780de59af43d21c (commit)
from 010e6f49656412f75ea333ce5b3b412451aa654d (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/iconv.git/commit/?id=8b8a4d55cecbbe47b147f6d26780de59af43d21c
commit 8b8a4d55cecbbe47b147f6d26780de59af43d21c
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
Fix testsuite now !Unicode is dynamic
diff --git a/Makefile b/Makefile
index c637391..b8d5db6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,6 @@ include $(NSSHARED)/makefiles/Makefile.tools
TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
-ifneq ($(HOST),arm-unknown-riscos)
- export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/
-endif
-
# Toolchain flags
DISABLED_WARNINGS := -Wno-format -Wno-missing-braces -Wno-sign-compare \
-Wno-shift-negative-value -Wno-discarded-qualifiers \
@@ -28,6 +24,10 @@ CFLAGS := -std=c99 -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
include $(NSBUILD)/Makefile.top
+ifneq ($(HOST),arm-unknown-riscos)
+ export UNICODE_DIR := $(BUILDDIR)/unires
+endif
+
# Extra installation rules
I := /include/iconv
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/iconv/iconv.h
diff --git a/module/Makefile b/module/Makefile
index 86e68d8..5921e79 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -4,4 +4,8 @@ endif
DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index c5d298f..19e2924 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,8 @@
# Tests
DIR_TEST_ITEMS := iconv:iconv.c nullable:nullable.c translit:translit.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/unicode/Makefile b/unicode/Makefile
index db7d544..808c4b0 100644
--- a/unicode/Makefile
+++ b/unicode/Makefile
@@ -84,6 +84,9 @@ $(BUILDDIR)/unires: $(BUILDDIR)/Aliases $(wildcard
unicode/Unicode/*)
$(Q)$(CP) unicode/Unicode/Resources/UK/!Help [email protected]/!Help
$(Q)$(CP) unicode/Unicode/Resources/UK/!Run,feb [email protected]/!Run,feb
$(Q)$(CP) -r unicode/Unicode/Resources/Encodings [email protected]/Encodings
+ifeq ($(findstring -riscos,$(HOST)),)
+ $(Q)for f in $$(find [email protected]/Encodings/ -name '*,ffd'); do mv $$f
$${f%%,ffd}; done
+endif
$(Q)$(MKDIR) [email protected]/Files
$(Q)$(CP) unicode/Unicode/data/CharNames [email protected]/Files/CharNames
$(Q)$(CP) $(BUILDDIR)/Aliases [email protected]/Files/Aliases
-----------------------------------------------------------------------
Summary of changes:
Makefile | 8 ++++----
module/Makefile | 4 ++++
test/Makefile | 4 ++++
unicode/Makefile | 3 +++
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index c637391..b8d5db6 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,6 @@ include $(NSSHARED)/makefiles/Makefile.tools
TESTRUNNER := $(PERL) $(NSTESTTOOLS)/testrunner.pl
-ifneq ($(HOST),arm-unknown-riscos)
- export UNICODE_DIR := $(CURDIR)/riscos/!Boot/Resources/!Unicode/
-endif
-
# Toolchain flags
DISABLED_WARNINGS := -Wno-format -Wno-missing-braces -Wno-sign-compare \
-Wno-shift-negative-value -Wno-discarded-qualifiers \
@@ -28,6 +24,10 @@ CFLAGS := -std=c99 -D_DEFAULT_SOURCE -I$(CURDIR)/include/ \
include $(NSBUILD)/Makefile.top
+ifneq ($(HOST),arm-unknown-riscos)
+ export UNICODE_DIR := $(BUILDDIR)/unires
+endif
+
# Extra installation rules
I := /include/iconv
INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/iconv/iconv.h
diff --git a/module/Makefile b/module/Makefile
index 86e68d8..5921e79 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -4,4 +4,8 @@ endif
DIR_TEST_ITEMS := iconv:module.c;menu.c;wrapper.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/test/Makefile b/test/Makefile
index c5d298f..19e2924 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,8 @@
# Tests
DIR_TEST_ITEMS := iconv:iconv.c nullable:nullable.c translit:translit.c
+ifeq ($(filter $(BUILDDIR)/unires,$(TEST_PREREQS)),)
+ TEST_PREREQS := $(TEST_PREREQS) $(BUILDDIR)/unires
+endif
+
include $(NSBUILD)/Makefile.subdir
diff --git a/unicode/Makefile b/unicode/Makefile
index db7d544..808c4b0 100644
--- a/unicode/Makefile
+++ b/unicode/Makefile
@@ -84,6 +84,9 @@ $(BUILDDIR)/unires: $(BUILDDIR)/Aliases $(wildcard
unicode/Unicode/*)
$(Q)$(CP) unicode/Unicode/Resources/UK/!Help [email protected]/!Help
$(Q)$(CP) unicode/Unicode/Resources/UK/!Run,feb [email protected]/!Run,feb
$(Q)$(CP) -r unicode/Unicode/Resources/Encodings [email protected]/Encodings
+ifeq ($(findstring -riscos,$(HOST)),)
+ $(Q)for f in $$(find [email protected]/Encodings/ -name '*,ffd'); do mv $$f
$${f%%,ffd}; done
+endif
$(Q)$(MKDIR) [email protected]/Files
$(Q)$(CP) unicode/Unicode/data/CharNames [email protected]/Files/CharNames
$(Q)$(CP) $(BUILDDIR)/Aliases [email protected]/Files/Aliases
--
Iconv implementation for RISC OS
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
