diff --git a/icu4c/source/common/common.vcproj b/icu4c/source/common/common.vcproj index e87546e5f21..7285aa7741b 100644 --- a/icu4c/source/common/common.vcproj +++ b/icu4c/source/common/common.vcproj @@ -16,7 +16,7 @@ @@ -107,7 +107,7 @@ "$(ICUTMP)\icudata.lst" - "$(ICUP)\bin\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" + "$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)\icudata.lst" + "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" 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" @@ -394,7 +405,7 @@ uni-core-data: GODATA "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(IC "$(ICU_LIB_TARGET)" : $(COMMON_ICUDATA_DEPENDENCIES) $(CNV_FILES) "$(ICUBLD_PKG)\unames.icu" "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\cnvalias.icu" "$(ICUBLD_PKG)\ucadata.icu" "$(ICUBLD_PKG)\invuca.icu" "$(ICUBLD_PKG)\uidna.spp" $(BRK_FILES) $(BRK_CTD_FILES) $(BRK_RES_FILES) $(COL_COL_FILES) $(RBNF_RES_FILES) $(TRANSLIT_RES_FILES) $(ALL_RES) @echo Building icu data cd "$(ICUBLD_PKG)" - "$(ICUP)\bin\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) <<"$(ICUTMP)\icudata.lst" + "$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) <<"$(ICUTMP)\icudata.lst" pnames.icu unames.icu ucadata.icu diff --git a/icu4c/source/data/makedata.vcproj b/icu4c/source/data/makedata.vcproj index 0bacc4a00ff..294663013cb 100644 --- a/icu4c/source/data/makedata.vcproj +++ b/icu4c/source/data/makedata.vcproj @@ -16,19 +16,19 @@ diff --git a/icu4c/source/i18n/i18n.vcproj b/icu4c/source/i18n/i18n.vcproj index 6c70aebae1b..87ebceccb6d 100644 --- a/icu4c/source/i18n/i18n.vcproj +++ b/icu4c/source/i18n/i18n.vcproj @@ -16,7 +16,7 @@ @@ -109,8 +109,8 @@ diff --git a/icu4c/source/samples/uresb/uresb.vcproj b/icu4c/source/samples/uresb/uresb.vcproj index ade8dd4517c..2e92950eb2d 100644 --- a/icu4c/source/samples/uresb/uresb.vcproj +++ b/icu4c/source/samples/uresb/uresb.vcproj @@ -15,8 +15,8 @@ @@ -108,8 +108,8 @@ @@ -109,8 +109,8 @@ @@ -109,8 +109,8 @@ diff --git a/icu4c/source/test/letest/gendata.vcproj b/icu4c/source/test/letest/gendata.vcproj index e76679d334d..ce818a310a4 100644 --- a/icu4c/source/test/letest/gendata.vcproj +++ b/icu4c/source/test/letest/gendata.vcproj @@ -15,8 +15,8 @@ diff --git a/icu4c/source/test/perf/collperf/collperf.vcproj b/icu4c/source/test/perf/collperf/collperf.vcproj index f34d8bd48a7..053ac80cdd2 100644 --- a/icu4c/source/test/perf/collperf/collperf.vcproj +++ b/icu4c/source/test/perf/collperf/collperf.vcproj @@ -15,8 +15,8 @@ diff --git a/icu4c/source/test/perf/convperf/convperf.vcproj b/icu4c/source/test/perf/convperf/convperf.vcproj index 8649cb78a46..fa4b194b9bf 100644 --- a/icu4c/source/test/perf/convperf/convperf.vcproj +++ b/icu4c/source/test/perf/convperf/convperf.vcproj @@ -15,8 +15,8 @@ @@ -107,8 +107,8 @@ diff --git a/icu4c/source/test/perf/strsrchperf/strsrchperf.vcproj b/icu4c/source/test/perf/strsrchperf/strsrchperf.vcproj index 7db5689e0a6..b109eef9ea9 100644 --- a/icu4c/source/test/perf/strsrchperf/strsrchperf.vcproj +++ b/icu4c/source/test/perf/strsrchperf/strsrchperf.vcproj @@ -15,8 +15,8 @@ diff --git a/icu4c/source/test/perf/ubrkperf/ubrkperf.vcproj b/icu4c/source/test/perf/ubrkperf/ubrkperf.vcproj index 31f5bc03a51..5b16e483825 100644 --- a/icu4c/source/test/perf/ubrkperf/ubrkperf.vcproj +++ b/icu4c/source/test/perf/ubrkperf/ubrkperf.vcproj @@ -15,8 +15,8 @@ diff --git a/icu4c/source/test/perf/unisetperf/unisetperf.vcproj b/icu4c/source/test/perf/unisetperf/unisetperf.vcproj index 4a281ef978e..fbf070be921 100644 --- a/icu4c/source/test/perf/unisetperf/unisetperf.vcproj +++ b/icu4c/source/test/perf/unisetperf/unisetperf.vcproj @@ -15,8 +15,8 @@ @@ -106,8 +106,8 @@ diff --git a/icu4c/source/test/perf/usetperf/usetperf.vcproj b/icu4c/source/test/perf/usetperf/usetperf.vcproj index c128b0487bc..60228e4c64e 100644 --- a/icu4c/source/test/perf/usetperf/usetperf.vcproj +++ b/icu4c/source/test/perf/usetperf/usetperf.vcproj @@ -15,8 +15,8 @@ @@ -106,8 +106,8 @@ @@ -107,8 +107,8 @@ diff --git a/icu4c/source/test/testdata/testdata.mak b/icu4c/source/test/testdata/testdata.mak index fe9f42b3dd4..facda030b9c 100644 --- a/icu4c/source/test/testdata/testdata.mak +++ b/icu4c/source/test/testdata/testdata.mak @@ -1,5 +1,5 @@ #********************************************************************** -#* Copyright (C) 1999-2007, International Business Machines Corporation +#* Copyright (C) 1999-2008, International Business Machines Corporation #* and others. All Rights Reserved. #********************************************************************** # @@ -33,7 +33,7 @@ TEST_RES_FILES = $(TEST_RES_SOURCE:.txt=.res) @copy "$(TESTDATABLD)\te.res" "$(TESTDATAOUT)\$(TESTDT)\nam.typ" @copy "$(TESTDATA)\icu26_testtypes.res" "$(TESTDATABLD)" @copy "$(TESTDATA)\icu26e_testtypes.res" "$(TESTDATABLD)" - "$(ICUP)\bin\pkgdata" -f -v -m common -c -p"$(TESTPKG)" -d "$(TESTDATAOUT)" -T "$(TESTDATABLD)" -s "$(TESTDATABLD)" << + "$(ICUPBIN)\pkgdata" -f -v -m common -c -p"$(TESTPKG)" -d "$(TESTDATAOUT)" -T "$(TESTDATABLD)" -s "$(TESTDATABLD)" << casing.res conversion.res mc.res diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcproj b/icu4c/source/tools/ctestfw/ctestfw.vcproj index cb1ee5a70c6..08126d27d1f 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcproj @@ -16,7 +16,7 @@ @@ -49,10 +49,10 @@ RuntimeLibrary="3" DisableLanguageExtensions="true" UsePrecompiledHeader="0" - PrecompiledHeaderFile=".\Debug/icuzdump.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile=".\x86\Debug/icuzdump.pch" + AssemblerListingLocation=".\x86\Debug/" + ObjectFile=".\x86\Debug/" + ProgramDataBaseFileName=".\x86\Debug/" BrowseInformation="1" WarningLevel="3" Detect64BitPortabilityProblems="false" @@ -71,11 +71,11 @@