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 14ec3b15ae8bd3773c90b4c5939d55fc2322efde..6e2ddbb93f30495f8407245799dbd6b13c5b089e 100644 (file)
--- 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 14a1f2078a54a779c7f096e581265bc98d02eaea..b8c66f6ba6be94f3a9b9311157047e0b0c8f404b 100644 (file)
--- 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 bc985004cb46e717006035aa68ef7ce42cbb864d..0a6ed210a2e2343fb4d6190fac6e5c1d44774827 100644 (file)
--- 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 */