From db553b74eb89d2362899a89cc1f7c11bba032bde Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Wed, 5 May 2004 23:03:04 +0000 Subject: [PATCH] ICU-3499 Move icuio to a supported directory. X-SVN-Rev: 15159 --- .gitignore | 4 + icu4c/as_is/os400/configure | 6 +- icu4c/source/Makefile.in | 7 +- icu4c/source/allinone/allinone.dsw | 6 +- icu4c/source/allinone/allinone.sln | 2 +- icu4c/source/common/unicode/utypes.h | 2 +- icu4c/source/configure | 6 +- icu4c/source/configure.in | 3 +- icu4c/source/extra/Makefile.in | 4 +- icu4c/source/{extra/ustdio => io}/.cvsignore | 1 - icu4c/source/{extra/ustdio => io}/Makefile.in | 10 +- .../{extra/ustdio/ustdio.dsp => io/io.dsp} | 106 +++++++++--------- .../{extra/ustdio/ustdio.rc => io/io.rc} | 2 +- .../ustdio/ustdio.vcproj => io/io.vcproj} | 56 ++++----- icu4c/source/{extra/ustdio => io}/locbund.c | 0 icu4c/source/{extra/ustdio => io}/locbund.h | 0 icu4c/source/{extra/ustdio => io}/sprintf.c | 0 icu4c/source/{extra/ustdio => io}/sscanf.c | 0 icu4c/source/{extra/ustdio => io}/ufile.c | 0 icu4c/source/{extra/ustdio => io}/ufile.h | 0 icu4c/source/{extra/ustdio => io}/ufmt_cmn.c | 0 icu4c/source/{extra/ustdio => io}/ufmt_cmn.h | 0 .../{extra/ustdio => io}/unicode/ustdio.h | 0 .../{extra/ustdio => io}/unicode/ustream.h | 0 icu4c/source/{extra/ustdio => io}/uprintf.c | 0 icu4c/source/{extra/ustdio => io}/uprintf.h | 0 icu4c/source/{extra/ustdio => io}/uprntf_p.c | 0 icu4c/source/{extra/ustdio => io}/uscanf.c | 0 icu4c/source/{extra/ustdio => io}/uscanf.h | 0 icu4c/source/{extra/ustdio => io}/uscanf_p.c | 0 icu4c/source/{extra/ustdio => io}/ustdio.c | 0 icu4c/source/{extra/ustdio => io}/ustream.cpp | 0 32 files changed, 111 insertions(+), 104 deletions(-) rename icu4c/source/{extra/ustdio => io}/.cvsignore (71%) rename icu4c/source/{extra/ustdio => io}/Makefile.in (96%) rename icu4c/source/{extra/ustdio/ustdio.dsp => io/io.dsp} (63%) rename icu4c/source/{extra/ustdio/ustdio.rc => io/io.rc} (98%) rename icu4c/source/{extra/ustdio/ustdio.vcproj => io/io.vcproj} (77%) rename icu4c/source/{extra/ustdio => io}/locbund.c (100%) rename icu4c/source/{extra/ustdio => io}/locbund.h (100%) rename icu4c/source/{extra/ustdio => io}/sprintf.c (100%) rename icu4c/source/{extra/ustdio => io}/sscanf.c (100%) rename icu4c/source/{extra/ustdio => io}/ufile.c (100%) rename icu4c/source/{extra/ustdio => io}/ufile.h (100%) rename icu4c/source/{extra/ustdio => io}/ufmt_cmn.c (100%) rename icu4c/source/{extra/ustdio => io}/ufmt_cmn.h (100%) rename icu4c/source/{extra/ustdio => io}/unicode/ustdio.h (100%) rename icu4c/source/{extra/ustdio => io}/unicode/ustream.h (100%) rename icu4c/source/{extra/ustdio => io}/uprintf.c (100%) rename icu4c/source/{extra/ustdio => io}/uprintf.h (100%) rename icu4c/source/{extra/ustdio => io}/uprntf_p.c (100%) rename icu4c/source/{extra/ustdio => io}/uscanf.c (100%) rename icu4c/source/{extra/ustdio => io}/uscanf.h (100%) rename icu4c/source/{extra/ustdio => io}/uscanf_p.c (100%) rename icu4c/source/{extra/ustdio => io}/ustdio.c (100%) rename icu4c/source/{extra/ustdio => io}/ustream.cpp (100%) diff --git a/.gitignore b/.gitignore index c756f97fc47..b743405c2a9 100644 --- a/.gitignore +++ b/.gitignore @@ -120,6 +120,10 @@ icu4c/source/i18n/Makefile icu4c/source/i18n/Release icu4c/source/i18n/libicu*.* icu4c/source/icudefs.mk +icu4c/source/io/*.d +icu4c/source/io/Debug +icu4c/source/io/Makefile +icu4c/source/io/Release icu4c/source/layout/*.d icu4c/source/layout/*.pdb icu4c/source/layout/Debug diff --git a/icu4c/as_is/os400/configure b/icu4c/as_is/os400/configure index b632a6d4f20..d5ad5ba3972 100755 --- a/icu4c/as_is/os400/configure +++ b/icu4c/as_is/os400/configure @@ -4179,7 +4179,8 @@ trap 'del -f `echo "icudefs.mk \ common/Makefile config/Makefile.inc i18n/Makefile \ layout/Makefile \ layoutex/Makefile \ - extra/Makefile extra/ustdio/Makefile \ + io/Makefile \ + extra/Makefile \ extra/uconv/Makefile extra/scrptrun/Makefile stubdata/Makefile \ tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \ @@ -4372,7 +4373,8 @@ CONFIG_FILES=\${CONFIG_FILES-"icudefs.mk \ common/Makefile config/Makefile.inc i18n/Makefile \ layout/Makefile \ layoutex/Makefile \ - extra/Makefile extra/ustdio/Makefile \ + io/Makefile \ + extra/Makefile \ extra/uconv/Makefile extra/scrptrun/Makefile stubdata/Makefile \ tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \ diff --git a/icu4c/source/Makefile.in b/icu4c/source/Makefile.in index 77acd2a164f..fe63a20d4a5 100644 --- a/icu4c/source/Makefile.in +++ b/icu4c/source/Makefile.in @@ -25,8 +25,9 @@ subdir = . #AUTOCONF = @AUTOCONF@ ## Optional directory setup -@EXTRAS_TRUE@EXTRA = extra @LAYOUT_TRUE@LAYOUT = layout layoutex +@ICUIO_TRUE@ICUIO = io +@EXTRAS_TRUE@EXTRA = extra @TESTS_TRUE@TEST = test @SAMPLES_TRUE@SAMPLE = samples @@ -42,7 +43,7 @@ INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/conf LOCAL_BUILT_FILES = icudefs.mk DOCDIRS = common i18n -SUBDIRS = stubdata common i18n $(LAYOUT) tools data $(EXTRA) $(SAMPLE) $(TEST) +SUBDIRS = stubdata common i18n $(LAYOUT) tools data $(ICUIO) $(EXTRA) $(SAMPLE) $(TEST) SECTION = 1 @@ -79,7 +80,7 @@ doc: else doc: doc/html/index.html -doc/html/index.html: Doxyfile $(wildcard ./common/unicode/platform.h $(srcdir)/common/unicode/*.h $(srcdir)/i18n/unicode/*.h $(srcdir)/layout/unicode/*.h) +doc/html/index.html: Doxyfile $(wildcard ./common/unicode/platform.h $(srcdir)/common/unicode/*.h $(srcdir)/i18n/unicode/*.h $(srcdir)/layout/unicode/*.h $(srcdir)/io/unicode/*.h) $(DOXYGEN) Doxyfile: $(srcdir)/Doxyfile.in diff --git a/icu4c/source/allinone/allinone.dsw b/icu4c/source/allinone/allinone.dsw index c837a9dc355..117903e664e 100644 --- a/icu4c/source/allinone/allinone.dsw +++ b/icu4c/source/allinone/allinone.dsw @@ -84,7 +84,7 @@ Package=<4> Project_Dep_Name uconv End Project Dependency Begin Project Dependency - Project_Dep_Name ustdio + Project_Dep_Name io End Project Dependency Begin Project Dependency Project_Dep_Name genbrk @@ -489,7 +489,7 @@ Package=<4> Project_Dep_Name i18n End Project Dependency Begin Project Dependency - Project_Dep_Name ustdio + Project_Dep_Name io End Project Dependency }}} @@ -684,7 +684,7 @@ Package=<4> ############################################################################### -Project: "ustdio"=..\extra\ustdio\ustdio.dsp - Package Owner=<4> +Project: "io"=..\io\io.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/icu4c/source/allinone/allinone.sln b/icu4c/source/allinone/allinone.sln index 8f318c11572..4d2d7248c19 100644 --- a/icu4c/source/allinone/allinone.sln +++ b/icu4c/source/allinone/allinone.sln @@ -174,7 +174,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uconv", "..\extra\uconv\uco {4C8454FE-81D3-4CA3-9927-29BA96F03DAC} = {4C8454FE-81D3-4CA3-9927-29BA96F03DAC} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ustdio", "..\extra\ustdio\ustdio.vcproj", "{C2B04507-2521-4801-BF0D-5FD79D6D518C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "io", "..\io\io.vcproj", "{C2B04507-2521-4801-BF0D-5FD79D6D518C}" ProjectSection(ProjectDependencies) = postProject {0178B127-6269-407D-B112-93877BB62776} = {0178B127-6269-407D-B112-93877BB62776} {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h index 1b9452b349a..403e17e1c29 100644 --- a/icu4c/source/common/unicode/utypes.h +++ b/icu4c/source/common/unicode/utypes.h @@ -391,7 +391,7 @@ typedef void* UClassID; #define U_LAYOUT_API U_IMPORT #define U_LAYOUTEX_API U_EXPORT #define U_IO_API U_IMPORT -#elif defined(U_USTDIO_IMPLEMENTATION) +#elif defined(U_IO_IMPLEMENTATION) #define U_DATA_API U_IMPORT #define U_COMMON_API U_IMPORT #define U_I18N_API U_IMPORT diff --git a/icu4c/source/configure b/icu4c/source/configure index 6a8d84fc470..09bbbd2d79b 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -4141,7 +4141,8 @@ trap 'rm -fr `echo "icudefs.mk \ common/Makefile config/Makefile.inc i18n/Makefile \ layout/Makefile \ layoutex/Makefile \ - extra/Makefile extra/ustdio/Makefile \ + io/Makefile \ + extra/Makefile \ extra/uconv/Makefile extra/scrptrun/Makefile stubdata/Makefile \ tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \ @@ -4334,7 +4335,8 @@ CONFIG_FILES=\${CONFIG_FILES-"icudefs.mk \ common/Makefile config/Makefile.inc i18n/Makefile \ layout/Makefile \ layoutex/Makefile \ - extra/Makefile extra/ustdio/Makefile \ + io/Makefile \ + extra/Makefile \ extra/uconv/Makefile extra/scrptrun/Makefile stubdata/Makefile \ tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \ diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index a525854e3c8..27f75610f05 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -947,7 +947,8 @@ AC_OUTPUT([icudefs.mk \ common/Makefile config/Makefile.inc i18n/Makefile \ layout/Makefile \ layoutex/Makefile \ - extra/Makefile extra/ustdio/Makefile \ + io/Makefile \ + extra/Makefile \ extra/uconv/Makefile extra/scrptrun/Makefile stubdata/Makefile \ tools/Makefile tools/ctestfw/Makefile tools/makeconv/Makefile \ diff --git a/icu4c/source/extra/Makefile.in b/icu4c/source/extra/Makefile.in index f7fa1d1802e..937859ca552 100644 --- a/icu4c/source/extra/Makefile.in +++ b/icu4c/source/extra/Makefile.in @@ -15,15 +15,13 @@ top_builddir = .. include $(top_builddir)/icudefs.mk -@ICUIO_TRUE@ICUIO = ustdio - ## Build directory information subdir = extra ## Files to remove for 'make clean' CLEANFILES = *~ -SUBDIRS = $(ICUIO) uconv +SUBDIRS = uconv ## List of phony targets .PHONY : all all-local all-recursive install install-local \ diff --git a/icu4c/source/extra/ustdio/.cvsignore b/icu4c/source/io/.cvsignore similarity index 71% rename from icu4c/source/extra/ustdio/.cvsignore rename to icu4c/source/io/.cvsignore index 9e24f811f00..5ce12ff845c 100644 --- a/icu4c/source/extra/ustdio/.cvsignore +++ b/icu4c/source/io/.cvsignore @@ -1,5 +1,4 @@ *.d -libicuio.* Debug Release Makefile diff --git a/icu4c/source/extra/ustdio/Makefile.in b/icu4c/source/io/Makefile.in similarity index 96% rename from icu4c/source/extra/ustdio/Makefile.in rename to icu4c/source/io/Makefile.in index 32fdf84451f..c42777e0bb3 100644 --- a/icu4c/source/extra/ustdio/Makefile.in +++ b/icu4c/source/io/Makefile.in @@ -4,20 +4,20 @@ # Corporation and others. All Rights Reserved. # #****************************************************************************** -## Makefile.in for ICU - extra/ustdio/libustdio.so +## Makefile.in for ICU - io/libustdio.so ## Stephen F. Booth ## Source directory information srcdir = @srcdir@ top_srcdir = @top_srcdir@ -top_builddir = ../.. +top_builddir = .. ## All the flags and other definitions are included here. include $(top_builddir)/icudefs.mk ## Build directory information -subdir = extra/ustdio +subdir = io ## Extra files to remove for 'make clean' CLEANFILES = *~ $(DEPS) $(IMPORT_LIB) $(MIDDLE_IMPORT_LIB) $(FINAL_IMPORT_LIB) @@ -35,7 +35,7 @@ SO_TARGET = $(LIBDIR)/$(LIBICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(SO) ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET) ifeq ($(ENABLE_SO_VERSION_DATA),1) -SO_VERSION_DATA = ustdio.res +SO_VERSION_DATA = io.res endif ifeq ($(OS390BATCH),1) @@ -52,7 +52,7 @@ DYNAMICCFLAGS = $(SHAREDLIBCFLAGS) DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS) CPPFLAGS += -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n $(LIBCPPFLAGS) -DEFS += -DU_USTDIO_IMPLEMENTATION +DEFS += -DU_IO_IMPLEMENTATION LIBS = $(LIBICUUC) $(LIBICUI18N) $(DEFAULT_LIBS) OBJECTS = locbund.o ufile.o ufmt_cmn.o uprintf.o uprntf_p.o \ diff --git a/icu4c/source/extra/ustdio/ustdio.dsp b/icu4c/source/io/io.dsp similarity index 63% rename from icu4c/source/extra/ustdio/ustdio.dsp rename to icu4c/source/io/io.dsp index a5a30ae4b8d..a62cf1a1ba4 100644 --- a/icu4c/source/extra/ustdio/ustdio.dsp +++ b/icu4c/source/io/io.dsp @@ -1,26 +1,26 @@ -# Microsoft Developer Studio Project File - Name="ustdio" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="io" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=ustdio - Win32 Debug +CFG=io - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "ustdio.mak". +!MESSAGE NMAKE /f "io.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "ustdio.mak" CFG="ustdio - Win32 Debug" +!MESSAGE NMAKE /f "io.mak" CFG="io - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ustdio - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ustdio - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ustdio - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ustdio - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "io - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "io - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "io - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "io - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -31,7 +31,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "ustdio - Win32 Release" +!IF "$(CFG)" == "io - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -40,25 +40,25 @@ RSC=rc.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\lib" +# PROP Output_Dir "..\..\lib" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c -# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FD /GF /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /FD /c +# ADD CPP /nologo /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\include" /I "..\common" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /D "U_IO_IMPLEMENTATION" /FD /GF /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\..\common" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\common" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\icuio30.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\" +# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:I386 /out:"..\..\bin\icuio30.dll" /implib:"..\..\lib/icuio.lib" /libpath:"..\..\lib\\" # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "ustdio - Win32 Debug" +!ELSEIF "$(CFG)" == "io - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -67,25 +67,25 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\lib" +# PROP Output_Dir "..\..\lib" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\include" /I "..\..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /FR /FD /GF /GZ /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /D "U_IO_IMPLEMENTATION" /FR /FD /GF /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\..\common" /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\common" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\icuio30d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\" +# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\icuio30d.dll" /implib:"..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\lib\\" # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "ustdio - Win64 Release" +!ELSEIF "$(CFG)" == "io - Win64 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -94,24 +94,24 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "..\..\..\lib" +# PROP Output_Dir "..\..\lib" # PROP Intermediate_Dir "Release" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /c -# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GF /QIA64_fmaopt /Zm600 /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /FD /c +# ADD CPP /nologo /MD /Za /W3 /GX /Zi /O2 /I "..\..\include" /I "..\common" /D "WIN64" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /D "U_IO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /GF /QIA64_fmaopt /Zm600 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win64 # ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /i "..\..\common" /d "NDEBUG" +# ADD RSC /l 0x409 /i "..\common" /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64 -# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IX86 /out:"..\..\..\bin\icuio30.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\" /machine:IA64 +# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IX86 /out:"..\..\bin\icuio30.dll" /implib:"..\..\lib/icuio.lib" /libpath:"..\..\lib\\" /machine:IA64 -!ELSEIF "$(CFG)" == "ustdio - Win64 Debug" +!ELSEIF "$(CFG)" == "io - Win64 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -120,31 +120,31 @@ LINK32=link.exe # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "..\..\..\lib" +# PROP Output_Dir "..\..\lib" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /FD /GZ /c -# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\include" /I "..\..\common" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USTDIO_EXPORTS" /D "U_USTDIO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GF /GZ /QIA64_fmaopt /Zm600 /c +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /FD /GZ /c +# ADD CPP /nologo /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\include" /I "..\common" /D "WIN64" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "IO_EXPORTS" /D "U_IO_IMPLEMENTATION" /D "_IA64_" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FR /FD /GF /GZ /QIA64_fmaopt /Zm600 /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win64 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /i "..\..\common" /d "_DEBUG" +# ADD RSC /l 0x409 /i "..\common" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64 -# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\..\bin\icuio30d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\" /machine:IA64 +# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icuio30d.dll" /implib:"..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\lib\\" /machine:IA64 !ENDIF # Begin Target -# Name "ustdio - Win32 Release" -# Name "ustdio - Win32 Debug" -# Name "ustdio - Win64 Release" -# Name "ustdio - Win64 Debug" +# Name "io - Win32 Release" +# Name "io - Win32 Debug" +# Name "io - Win64 Release" +# Name "io - Win64 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -238,8 +238,8 @@ SOURCE=.\unicode\ustdio.h # Begin Custom Build InputPath=.\unicode\ustdio.h -"..\..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -248,8 +248,8 @@ InputPath=.\unicode\ustdio.h # Begin Custom Build InputPath=.\unicode\ustdio.h -"..\..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -258,8 +258,8 @@ InputPath=.\unicode\ustdio.h # Begin Custom Build InputPath=.\unicode\ustdio.h -"..\..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -268,8 +268,8 @@ InputPath=.\unicode\ustdio.h # Begin Custom Build InputPath=.\unicode\ustdio.h -"..\..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustdio.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -285,8 +285,8 @@ SOURCE=.\unicode\ustream.h # Begin Custom Build InputPath=.\unicode\ustream.h -"..\..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -295,8 +295,8 @@ InputPath=.\unicode\ustream.h # Begin Custom Build InputPath=.\unicode\ustream.h -"..\..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -305,8 +305,8 @@ InputPath=.\unicode\ustream.h # Begin Custom Build InputPath=.\unicode\ustream.h -"..\..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -315,8 +315,8 @@ InputPath=.\unicode\ustream.h # Begin Custom Build InputPath=.\unicode\ustream.h -"..\..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(InputPath) ..\..\..\include\unicode +"..\..\include\unicode\ustream.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy $(InputPath) ..\..\include\unicode # End Custom Build @@ -329,7 +329,7 @@ InputPath=.\unicode\ustream.h # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" # Begin Source File -SOURCE=.\ustdio.rc +SOURCE=.\io.rc # End Source File # End Group # End Target diff --git a/icu4c/source/extra/ustdio/ustdio.rc b/icu4c/source/io/io.rc similarity index 98% rename from icu4c/source/extra/ustdio/ustdio.rc rename to icu4c/source/io/io.rc index 63597aa3fa4..51e89d7e4d3 100644 --- a/icu4c/source/extra/ustdio/ustdio.rc +++ b/icu4c/source/io/io.rc @@ -4,7 +4,7 @@ // Copyright (c) 2001-2003 International Business Machines // Corporation and others. All Rights Reserved. // -#include "../../common/msvcres.h" +#include "../common/msvcres.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/icu4c/source/extra/ustdio/ustdio.vcproj b/icu4c/source/io/io.vcproj similarity index 77% rename from icu4c/source/extra/ustdio/ustdio.vcproj rename to icu4c/source/io/io.vcproj index b9082d341eb..6f580459a66 100644 --- a/icu4c/source/extra/ustdio/ustdio.vcproj +++ b/icu4c/source/io/io.vcproj @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ + ImportLibrary="..\..\lib/icuio.lib"/> + TypeLibraryName=".\..\..\lib/io.tlb"/> + AdditionalIncludeDirectories="..\common"/> + ImportLibrary="..\..\lib\icuiod.lib"/> + TypeLibraryName=".\..\..\lib/io.tlb"/> + AdditionalIncludeDirectories="..\common"/> + Outputs="..\..\include\unicode\$(InputFileName)"/> + Outputs="..\..\include\unicode\$(InputFileName)"/> + Outputs="..\..\include\unicode\$(InputFileName)"/> + Outputs="..\..\include\unicode\$(InputFileName)"/> @@ -258,7 +258,7 @@ Name="Resource Files" Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> + RelativePath=".\io.rc"> diff --git a/icu4c/source/extra/ustdio/locbund.c b/icu4c/source/io/locbund.c similarity index 100% rename from icu4c/source/extra/ustdio/locbund.c rename to icu4c/source/io/locbund.c diff --git a/icu4c/source/extra/ustdio/locbund.h b/icu4c/source/io/locbund.h similarity index 100% rename from icu4c/source/extra/ustdio/locbund.h rename to icu4c/source/io/locbund.h diff --git a/icu4c/source/extra/ustdio/sprintf.c b/icu4c/source/io/sprintf.c similarity index 100% rename from icu4c/source/extra/ustdio/sprintf.c rename to icu4c/source/io/sprintf.c diff --git a/icu4c/source/extra/ustdio/sscanf.c b/icu4c/source/io/sscanf.c similarity index 100% rename from icu4c/source/extra/ustdio/sscanf.c rename to icu4c/source/io/sscanf.c diff --git a/icu4c/source/extra/ustdio/ufile.c b/icu4c/source/io/ufile.c similarity index 100% rename from icu4c/source/extra/ustdio/ufile.c rename to icu4c/source/io/ufile.c diff --git a/icu4c/source/extra/ustdio/ufile.h b/icu4c/source/io/ufile.h similarity index 100% rename from icu4c/source/extra/ustdio/ufile.h rename to icu4c/source/io/ufile.h diff --git a/icu4c/source/extra/ustdio/ufmt_cmn.c b/icu4c/source/io/ufmt_cmn.c similarity index 100% rename from icu4c/source/extra/ustdio/ufmt_cmn.c rename to icu4c/source/io/ufmt_cmn.c diff --git a/icu4c/source/extra/ustdio/ufmt_cmn.h b/icu4c/source/io/ufmt_cmn.h similarity index 100% rename from icu4c/source/extra/ustdio/ufmt_cmn.h rename to icu4c/source/io/ufmt_cmn.h diff --git a/icu4c/source/extra/ustdio/unicode/ustdio.h b/icu4c/source/io/unicode/ustdio.h similarity index 100% rename from icu4c/source/extra/ustdio/unicode/ustdio.h rename to icu4c/source/io/unicode/ustdio.h diff --git a/icu4c/source/extra/ustdio/unicode/ustream.h b/icu4c/source/io/unicode/ustream.h similarity index 100% rename from icu4c/source/extra/ustdio/unicode/ustream.h rename to icu4c/source/io/unicode/ustream.h diff --git a/icu4c/source/extra/ustdio/uprintf.c b/icu4c/source/io/uprintf.c similarity index 100% rename from icu4c/source/extra/ustdio/uprintf.c rename to icu4c/source/io/uprintf.c diff --git a/icu4c/source/extra/ustdio/uprintf.h b/icu4c/source/io/uprintf.h similarity index 100% rename from icu4c/source/extra/ustdio/uprintf.h rename to icu4c/source/io/uprintf.h diff --git a/icu4c/source/extra/ustdio/uprntf_p.c b/icu4c/source/io/uprntf_p.c similarity index 100% rename from icu4c/source/extra/ustdio/uprntf_p.c rename to icu4c/source/io/uprntf_p.c diff --git a/icu4c/source/extra/ustdio/uscanf.c b/icu4c/source/io/uscanf.c similarity index 100% rename from icu4c/source/extra/ustdio/uscanf.c rename to icu4c/source/io/uscanf.c diff --git a/icu4c/source/extra/ustdio/uscanf.h b/icu4c/source/io/uscanf.h similarity index 100% rename from icu4c/source/extra/ustdio/uscanf.h rename to icu4c/source/io/uscanf.h diff --git a/icu4c/source/extra/ustdio/uscanf_p.c b/icu4c/source/io/uscanf_p.c similarity index 100% rename from icu4c/source/extra/ustdio/uscanf_p.c rename to icu4c/source/io/uscanf_p.c diff --git a/icu4c/source/extra/ustdio/ustdio.c b/icu4c/source/io/ustdio.c similarity index 100% rename from icu4c/source/extra/ustdio/ustdio.c rename to icu4c/source/io/ustdio.c diff --git a/icu4c/source/extra/ustdio/ustream.cpp b/icu4c/source/io/ustream.cpp similarity index 100% rename from icu4c/source/extra/ustdio/ustream.cpp rename to icu4c/source/io/ustream.cpp