From 76d23e639004517db8f9469d64ac1789f8449365 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 7 Jan 2010 13:50:11 +0200 Subject: Add support for ISO-8859-1 as application encoding New runtime configuration parameter, XSDE_ENCODING. New option, --char-encoding. New test, tests/cxx/hybrid/iso8859-1. --- dist/examples/cxx/hybrid/binary/cdr/makefile | 4 ++++ dist/examples/cxx/hybrid/binary/cdr/nmakefile | 4 ++++ dist/examples/cxx/hybrid/binary/custom/makefile | 4 ++++ dist/examples/cxx/hybrid/binary/custom/nmakefile | 4 ++++ dist/examples/cxx/hybrid/binary/xdr/makefile | 4 ++++ dist/examples/cxx/hybrid/binary/xdr/nmakefile | 4 ++++ dist/examples/cxx/hybrid/compositors/makefile | 4 ++++ dist/examples/cxx/hybrid/compositors/nmakefile | 4 ++++ dist/examples/cxx/hybrid/custom/wildcard/makefile | 4 ++++ dist/examples/cxx/hybrid/custom/wildcard/nmakefile | 4 ++++ dist/examples/cxx/hybrid/filter/makefile | 4 ++++ dist/examples/cxx/hybrid/filter/nmakefile | 4 ++++ dist/examples/cxx/hybrid/hello/makefile | 4 ++++ dist/examples/cxx/hybrid/hello/nmakefile | 4 ++++ dist/examples/cxx/hybrid/library/makefile | 4 ++++ dist/examples/cxx/hybrid/library/nmakefile | 4 ++++ dist/examples/cxx/hybrid/minimal/makefile | 4 ++++ dist/examples/cxx/hybrid/minimal/nmakefile | 4 ++++ dist/examples/cxx/hybrid/multiroot/makefile | 4 ++++ dist/examples/cxx/hybrid/multiroot/nmakefile | 4 ++++ dist/examples/cxx/hybrid/polymorphism/makefile | 4 ++++ dist/examples/cxx/hybrid/polymorphism/nmakefile | 4 ++++ dist/examples/cxx/hybrid/polyroot/makefile | 4 ++++ dist/examples/cxx/hybrid/polyroot/nmakefile | 4 ++++ dist/examples/cxx/hybrid/streaming/makefile | 4 ++++ dist/examples/cxx/hybrid/streaming/nmakefile | 4 ++++ dist/examples/cxx/hybrid/wildcard/makefile | 4 ++++ dist/examples/cxx/hybrid/wildcard/nmakefile | 4 ++++ 28 files changed, 112 insertions(+) (limited to 'dist/examples/cxx/hybrid') diff --git a/dist/examples/cxx/hybrid/binary/cdr/makefile b/dist/examples/cxx/hybrid/binary/cdr/makefile index 1453f78..9e0cd7d 100644 --- a/dist/examples/cxx/hybrid/binary/cdr/makefile +++ b/dist/examples/cxx/hybrid/binary/cdr/makefile @@ -8,6 +8,10 @@ override LIBS += -lACE # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/binary/cdr/nmakefile b/dist/examples/cxx/hybrid/binary/cdr/nmakefile index ce9210b..ffa65b6 100644 --- a/dist/examples/cxx/hybrid/binary/cdr/nmakefile +++ b/dist/examples/cxx/hybrid/binary/cdr/nmakefile @@ -8,6 +8,10 @@ LIBS = $(LIBS) ACE.lib # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/binary/custom/makefile b/dist/examples/cxx/hybrid/binary/custom/makefile index 9d02861..55f1944 100644 --- a/dist/examples/cxx/hybrid/binary/custom/makefile +++ b/dist/examples/cxx/hybrid/binary/custom/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/binary/custom/nmakefile b/dist/examples/cxx/hybrid/binary/custom/nmakefile index 00a0964..02e193f 100644 --- a/dist/examples/cxx/hybrid/binary/custom/nmakefile +++ b/dist/examples/cxx/hybrid/binary/custom/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/binary/xdr/makefile b/dist/examples/cxx/hybrid/binary/xdr/makefile index 257536d..ebd0241 100644 --- a/dist/examples/cxx/hybrid/binary/xdr/makefile +++ b/dist/examples/cxx/hybrid/binary/xdr/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/binary/xdr/nmakefile b/dist/examples/cxx/hybrid/binary/xdr/nmakefile index 332bbeb..49cbbb2 100644 --- a/dist/examples/cxx/hybrid/binary/xdr/nmakefile +++ b/dist/examples/cxx/hybrid/binary/xdr/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/compositors/makefile b/dist/examples/cxx/hybrid/compositors/makefile index dd36b46..beda699 100644 --- a/dist/examples/cxx/hybrid/compositors/makefile +++ b/dist/examples/cxx/hybrid/compositors/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/compositors/nmakefile b/dist/examples/cxx/hybrid/compositors/nmakefile index 14039ac..3178b0a 100644 --- a/dist/examples/cxx/hybrid/compositors/nmakefile +++ b/dist/examples/cxx/hybrid/compositors/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/custom/wildcard/makefile b/dist/examples/cxx/hybrid/custom/wildcard/makefile index fb85b48..f316afa 100644 --- a/dist/examples/cxx/hybrid/custom/wildcard/makefile +++ b/dist/examples/cxx/hybrid/custom/wildcard/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_LONGLONG),n) EXTRA_XSDFLAGS += --no-long-long endif diff --git a/dist/examples/cxx/hybrid/custom/wildcard/nmakefile b/dist/examples/cxx/hybrid/custom/wildcard/nmakefile index 329c993..37f1293 100644 --- a/dist/examples/cxx/hybrid/custom/wildcard/nmakefile +++ b/dist/examples/cxx/hybrid/custom/wildcard/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_LONGLONG)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long !endif diff --git a/dist/examples/cxx/hybrid/filter/makefile b/dist/examples/cxx/hybrid/filter/makefile index 586a166..baf45ce 100644 --- a/dist/examples/cxx/hybrid/filter/makefile +++ b/dist/examples/cxx/hybrid/filter/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_LONGLONG),n) EXTRA_XSDFLAGS += --no-long-long endif diff --git a/dist/examples/cxx/hybrid/filter/nmakefile b/dist/examples/cxx/hybrid/filter/nmakefile index 6db5615..d535457 100644 --- a/dist/examples/cxx/hybrid/filter/nmakefile +++ b/dist/examples/cxx/hybrid/filter/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_LONGLONG)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long !endif diff --git a/dist/examples/cxx/hybrid/hello/makefile b/dist/examples/cxx/hybrid/hello/makefile index 5499a21..9b2130d 100644 --- a/dist/examples/cxx/hybrid/hello/makefile +++ b/dist/examples/cxx/hybrid/hello/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/hello/nmakefile b/dist/examples/cxx/hybrid/hello/nmakefile index ea80a40..59d7111 100644 --- a/dist/examples/cxx/hybrid/hello/nmakefile +++ b/dist/examples/cxx/hybrid/hello/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/library/makefile b/dist/examples/cxx/hybrid/library/makefile index 512a0ba..944c724 100644 --- a/dist/examples/cxx/hybrid/library/makefile +++ b/dist/examples/cxx/hybrid/library/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_LONGLONG),n) EXTRA_XSDFLAGS += --no-long-long endif diff --git a/dist/examples/cxx/hybrid/library/nmakefile b/dist/examples/cxx/hybrid/library/nmakefile index e1d1a72..17f3ce0 100644 --- a/dist/examples/cxx/hybrid/library/nmakefile +++ b/dist/examples/cxx/hybrid/library/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_LONGLONG)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long !endif diff --git a/dist/examples/cxx/hybrid/minimal/makefile b/dist/examples/cxx/hybrid/minimal/makefile index 8224235..53a52d4 100644 --- a/dist/examples/cxx/hybrid/minimal/makefile +++ b/dist/examples/cxx/hybrid/minimal/makefile @@ -8,6 +8,10 @@ EXTRA_CPPFLAGS := -I$(root)/libxsde EXTRA_XSDFLAGS := --no-stl --no-exceptions +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_IOSTREAM),n) EXTRA_XSDFLAGS += --no-iostream endif diff --git a/dist/examples/cxx/hybrid/minimal/nmakefile b/dist/examples/cxx/hybrid/minimal/nmakefile index 060be2c..30d6805 100644 --- a/dist/examples/cxx/hybrid/minimal/nmakefile +++ b/dist/examples/cxx/hybrid/minimal/nmakefile @@ -8,6 +8,10 @@ EXTRA_CPPFLAGS = /I$(root)\libxsde EXTRA_XSDFLAGS = --no-stl --no-exceptions +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_IOSTREAM)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-iostream !endif diff --git a/dist/examples/cxx/hybrid/multiroot/makefile b/dist/examples/cxx/hybrid/multiroot/makefile index 7329f41..f4fda3f 100644 --- a/dist/examples/cxx/hybrid/multiroot/makefile +++ b/dist/examples/cxx/hybrid/multiroot/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/multiroot/nmakefile b/dist/examples/cxx/hybrid/multiroot/nmakefile index d3c4e35..b550ddf 100644 --- a/dist/examples/cxx/hybrid/multiroot/nmakefile +++ b/dist/examples/cxx/hybrid/multiroot/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/polymorphism/makefile b/dist/examples/cxx/hybrid/polymorphism/makefile index e1f40a1..cc7148c 100644 --- a/dist/examples/cxx/hybrid/polymorphism/makefile +++ b/dist/examples/cxx/hybrid/polymorphism/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/polymorphism/nmakefile b/dist/examples/cxx/hybrid/polymorphism/nmakefile index bd86945..de9e356 100644 --- a/dist/examples/cxx/hybrid/polymorphism/nmakefile +++ b/dist/examples/cxx/hybrid/polymorphism/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/polyroot/makefile b/dist/examples/cxx/hybrid/polyroot/makefile index a422aa3..752d936 100644 --- a/dist/examples/cxx/hybrid/polyroot/makefile +++ b/dist/examples/cxx/hybrid/polyroot/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/polyroot/nmakefile b/dist/examples/cxx/hybrid/polyroot/nmakefile index d713db0..dbf57fb 100644 --- a/dist/examples/cxx/hybrid/polyroot/nmakefile +++ b/dist/examples/cxx/hybrid/polyroot/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/streaming/makefile b/dist/examples/cxx/hybrid/streaming/makefile index 6c97f8b..bb67f6a 100644 --- a/dist/examples/cxx/hybrid/streaming/makefile +++ b/dist/examples/cxx/hybrid/streaming/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_STL),n) EXTRA_XSDFLAGS += --no-stl endif diff --git a/dist/examples/cxx/hybrid/streaming/nmakefile b/dist/examples/cxx/hybrid/streaming/nmakefile index 76a0c14..e9b5821 100644 --- a/dist/examples/cxx/hybrid/streaming/nmakefile +++ b/dist/examples/cxx/hybrid/streaming/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_STL)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-stl !endif diff --git a/dist/examples/cxx/hybrid/wildcard/makefile b/dist/examples/cxx/hybrid/wildcard/makefile index 0c8fd1f..3087253 100644 --- a/dist/examples/cxx/hybrid/wildcard/makefile +++ b/dist/examples/cxx/hybrid/wildcard/makefile @@ -6,6 +6,10 @@ include $(root)/build/cxx/rules.make # EXTRA_CPPFLAGS := -I$(root)/libxsde +ifeq ($(XSDE_ENCODING),iso8859-1) +EXTRA_XSDFLAGS += --char-encoding iso8859-1 +endif + ifeq ($(XSDE_LONGLONG),n) EXTRA_XSDFLAGS += --no-long-long endif diff --git a/dist/examples/cxx/hybrid/wildcard/nmakefile b/dist/examples/cxx/hybrid/wildcard/nmakefile index d4d8d06..0634fa8 100644 --- a/dist/examples/cxx/hybrid/wildcard/nmakefile +++ b/dist/examples/cxx/hybrid/wildcard/nmakefile @@ -6,6 +6,10 @@ root = ..\..\..\.. # EXTRA_CPPFLAGS = /I$(root)\libxsde +!if "$(XSDE_ENCODING)" == "iso8859-1" +EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --char-encoding iso8859-1 +!endif + !if "$(XSDE_LONGLONG)" == "n" EXTRA_XSDFLAGS = $(EXTRA_XSDFLAGS) --no-long-long !endif -- cgit v1.1