From: Pavel Pisa Date: Sun, 16 Sep 2007 16:22:00 +0000 (+0000) Subject: The apostrophes in the config options are preserved now. X-Git-Tag: v0.1~107 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/omk.git/commitdiff_plain/f4a72bc4609d043bf41703f48db06a33f9c7f9df The apostrophes in the config options are preserved now. The previous solution discarded them during default-config generation. They has been preserved in generation of include files from config.omk. The right processing could be disputed, but actual solution is more consolidated and is natural result of default-config generation correction. darcs-hash:20070916162232-ff715-2e36d6dcf0fb33c72716e121f31c4212dbf20e8e.gz --- diff --git a/tests/headers/generated/Makefile.omk b/tests/headers/generated/Makefile.omk index 14ec3b1..6e2ddbb 100644 --- a/tests/headers/generated/Makefile.omk +++ b/tests/headers/generated/Makefile.omk @@ -1,9 +1,9 @@ SUBDIRS=lincan -default_CONFIG = CONFIG_TEST_NUM=123 CONFIG_TEST_STR="Hello" - +default_CONFIG = CONFIG_TEST_NUM=123 CONFIG_TEST_STR=Hello +default_CONFIG += CONFIG_TEST_APOS="Text+apostrophes" config_include_HEADERS = global.h global_DEFINES = CONFIG_OC_LINCAN CONFIG_OC_LINCANRTL \ - CONFIG_TEST_NUM CONFIG_TEST_STR + CONFIG_TEST_NUM CONFIG_TEST_STR CONFIG_TEST_APOS diff --git a/tests/headers/generated/config.omk-default b/tests/headers/generated/config.omk-default index 14a1f20..b8c66f6 100644 --- a/tests/headers/generated/config.omk-default +++ b/tests/headers/generated/config.omk-default @@ -41,3 +41,4 @@ CONFIG_OC_LINCAN_CARD_nsi_canpci=n # Config for CONFIG_TEST_NUM=123 CONFIG_TEST_STR=Hello +CONFIG_TEST_APOS="Text+apostrophes" diff --git a/tests/headers/generated/correct/global.h b/tests/headers/generated/correct/global.h index bc98500..0a6ed21 100644 --- a/tests/headers/generated/correct/global.h +++ b/tests/headers/generated/correct/global.h @@ -4,4 +4,5 @@ #define CONFIG_OC_LINCAN 1 #define CONFIG_TEST_NUM 123 #define CONFIG_TEST_STR Hello +#define CONFIG_TEST_APOS "Text+apostrophes" #endif /* _global_H */