| OLD | NEW |
|---|
| 1 --- source/data/makedata.mak 2009-04-15 12:08:25.000000000 -0700 | 1 --- source/data/makedata.mak 2009-04-15 12:08:25.000000000 -0700 |
| 2 +++ source/data/makedata.mak» 2009-08-27 11:01:55.289559000 -0700 | 2 +++ source/data/makedata.mak» 2010-03-30 14:29:16.836900000 -0700 |
| 3 @@ -384,6 +384,17 @@ | 3 @@ -384,6 +384,17 @@ |
| 4 ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" | 4 ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" |
| 5 @echo All targets are up to date | 5 @echo All targets are up to date |
| 6 | 6 |
| 7 +############################################################################# | 7 +############################################################################# |
| 8 +# | 8 +# |
| 9 +# DATALIB | 9 +# DATALIB |
| 10 +# This target builds the data library. It's identical to | 10 +# This target builds the data library. It's identical to |
| 11 +# ALL except that testdata.dat is not built. | 11 +# ALL except that testdata.dat is not built. |
| 12 +# | 12 +# |
| 13 +############################################################################# | 13 +############################################################################# |
| 14 +DATALIB : GODATA "$(ICU_LIB_TARGET)" | 14 +DATALIB : GODATA "$(ICU_LIB_TARGET)" |
| 15 + @echo Data library is built | 15 + @echo Data library is built |
| 16 + | 16 + |
| 17 + | 17 + |
| 18 # Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase
.icu, ubidi.icu, unorm.icu) | 18 # Starting with ICU4C 3.4, the core Unicode properties files (uprops.icu, ucase
.icu, ubidi.icu, unorm.icu) |
| 19 # are hardcoded in the common DLL and therefore not included in the data packag
e any more. | 19 # are hardcoded in the common DLL and therefore not included in the data packag
e any more. |
| 20 # They are not built by default but need to be built for ICU4J data and for get
ting the .c source files | 20 # They are not built by default but need to be built for ICU4J data and for get
ting the .c source files |
| 21 @@ -621,7 +632,7 @@ | 21 @@ -417,6 +428,7 @@ |
| 22 » cd "$(ICUBLD_PKG)" |
| 23 » "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)
\icudata.lst" |
| 24 » "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" |
| 25 +» editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll" |
| 26 » copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)" |
| 27 » -@erase "$(U_ICUDATA_NAME).dll" |
| 28 » copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_E
NDIAN_SUFFIX).dat" |
| 29 @@ -621,7 +633,7 @@ |
| 22 # If you modify this, modify winmode.c in pkgdata. | 30 # If you modify this, modify winmode.c in pkgdata. |
| 23 "$(ICUTMP)\icudata.res": "$(ICUMISC)\icudata.rc" | 31 "$(ICUTMP)\icudata.res": "$(ICUMISC)\icudata.rc" |
| 24 @echo Creating data DLL version information from $** | 32 @echo Creating data DLL version information from $** |
| 25 - @rc.exe /i "..\..\..\..\common" /r /fo $@ $** | 33 - @rc.exe /i "..\..\..\..\common" /r /fo $@ $** |
| 26 + @rc.exe /i "..\..\..\..\common;..\..\..\..\..\public\common" /r /fo $@ $
** | 34 + @rc.exe /i "..\..\..\..\common;..\..\..\..\..\public\common" /r /fo $@ $
** |
| 27 | 35 |
| 28 # Targets for unames.icu | 36 # Targets for unames.icu |
| 29 "$(ICUBLD_PKG)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennames\$(CFG)\
gennames.exe" | 37 "$(ICUBLD_PKG)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennames\$(CFG)\
gennames.exe" |
| 38 @@ -701,4 +713,3 @@ |
| 39 # See Jitterbug 4497 for details. |
| 40 $(BRK_SOURCE) : "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\pnames.icu" |
| 41 !ENDIF |
| 42 - |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1523002:
Build icudt42.dll with /NXCOMPAT /DYNAMICBASE for real by ... (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/