OLD | NEW |
1 Index: source/data/makedata.mak | 1 Index: source/data/makedata.mak |
2 =================================================================== | 2 =================================================================== |
3 --- source/data/makedata.mak» (revision 68397) | 3 --- source/data/makedata.mak» (revision 266014) |
4 +++ source/data/makedata.mak (working copy) | 4 +++ source/data/makedata.mak (working copy) |
5 @@ -480,7 +480,18 @@ | 5 @@ -478,7 +478,7 @@ |
| 6 #» » » » Building the common dll in $(ICUBLD_PKG) uncondi
tionally copies it to $(DLL_OUTPUT) too. |
| 7 # |
6 ############################################################################# | 8 ############################################################################# |
7 ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" | 9 -ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" |
| 10 +ALL : GODATA "$(ICU_LIB_TARGET)" |
8 @echo All targets are up to date | 11 @echo All targets are up to date |
9 +############################################################################# | |
10 +# | |
11 +# DATALIB | |
12 +# This target builds the data library. It's identical to | |
13 +# ALL except that testdata.dat is not built. | |
14 +# | |
15 +############################################################################# | |
16 +DATALIB : GODATA "$(ICU_LIB_TARGET)" | |
17 + @echo Data library is built | |
18 | 12 |
19 + | |
20 + | |
21 # The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu) | 13 # The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu) |
22 # are hardcoded in the common DLL and therefore not included in the data packag
e any more. | 14 @@ -597,6 +597,7 @@ |
23 # They are not built by default but need to be built for ICU4J data and for get
ting the .c source files | |
24 @@ -581,6 +592,7 @@ | |
25 cd "$(ICUBLD_PKG)" | 15 cd "$(ICUBLD_PKG)" |
26 "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)
\icudata.lst" | 16 "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)
\icudata.lst" |
27 "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" | 17 "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" |
28 + editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll" | 18 + editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll" |
29 copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)" | 19 copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)" |
30 -@erase "$(U_ICUDATA_NAME).dll" | 20 -@erase "$(U_ICUDATA_NAME).dll" |
31 copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_E
NDIAN_SUFFIX).dat" | 21 copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_E
NDIAN_SUFFIX).dat" |
32 @@ -914,7 +926,7 @@ | |
33 # If you modify this, modify winmode.c in pkgdata. | |
34 "$(ICUTMP)\icudata.res": "$(ICUMISC)\icudata.rc" | |
35 @echo Creating data DLL version information from $** | |
36 - @rc.exe /i "..\..\..\..\common" /r /fo $@ $** | |
37 + @rc.exe /i "..\..\..\..\common;..\..\..\..\..\public\common" /r /fo $@ $
** | |
38 | |
39 # Targets for converters | |
40 "$(ICUBLD_PKG)\cnvalias.icu" : {"$(ICUSRCDATA)\$(ICUUCM)"}\convrtrs.txt "$(ICUT
OOLS)\gencnval\$(CFG)\gencnval.exe" | |
41 @@ -990,4 +1002,3 @@ | |
42 # See Jitterbug 4497 for details. | |
43 $(BRK_SOURCE) : "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD
_PKG)\nfc.nrm" | |
44 !ENDIF | |
45 - | |
OLD | NEW |