| OLD | NEW |
|---|
| (Empty) | |
| 1 Modifications to the Windows build to allow conditionally using ICU. |
| 2 |
| 3 Index: libxml/win32/Makefile.msvc |
| 4 =================================================================== |
| 5 --- libxml.orig/win32/Makefile.msvc 2010-07-09 14:56:57.339103770 -0700 |
| 6 +++ libxml/win32/Makefile.msvc 2010-07-09 14:57:02.219529472 -0700 |
| 7 @@ -71,6 +71,9 @@ |
| 8 !if "$(WITH_ICONV)" == "1" |
| 9 LIBS = $(LIBS) iconv.lib |
| 10 !endif |
| 11 ++!if "$(WITH_ICU)" == "1" |
| 12 ++LIBS = $(LIBS) icu.lib |
| 13 ++!endif |
| 14 !if "$(WITH_ZLIB)" == "1" |
| 15 LIBS = $(LIBS) zdll.lib |
| 16 !endif |
| 17 Index: libxml/win32/configure.js |
| 18 =================================================================== |
| 19 --- libxml.orig/win32/configure.js 2010-07-09 14:57:14.109642331 -0700 |
| 20 +++ libxml/win32/configure.js 2010-07-09 14:57:34.249106740 -0700 |
| 21 @@ -40,6 +40,7 @@ |
| 22 var withXptr = true; |
| 23 var withXinclude = true; |
| 24 var withIconv = true; |
| 25 +var withIcu = false; |
| 26 var withIso8859x = false; |
| 27 var withZlib = false; |
| 28 var withDebug = true; |
| 29 @@ -124,6 +125,7 @@ |
| 30 txt += " xptr: Enable XPointer support (" + (withXptr? "yes" : "n
o") + ")\n"; |
| 31 txt += " xinclude: Enable XInclude support (" + (withXinclude? "yes"
: "no") + ")\n"; |
| 32 txt += " iconv: Enable iconv support (" + (withIconv? "yes" : "no"
) + ")\n"; |
| 33 + txt += " icu: Enable icu support (" + (withIcu? "yes" : "no") +
")\n"; |
| 34 txt += " iso8859x: Enable ISO8859X support (" + (withIso8859x? "yes"
: "no") + ")\n"; |
| 35 txt += " zlib: Enable zlib support (" + (withZlib? "yes" : "no")
+ ")\n"; |
| 36 txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes
" : "no") + ")\n"; |
| 37 @@ -233,6 +235,7 @@ |
| 38 vf.WriteLine("WITH_XPTR=" + (withXptr? "1" : "0")); |
| 39 vf.WriteLine("WITH_XINCLUDE=" + (withXinclude? "1" : "0")); |
| 40 vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0")); |
| 41 + vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0")); |
| 42 vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0")); |
| 43 vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); |
| 44 vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0")); |
| 45 @@ -319,6 +322,8 @@ |
| 46 of.WriteLine(s.replace(/\@WITH_XINCLUDE\@/, withXinclude
? "1" : "0")); |
| 47 } else if (s.search(/\@WITH_ICONV\@/) != -1) { |
| 48 of.WriteLine(s.replace(/\@WITH_ICONV\@/, withIconv? "1"
: "0")); |
| 49 + } else if (s.search(/\@WITH_ICU\@/) != -1) { |
| 50 + of.WriteLine(s.replace(/\@WITH_ICU\@/, withIcu? "1" : "0
")); |
| 51 } else if (s.search(/\@WITH_ISO8859X\@/) != -1) { |
| 52 of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x
? "1" : "0")); |
| 53 } else if (s.search(/\@WITH_ZLIB\@/) != -1) { |
| 54 @@ -462,6 +467,8 @@ |
| 55 withXinclude = strToBool(arg.substring(opt.length + 1, a
rg.length)); |
| 56 else if (opt == "iconv") |
| 57 withIconv = strToBool(arg.substring(opt.length + 1, arg.
length)); |
| 58 + else if (opt == "icu") |
| 59 + withIcu = strToBool(arg.substring(opt.length + 1, arg.le
ngth)); |
| 60 else if (opt == "iso8859x") |
| 61 withIso8859x = strToBool(arg.substring(opt.length + 1, a
rg.length)); |
| 62 else if (opt == "zlib") |
| 63 @@ -646,6 +653,7 @@ |
| 64 txtOut += " XPointer support: " + boolToStr(withXptr) + "\n"; |
| 65 txtOut += " XInclude support: " + boolToStr(withXinclude) + "\n"; |
| 66 txtOut += " iconv support: " + boolToStr(withIconv) + "\n"; |
| 67 +txtOut += " icu support: " + boolToStr(withIcu) + "\n"; |
| 68 txtOut += " iso8859x support: " + boolToStr(withIso8859x) + "\n"; |
| 69 txtOut += " zlib support: " + boolToStr(withZlib) + "\n"; |
| 70 txtOut += " Debugging module: " + boolToStr(withDebug) + "\n"; |
| OLD | NEW |
|---|
Chromium Code Reviews
