[ooo-build-commit] .: patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Sep 29 15:25:19 PDT 2010
patches/dev300/icu-4.2.1.diff | 492 +++++++++++++++++++++++++++++++++++++++++-
1 file changed, 488 insertions(+), 4 deletions(-)
New commits:
commit bdfa96ff7ebeb5ea60bfb47d3ad41902be56c444
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Sep 30 01:15:41 2010 +0300
Make ICU 4.2.1 that we now use build on Windows too
Unfortunately the way ICU is built as part of LibraOffice on Windows
is quite convoluted. (Sure, this is inherited directly from OOo, it's
not our invention.) There is a Perl script icu/createmak.pl that reads
a configuration file icu/createmak.cfg and the Visual Studio project
files that ICU contains, and from each project file generates a
corresponding makefile for dmake.
After some struggle I got it to build. I simplified the generated
makefiles a bit, all produced binaries (EXEs and DLLs) now go into the
same "bin" folder instead of, as in the project files, being sprinkled
into various Release and Debug folders here and there. Will se if this
ICU actually works any more later.
diff --git a/patches/dev300/icu-4.2.1.diff b/patches/dev300/icu-4.2.1.diff
index 96ab281..c952aa6 100644
--- a/patches/dev300/icu-4.2.1.diff
+++ b/patches/dev300/icu-4.2.1.diff
@@ -1,3 +1,153 @@
+diff --git a/icu/createmak.cfg b/icu/createmak.cfg
+index 19ef708..0f79bca 100644
+--- icu/createmak.cfg
++++ icu/createmak.cfg
+@@ -59,6 +59,12 @@ CPP_PROJ=-nologo -MT -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES
+ [CFlags_test_iotest]
+ CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
++[CFlags_samples_date]
++CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
++
++[CFlags_samples_cal]
++CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
++
+ [CFlags_test_letest]
+ CPP_PROJ=-nologo -MD -Za -Zi -Ox -Ob0 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
+@@ -68,6 +74,9 @@ CPP_PROJ=-nologo -MD -O2 -Op -FD -Za -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES)
+ [CFlags_tools_genbrk]
+ CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
+
++[CFlags_tools_gencfu]
++CPP_PROJ=-nologo -MD -Za -O2 -W3 $(EXCEPTIONSWITCH) $(CPP_PROJ_INCLUDES) $(CDEFS) $(CPDBOBJ) -c
++
+ [CFlags_tools_gencase]
+ CPP_PROJ=-nologo -MD -GF -Za -Zi -W3 $(EXCEPTIONSWITCH) $(COPT) $(CPDBOBJ) -c
+
+@@ -147,7 +156,7 @@ LINK32_FLAGS=icuuc.lib $(COMMONLINKFLAGS_DLL) /base:"0x4a900000" /implib:"$(OUT
+ LINK32_FLAGS=icuuc.lib icuin.lib uconvmsg.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib" /libpath:"Release"
+
+ [LinkFlags_layout]
+-LINK32_FLAGS=..\..\lib\icuuc.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icule.lib"
++LINK32_FLAGS=..\..\lib\icuuc.lib $(COMMONLINKFLAGS_DLL) /implib:"..\..\lib\icule.lib"
+
+ [LinkFlags_io]
+ LINK32_FLAGS=icuuc.lib icuin.lib $(COMMONLINKFLAGS_DLL) /libpath:"..\..\lib" /implib:"$(OUTDIR)\icuio.lib"
+@@ -167,6 +176,12 @@ LINK32_FLAGS=$(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+ [LinkFlags_test_iotest]
+ LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+
++[LinkFlags_samples_date]
++LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
++
++[LinkFlags_samples_cal]
++LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icuio.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
++
+ [LinkFlags_test_letest]
+ LINK32_FLAGS=icuuc.lib icuin.lib icutu.lib icule.lib iculx.lib icutest.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\..\..\lib"
+
+@@ -176,6 +191,9 @@ LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_DLL) /implib:"$(OUTDIR)\icute
+ [LinkFlags_tools_genbrk]
+ LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
++[LinkFlags_tools_gencfu]
++LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
++
+ [LinkFlags_tools_gencmn]
+ LINK32_FLAGS=icuuc.lib icutu.lib $(COMMONLINKFLAGS_CONSOLE) /libpath:"..\toolutil\Release" /libpath:"..\..\..\lib"
+
+@@ -255,15 +273,15 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU
+ "..\..\..\lib\icuin.lib"
+
+ [AdditionalLinkObjects_layout]
+- "$(OUTDIR)\icuuc.lib"
++ "..\..\lib\icuuc.lib"
+
+ [AdditionalLinkObjects_io]
+- "$(OUTDIR)\icuuc.lib"
++ "..\..\lib\icuuc.lib"
+
+ [AdditionalLinkObjects_layoutex]
+- "$(OUTDIR)\icuuc.lib" \
+- "$(OUTDIR)\icuin.lib" \
+- "$(OUTDIR)\icule.lib"
++ "..\..\lib\icuuc.lib" \
++ "..\..\lib\icuin.lib" \
++ "..\..\lib\icule.lib"
+
+ [AdditionalLinkObjects_test_cintltst]
+ "..\..\..\lib\icuuc.lib" \
+@@ -289,6 +307,11 @@ LINK32_FLAGS=kernel32.lib ..\..\..\lib\icuin.lib $(COMMONLINKFLAGS_DLL) /NODEFAU
+ "..\..\..\lib\icuuc.lib" \
+ "..\..\..\lib\icutu.lib"
+
++[AdditionalLinkObjects_tools_gencfu]
++ "..\..\..\lib\icuuc.lib" \
++ "..\..\..\lib\icuin.lib" \
++ "..\..\..\lib\icutu.lib" \
++
+ [AdditionalLinkObjects_tools_genccode]
+ "..\..\..\lib\icuuc.lib" \
+ "..\..\..\lib\icutu.lib"
+diff --git a/icu/createmak.pl b/icu/createmak.pl
+index c6412f1..7a2dc63 100644
+--- icu/createmak.pl
++++ icu/createmak.pl
+@@ -302,6 +302,7 @@ sub createCopySection #01.04.2008 11:37
+ $line =~ s/<INPUTPATH>/$inputpath/g;
+ $line =~ s/<TARGET>/$target/g;
+ $line =~ s/<TARGETPATH>/$targetpath/;
++ next if $target eq $header;
+ push @{$ref_make_file}, $line; # from template
+ $$ref_all_target_hash{$target} = 1; # "\"$target\" ";
+ # save for target ALL:
+@@ -562,11 +563,15 @@ sub print_all_target #26.06.2008 13:27
+ {
+ if ( $target =~ /\.exe/ ) {
+ my $out = $target;
+- $out =~ s/.\\Release/\.\.\\\.\.\\\.\.\\bin/;
+ $out =~ s/\$\(OutDir\)/\.\.\\\.\.\\\.\.\\bin/;
+ $out =~ s/\//\\/; # convert / to \
+ $target = $out;
+ }
++ elsif ( $target =~ /\.dll/ ) {
++ my $out = $target;
++ $out =~ s/\//\\/; # convert / to \
++ $target = $out;
++ }
+ print MAKFILE "\"$target\" ";
+ }
+
+@@ -1056,12 +1061,28 @@ sub start_handler
+ }
+ }
+ if ( $att eq "OutputDirectory" ) {
++ $val =~ s/\.\\x86\\Release/..\\..\\..\\bin/;
++ $val =~ s/\.\\x64\\Release/..\\..\\..\\bin/;
++ $val =~ s/\.\\x86\\Debug/..\\..\\..\\bin/;
++ $val =~ s/\.\\x64\\Debug/..\\..\\..\\bin/;
+ $configelements{$config}{$att} = $val;
+ }
+ if ( $att eq "OutputFile" && $LinkerSection ) {
++ $val =~ s/\.\\x86\\Release/..\\..\\..\\bin/;
++ $val =~ s/\.\\x64\\Release/..\\..\\..\\bin/;
++ $val =~ s/\.\\x86\\Debug/..\\..\\..\\bin/;
++ $val =~ s/\.\\x64\\Debug/..\\..\\..\\bin/;
++ $val =~ s/\.\.\\\.\.\\bin64/..\\..\\bin/;
++ $val =~ s/\.\\Release/..\\..\\..\\bin/;
+ $configelements{$config}{$att} = $val;
+ }
+ if ( $att eq "ProgramDatabaseFile" ) {
++ $val =~ s/\.\\x86\\Release/..\\..\\..\\bin/;
++ $val =~ s/\.\\x64\\Release/..\\..\\..\\bin/;
++ $val =~ s/\.\\x86\\Debug/..\\..\\..\\bin/;
++ $val =~ s/\.\\x64\\Debug/..\\..\\..\\bin/;
++ $val =~ s/\.\.\\\.\.\\bin64/..\\..\\bin/;
++ $val =~ s/\.\\Release/..\\..\\..\\bin/;
+ $configelements{$config}{$att} = $val;
+ }
+ if ( $att eq "ImportLibrary" && $LinkerSection ) {
diff --git icu/icu4c-4_0_1-src.patch icu/icu4c-4_0_1-src.patch
deleted file mode 100644
index 172d624..0000000
@@ -251,12 +401,9 @@ index 172d624..0000000
- T_FileStream_writeLine(makefile, tmp);
-
- if(o->hadStdin == FALSE) { /* shortcut */
-diff --git icu/icu4c-4_2_1-src.patch icu/icu4c-4_2_1-src.patch
-new file mode 100644
-index 0000000..efa4ef3
--- /dev/null
+++ icu/icu4c-4_2_1-src.patch
-@@ -0,0 +1,146 @@
+@@ -0,0 +1,474 @@
+--- misc/icu/source/common/putil.c
++++ misc/build/icu/source/common/putil.c
+@@ -52,7 +52,7 @@
@@ -403,6 +550,334 @@ index 0000000..efa4ef3
+
+ if ((t & MASK_TRANSPARENT) != 0) {
+ continue;
++--- misc/build/icu/source/data/makedata.mak
+++++ misc/build/icu/source/data/makedata.mak
++@@ -398,7 +398,7 @@
++ #
++ # testdata - nmake will invoke pkgdata, which will create testdata.dat
++ #
++-"$(TESTDATAOUT)\testdata.dat": "$(TESTDATA)\*" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" $(TRANSLIT_RES_FILES) $(MISC_FILES) $(RB_FILES) {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe
+++"$(TESTDATAOUT)\testdata.dat": "$(TESTDATA)\*" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu" $(TRANSLIT_RES_FILES) $(MISC_FILES) $(RB_FILES) {"$(ICUPBIN)"}genrb.exe
++ @cd "$(TESTDATA)"
++ @echo building testdata...
++ nmake /nologo /f "$(TESTDATA)\testdata.mak" TESTDATA=. ICUTOOLS="$(ICUTOOLS)" ICUPBIN="$(ICUPBIN)" ICUP="$(ICUP)" CFG=$(CFG) TESTDATAOUT="$(TESTDATAOUT)" TESTDATABLD="$(TESTDATABLD)"
++@@ -526,175 +526,175 @@
++ # RBBI .brk file generation.
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)}.txt.brk:
++ @echo Creating $@
++- @"$(ICUTOOLS)\genbrk\$(CFG)\genbrk" -c -r $< -o $@ -d"$(ICUBLD_PKG)" -i "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\genbrk" -c -r $< -o $@ -d"$(ICUBLD_PKG)" -i "$(ICUBLD_PKG)"
++
++ # RBBI .ctd file generation.
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)}.txt.ctd:
++ @echo Creating $@
++- @"$(ICUTOOLS)\genctd\$(CFG)\genctd" -c -o $@ -d"$(ICUBLD_PKG)" -i "$(ICUBLD_PKG)" $<
+++ @"$(ICUPBIN)\genctd" -c -o $@ -d"$(ICUBLD_PKG)" -i "$(ICUBLD_PKG)" $<
++
++ # Batch inference rule for creating converters
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUUCM)}.ucm.cnv::
++ @echo Making Charset Conversion tables
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -c -d"$(ICUBLD_PKG)" $<
+++ @"$(ICUPBIN)\makeconv" -c -d"$(ICUBLD_PKG)" $<
++
++ # Batch inference rule for creating miscellaneous resource files
++ # TODO: -q option is specified to squelch the 120+ warnings about
++ # empty intvectors and binary elements. Unfortunately, this may
++ # squelch other legitimate warnings. When there is a better
++ # way, remove the -q.
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUMISC2)}.txt.res::
++ @echo Making Miscellaneous Resource Bundle files
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -q -d"$(ICUBLD_PKG)" $<
+++ @"$(ICUPBIN)\genrb" -k -q -d"$(ICUBLD_PKG)" $<
++
++ # Inference rule for creating resource bundle files
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICULOC)}.txt.res::
++ @echo Making Locale Resource Bundle files
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -d"$(ICUBLD_PKG)" $<
+++ @"$(ICUPBIN)\genrb" -k -d"$(ICUBLD_PKG)" $<
++
++ res_index.res:
++ @echo Generating <<res_index.txt
++ // Warning this file is automatically generated
++ res_index:table(nofallback) {
++ InstalledLocales {
++ $(GENRB_SOURCE:.txt= {""}
++ )
++ }
++ }
++ <<KEEP
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -d"$(ICUBLD_PKG)" .\res_index.txt
+++ @"$(ICUPBIN)\genrb" -k -d"$(ICUBLD_PKG)" .\res_index.txt
++
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUCOL)}.txt{$(ICUCOL)}.res::
++ @echo Making Collation files
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICUCOL)" $<
+++ @"$(ICUPBIN)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICUCOL)" $<
++
++ $(ICUCOL)\res_index.res:
++ @echo Generating <<$(ICUCOL)\res_index.txt
++ // Warning this file is automatically generated
++ res_index:table(nofallback) {
++ InstalledLocales {
++ $(COLLATION_SOURCE:.txt= {""}
++ )
++ }
++ }
++ <<KEEP
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -d"$(ICUBLD_PKG)\$(ICUCOL)" .\$(ICUCOL)\res_index.txt
+++ @"$(ICUPBIN)\genrb" -k -d"$(ICUBLD_PKG)\$(ICUCOL)" .\$(ICUCOL)\res_index.txt
++
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICURBNF)}.txt{$(ICURBNF)}.res::
++ @echo Making RBNF files
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICURBNF)" $<
+++ @"$(ICUPBIN)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICURBNF)" $<
++
++ $(ICURBNF)\res_index.res:
++ @echo Generating <<$(ICURBNF)\res_index.txt
++ // Warning this file is automatically generated
++ res_index:table(nofallback) {
++ InstalledLocales {
++ $(RBNF_SOURCE:.txt= {""}
++ )
++ }
++ }
++ <<KEEP
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -d"$(ICUBLD_PKG)\$(ICURBNF)" .\$(ICURBNF)\res_index.txt
+++ @"$(ICUPBIN)\genrb" -k -d"$(ICUBLD_PKG)\$(ICURBNF)" .\$(ICURBNF)\res_index.txt
++
++ $(ICUBRK)\res_index.res:
++ @echo Generating <<$(ICUBRK)\res_index.txt
++ // Warning this file is automatically generated
++ res_index:table(nofallback) {
++ InstalledLocales {
++ $(BRK_RES_SOURCE:.txt= {""}
++ )
++ }
++ }
++ <<KEEP
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -d"$(ICUBLD_PKG)\$(ICUBRK)" .\$(ICUBRK)\res_index.txt
+++ @"$(ICUPBIN)\genrb" -k -d"$(ICUBLD_PKG)\$(ICUBRK)" .\$(ICUBRK)\res_index.txt
++
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUBRK)}.txt{$(ICUBRK)}.res::
++ @echo Making Break Iterator Resource files
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICUBRK)" $<
+++ @"$(ICUPBIN)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICUBRK)" $<
++
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUTRNS)}.txt{$(ICUTRNS)}.res::
++ @echo Making Transliterator files
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICUTRNS)" $<
+++ @"$(ICUPBIN)\genrb" -k -i "$(ICUBLD_PKG)" -d"$(ICUBLD_PKG)\$(ICUTRNS)" $<
++
++
++ # DLL version information
++ # If you modify this, modify winmode.c in pkgdata.
++ "$(ICUTMP)\icudata.res": "$(ICUMISC)\icudata.rc"
++ @echo Creating data DLL version information from $**
++ @rc.exe /i "..\..\..\..\common" /r /fo $@ $**
++
++ # Targets for unames.icu
++-"$(ICUBLD_PKG)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennames\$(CFG)\gennames.exe"
+++"$(ICUBLD_PKG)\unames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUPBIN)\gennames.exe"
++ @echo Creating data file for Unicode Names
++- @"$(ICUTOOLS)\gennames\$(CFG)\gennames" -1 -u $(UNICODE_VERSION) -d "$(ICUBLD_PKG)" "$(ICUUNIDATA)\UnicodeData.txt"
+++ @"$(ICUPBIN)\gennames" -1 -u $(UNICODE_VERSION) -d "$(ICUBLD_PKG)" "$(ICUUNIDATA)\UnicodeData.txt"
++
++ # Targets for pnames.icu
++ # >> Depends on the Unicode data as well as uchar.h and uscript.h <<
++-"$(ICUBLD_PKG)\pnames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genpname\$(CFG)\genpname.exe" "$(ICUP)\source\common\unicode\uchar.h" "$(ICUP)\source\common\unicode\uscript.h"
+++"$(ICUBLD_PKG)\pnames.icu": "$(ICUUNIDATA)\*.txt" "$(ICUPBIN)\genpname.exe" "$(ICUP)\source\common\unicode\uchar.h" "$(ICUP)\source\common\unicode\uscript.h"
++ @echo Creating data file for Unicode Property Names
++- @"$(ICUTOOLS)\genpname\$(CFG)\genpname" -d "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\genpname" -d "$(ICUBLD_PKG)"
++
++ # Targets for uprops.icu
++-"$(ICUBLD_PKG)\uprops.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genprops\$(CFG)\genprops.exe" "$(ICUBLD_PKG)\pnames.icu"
+++"$(ICUBLD_PKG)\uprops.icu": "$(ICUUNIDATA)\*.txt" "$(ICUPBIN)\genprops.exe" "$(ICUBLD_PKG)\pnames.icu"
++ @echo Creating data file for Unicode Character Properties
++- @"$(ICUTOOLS)\genprops\$(CFG)\genprops" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\genprops" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
++- @"$(ICUTOOLS)\genprops\$(CFG)\genprops" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
+++ @"$(ICUPBIN)\genprops" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
++
++ # Targets for ubidi.icu
++-"$(ICUBLD_PKG)\ubidi.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\genbidi\$(CFG)\genbidi.exe"
+++"$(ICUBLD_PKG)\ubidi.icu": "$(ICUUNIDATA)\*.txt" "$(ICUPBIN)\genbidi.exe"
++ @echo Creating data file for Unicode BiDi/Shaping Properties
++- @"$(ICUTOOLS)\genbidi\$(CFG)\genbidi" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\genbidi" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
++- @"$(ICUTOOLS)\genbidi\$(CFG)\genbidi" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
+++ @"$(ICUPBIN)\genbidi" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
++
++ # Targets for ucase.icu
++-"$(ICUBLD_PKG)\ucase.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gencase\$(CFG)\gencase.exe"
+++"$(ICUBLD_PKG)\ucase.icu": "$(ICUUNIDATA)\*.txt" "$(ICUPBIN)\gencase.exe"
++ @echo Creating data file for Unicode Case Mapping Properties
++- @"$(ICUTOOLS)\gencase\$(CFG)\gencase" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\gencase" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
++- @"$(ICUTOOLS)\gencase\$(CFG)\gencase" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
+++ @"$(ICUPBIN)\gencase" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
++
++ # Targets for unorm.icu
++-"$(ICUBLD_PKG)\unorm.icu": "$(ICUUNIDATA)\*.txt" "$(ICUTOOLS)\gennorm\$(CFG)\gennorm.exe" "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu"
+++"$(ICUBLD_PKG)\unorm.icu": "$(ICUUNIDATA)\*.txt" "$(ICUPBIN)\gennorm.exe" "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu"
++ @echo Creating data file for Unicode Normalization
++- @"$(ICUTOOLS)\gennorm\$(CFG)\gennorm" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\gennorm" -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUBLD_PKG)"
++- @"$(ICUTOOLS)\gennorm\$(CFG)\gennorm" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
+++ @"$(ICUPBIN)\gennorm" --csource -u $(UNICODE_VERSION) -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)" -d "$(ICUTMP)"
++
++ # Targets for converters
++-"$(ICUBLD_PKG)\cnvalias.icu" : {"$(ICUSRCDATA)\$(ICUUCM)"}\convrtrs.txt "$(ICUTOOLS)\gencnval\$(CFG)\gencnval.exe"
+++"$(ICUBLD_PKG)\cnvalias.icu" : {"$(ICUSRCDATA)\$(ICUUCM)"}\convrtrs.txt "$(ICUPBIN)\gencnval.exe"
++ @echo Creating data file for Converter Aliases
++- @"$(ICUTOOLS)\gencnval\$(CFG)\gencnval" -d "$(ICUBLD_PKG)" "$(ICUSRCDATA)\$(ICUUCM)\convrtrs.txt"
+++ @"$(ICUPBIN)\gencnval" -d "$(ICUBLD_PKG)" "$(ICUSRCDATA)\$(ICUUCM)\convrtrs.txt"
++
++ # Targets for ucadata.icu & invuca.icu
++ # used to depend on "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\unorm.icu"
++ # see Jitterbug 4497
++-"$(ICUBLD_PKG)\$(ICUCOL)\invuca.icu" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu": "$(ICUUNIDATA)\FractionalUCA.txt" "$(ICUTOOLS)\genuca\$(CFG)\genuca.exe"
+++"$(ICUBLD_PKG)\$(ICUCOL)\invuca.icu" "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu": "$(ICUUNIDATA)\FractionalUCA.txt" "$(ICUPBIN)\genuca.exe"
++ @echo Creating UCA data files
++- @"$(ICUTOOLS)\genuca\$(CFG)\genuca" -d "$(ICUBLD_PKG)\$(ICUCOL)" -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)"
+++ @"$(ICUPBIN)\genuca" -d "$(ICUBLD_PKG)\$(ICUCOL)" -i "$(ICUBLD_PKG)" -s "$(ICUUNIDATA)"
++
++ # Stringprep .spp file generation.
++ {$(ICUSRCDATA_RELATIVE_PATH)\$(ICUSPREP)}.txt.spp:
++ @echo Creating $@
++- @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s $(<D) -d "$(ICUBLD_PKG)" -b $(@B) -m "$(ICUUNIDATA)" -u 3.2.0 $(<F)
+++ @"$(ICUPBIN)\gensprep" -s $(<D) -d "$(ICUBLD_PKG)" -b $(@B) -m "$(ICUUNIDATA)" -u 3.2.0 $(<F)
++
++ # Confusables .cfu file generation
++ # Can't use an inference rule because two .txt source files combine to produce a single .cfu output file
++-"$(ICUBLD_PKG)\confusables.cfu": "$(ICUUNIDATA)\confusables.txt" "$(ICUUNIDATA)\confusablesWholeScript.txt" "$(ICUTOOLS)\gencfu\$(CFG)\gencfu.exe"
+++"$(ICUBLD_PKG)\confusables.cfu": "$(ICUUNIDATA)\confusables.txt" "$(ICUUNIDATA)\confusablesWholeScript.txt" "$(ICUPBIN)\gencfu.exe"
++ @echo Creating $@
++- @"$(ICUTOOLS)\gencfu\$(CFG)\gencfu" -c -r "$(ICUUNIDATA)\confusables.txt" -w "$(ICUUNIDATA)\confusablesWholeScript.txt" -o $@ -i "$(ICUBLD_PKG)"
+++ @"$(ICUPBIN)\gencfu" -c -r "$(ICUUNIDATA)\confusables.txt" -w "$(ICUUNIDATA)\confusablesWholeScript.txt" -o $@ -i "$(ICUBLD_PKG)"
++
++ !IFDEF ICUDATA_ARCHIVE
++-"$(ICUDATA_SOURCE_ARCHIVE)": CREATE_DIRS $(ICUDATA_ARCHIVE) "$(ICUTOOLS)\icupkg\$(CFG)\icupkg.exe"
+++"$(ICUDATA_SOURCE_ARCHIVE)": CREATE_DIRS $(ICUDATA_ARCHIVE) "$(ICUPBIN)\icupkg.exe"
++- "$(ICUTOOLS)\icupkg\$(CFG)\icupkg" -t$(U_ICUDATA_ENDIAN_SUFFIX) "$(ICUDATA_ARCHIVE)" "$(ICUDATA_SOURCE_ARCHIVE)"
+++ "$(ICUPBIN)\icupkg" -t$(U_ICUDATA_ENDIAN_SUFFIX) "$(ICUDATA_ARCHIVE)" "$(ICUDATA_SOURCE_ARCHIVE)"
++ !ENDIF
++
++ # Dependencies on the tools for the batch inference rules
++
++ !IFNDEF ICUDATA_SOURCE_ARCHIVE
++-$(UCM_SOURCE) : {"$(ICUTOOLS)\makeconv\$(CFG)"}makeconv.exe
+++$(UCM_SOURCE) : {"$(ICUPBIN)"}makeconv.exe
++
++ # This used to depend on "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\ubidi.icu" "$(ICUBLD_PKG)\unorm.icu"
++ # This data is now hard coded as a part of the library.
++ # See Jitterbug 4497 for details.
++-$(MISC_SOURCE) $(RB_FILES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(BRK_RES_FILES) $(TRANSLIT_RES_FILES): {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu"
+++$(MISC_SOURCE) $(RB_FILES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(BRK_RES_FILES) $(TRANSLIT_RES_FILES): {"$(ICUPBIN)"}genrb.exe "$(ICUBLD_PKG)\$(ICUCOL)\ucadata.icu"
++
++ # This used to depend on "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\ubidi.icu" "$(ICUBLD_PKG)\unorm.icu"
++ # This data is now hard coded as a part of the library.
++--- misc/build/icu/source/test/testdata/testdata.mak
+++++ misc/build/icu/source/test/testdata/testdata.mak
++@@ -75,74 +75,74 @@
++ # The -q option is there on purpose, so we don't see it normally.
++ {$(TESTDATA)}.txt.res::
++ @echo Making Test Resource Bundle files $<
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -q -s"$(TESTDATA)" -d"$(TESTDATABLD)" $<
+++ @"$(ICUPBIN)\genrb" -q -s"$(TESTDATA)" -d"$(TESTDATABLD)" $<
++
++ "$(TESTDATABLD)\iscii.res": "$(TESTDATA)\iscii.bin"
++ @echo Making Test Resource Bundle file with encoding ISCII,version=0
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s"$(TESTDATA)" -eISCII,version=0 -d"$(TESTDATABLD)" iscii.bin
+++ @"$(ICUPBIN)\genrb" -s"$(TESTDATA)" -eISCII,version=0 -d"$(TESTDATABLD)" iscii.bin
++
++ "$(TESTDATABLD)\idna_rules.res": "$(TESTDATA)\idna_rules.txt"
++ @echo Making Test Resource Bundle file for IDNA reference implementation
++- @"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s"$(TESTDATA)" -d"$(TESTDATABLD)" idna_rules.txt
+++ @"$(ICUPBIN)\genrb" -s"$(TESTDATA)" -d"$(TESTDATABLD)" idna_rules.txt
++
++
++-"$(TESTDATABLD)\test.icu" : {"$(ICUTOOLS)\gentest\$(CFG)"}gentest.exe
+++"$(TESTDATABLD)\test.icu" : {"$(ICUPBIN)"}gentest.exe
++- "$(ICUTOOLS)\gentest\$(CFG)\gentest" -d"$(TESTDATABLD)"
+++ "$(ICUPBIN)\gentest" -d"$(TESTDATABLD)"
++
++ # testtable32 resource file
++-"$(TESTDATABLD)\testtable32.txt" : {"$(ICUTOOLS)\gentest\$(CFG)"}gentest.exe
+++"$(TESTDATABLD)\testtable32.txt" : {"$(ICUPBIN)"}gentest.exe
++- "$(ICUTOOLS)\gentest\$(CFG)\gentest" -r -d"$(TESTDATABLD)"
+++ "$(ICUPBIN)\gentest" -r -d"$(TESTDATABLD)"
++
++ "$(TESTDATABLD)\testtable32.res": "$(TESTDATABLD)\testtable32.txt"
++- "$(ICUTOOLS)\genrb\$(CFG)\genrb" -s"$(TESTDATABLD)" -d"$(TESTDATABLD)" testtable32.txt
+++ "$(ICUPBIN)\genrb" -s"$(TESTDATABLD)" -d"$(TESTDATABLD)" testtable32.txt
++
++ # Targets for nfscsi.spp
++-"$(TESTDATABLD)\nfscsi.spp" : {"$(ICUTOOLS)\gensprep\$(CFG)"}gensprep.exe "$(TESTDATA)\nfs4_cs_prep_ci.txt"
+++"$(TESTDATABLD)\nfscsi.spp" : {"$(ICUPBIN)"}gensprep.exe "$(TESTDATA)\nfs4_cs_prep_ci.txt"
++ @echo Building $@
++- @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfscsi -u 3.2.0 nfs4_cs_prep_ci.txt
+++ @"$(ICUPBIN)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfscsi -u 3.2.0 nfs4_cs_prep_ci.txt
++
++ # Targets for nfscss.spp
++-"$(TESTDATABLD)\nfscss.spp" : {"$(ICUTOOLS)\gensprep\$(CFG)"}gensprep.exe "$(TESTDATA)\nfs4_cs_prep_cs.txt"
+++"$(TESTDATABLD)\nfscss.spp" : {"$(ICUPBIN)"}gensprep.exe "$(TESTDATA)\nfs4_cs_prep_cs.txt"
++ @echo Building $@
++- @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfscss -u 3.2.0 nfs4_cs_prep_cs.txt
+++ @"$(ICUPBIN)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfscss -u 3.2.0 nfs4_cs_prep_cs.txt
++
++ # Targets for nfscis.spp
++-"$(TESTDATABLD)\nfscis.spp" : {"$(ICUTOOLS)\gensprep\$(CFG)"}gensprep.exe "$(TESTDATA)\nfs4_cis_prep.txt"
+++"$(TESTDATABLD)\nfscis.spp" : {"$(ICUPBIN)"}gensprep.exe "$(TESTDATA)\nfs4_cis_prep.txt"
++ @echo Building $@
++- @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfscis -u 3.2.0 -k -n "$(ICUTOOLS)\..\data\unidata" nfs4_cis_prep.txt
+++ @"$(ICUPBIN)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfscis -u 3.2.0 -k -n "$(ICUTOOLS)\..\data\unidata" nfs4_cis_prep.txt
++
++ # Targets for nfsmxs.spp
++-"$(TESTDATABLD)\nfsmxs.spp" : {"$(ICUTOOLS)\gensprep\$(CFG)"}gensprep.exe "$(TESTDATA)\nfs4_mixed_prep_s.txt"
+++"$(TESTDATABLD)\nfsmxs.spp" : {"$(ICUPBIN)"}gensprep.exe "$(TESTDATA)\nfs4_mixed_prep_s.txt"
++ @echo Building $@
++- @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfsmxs -u 3.2.0 -k -n "$(ICUTOOLS)\..\data\unidata" nfs4_mixed_prep_s.txt
+++ @"$(ICUPBIN)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfsmxs -u 3.2.0 -k -n "$(ICUTOOLS)\..\data\unidata" nfs4_mixed_prep_s.txt
++
++ # Targets for nfsmxp.spp
++-"$(TESTDATABLD)\nfsmxp.spp" : {"$(ICUTOOLS)\gensprep\$(CFG)"}gensprep.exe "$(TESTDATA)\nfs4_mixed_prep_p.txt"
+++"$(TESTDATABLD)\nfsmxp.spp" : {"$(ICUPBIN)"}gensprep.exe "$(TESTDATA)\nfs4_mixed_prep_p.txt"
++ @echo Building $@
++- @"$(ICUTOOLS)\gensprep\$(CFG)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfsmxp -u 3.2.0 -k -n "$(ICUTOOLS)\..\data\unidata" nfs4_mixed_prep_p.txt
+++ @"$(ICUPBIN)\gensprep" -s "$(TESTDATA)" -d "$(TESTDATABLD)\\" -b nfsmxp -u 3.2.0 -k -n "$(ICUTOOLS)\..\data\unidata" nfs4_mixed_prep_p.txt
++
++
++ # Targets for test converter data
++ "$(TESTDATABLD)\test1.cnv": "$(TESTDATA)\test1.ucm"
++ @echo Building $@
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
+++ @"$(ICUPBIN)\makeconv" --small -d"$(TESTDATABLD)" $**
++
++ "$(TESTDATABLD)\test1bmp.cnv": "$(TESTDATA)\test1bmp.ucm"
++ @echo Building $@
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
+++ @"$(ICUPBIN)\makeconv" --small -d"$(TESTDATABLD)" $**
++
++ "$(TESTDATABLD)\test3.cnv": "$(TESTDATA)\test3.ucm"
++ @echo Building $@
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
+++ @"$(ICUPBIN)\makeconv" --small -d"$(TESTDATABLD)" $**
++
++ "$(TESTDATABLD)\test4.cnv": "$(TESTDATA)\test4.ucm"
++ @echo Building $@
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
+++ @"$(ICUPBIN)\makeconv" --small -d"$(TESTDATABLD)" $**
++
++ "$(TESTDATABLD)\test4x.cnv": "$(TESTDATA)\test4x.ucm"
++ @echo Building $@
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
+++ @"$(ICUPBIN)\makeconv" --small -d"$(TESTDATABLD)" $**
++
++ "$(TESTDATABLD)\ibm9027.cnv": "$(TESTDATA)\ibm9027.ucm"
++ @echo Building $@
++- @"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" --small -d"$(TESTDATABLD)" $**
+++ @"$(ICUPBIN)\makeconv" --small -d"$(TESTDATABLD)" $**
diff --git icu/icuversion.mk icu/icuversion.mk
index eedf627..1fc9ecb 100755
--- icu/icuversion.mk
@@ -429,6 +904,15 @@ index 2fafcfa..acf0630 100644
.ELSE
TARFILE_NAME=icu4c-$(ICU_MAJOR)_$(ICU_MINOR)-src
TARFILE_MD5=
+@@ -234,7 +234,7 @@ OUT2BIN= \
+ $(BUILD_DIR)$/..$/bin$/icuin$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
+ $(BUILD_DIR)$/..$/bin$/icuuc$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
+ $(BUILD_DIR)$/..$/bin$/icule$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
+- $(BUILD_DIR)$/..$/bin$/icutu$(ICU_MAJOR)$(ICU_MINOR)$(ICU_BUILD_LIBPOST).dll \
++ $(BUILD_DIR)$/..$/bin$/icutu41$(ICU_BUILD_LIBPOST).dll \
+ $(BUILD_DIR)$/..$/bin$/genccode.exe \
+ $(BUILD_DIR)$/..$/bin$/genbrk.exe \
+ $(BUILD_DIR)$/..$/bin$/gencmn.exe
diff --git ooo.lst ooo.lst
index 3e379fa..68105a8 100755
--- ooo.lst
More information about the ooo-build-commit
mailing list