Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: third_party/icu/patches/data.build.win.patch

Issue 1523002: Build icudt42.dll with /NXCOMPAT /DYNAMICBASE for real by ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/icu/icudt42.dll ('k') | third_party/icu/source/data/makedata.mak » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/icu/patches/data.build.win.patch
===================================================================
--- third_party/icu/patches/data.build.win.patch (revision 42963)
+++ third_party/icu/patches/data.build.win.patch (working copy)
@@ -1,5 +1,5 @@
--- source/data/makedata.mak 2009-04-15 12:08:25.000000000 -0700
-+++ source/data/makedata.mak 2009-08-27 11:01:55.289559000 -0700
++++ source/data/makedata.mak 2010-03-30 14:29:16.836900000 -0700
@@ -384,6 +384,17 @@
ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat"
@echo All targets are up to date
@@ -18,7 +18,15 @@
# Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu, unorm.icu)
# are hardcoded in the common DLL and therefore not included in the data package any more.
# They are not built by default but need to be built for ICU4J data and for getting the .c source files
-@@ -621,7 +632,7 @@
+@@ -417,6 +428,7 @@
+ cd "$(ICUBLD_PKG)"
+ "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)\icudata.lst"
+ "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst"
++ editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll"
+ copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)"
+ -@erase "$(U_ICUDATA_NAME).dll"
+ copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat"
+@@ -621,7 +633,7 @@
# If you modify this, modify winmode.c in pkgdata.
"$(ICUTMP)\icudata.res": "$(ICUMISC)\icudata.rc"
@echo Creating data DLL version information from $**
@@ -27,3 +35,8 @@
# Targets for unames.icu
"$(ICUBLD_PKG)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennames\$(CFG)\gennames.exe"
+@@ -701,4 +713,3 @@
+ # See Jitterbug 4497 for details.
+ $(BRK_SOURCE) : "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\pnames.icu"
+ !ENDIF
+-
« no previous file with comments | « third_party/icu/icudt42.dll ('k') | third_party/icu/source/data/makedata.mak » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698