AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-7213 get non-dll data init

Browse Source 
X-SVN-Rev: 27218
This commit is contained in:
Steven R. Loomis 2010-01-12 02:24:47 +00:00
parent 0783cab36c
commit 87e6f333bd
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/source/tools/icuinfo/Makefile.in
View File

@ -34,6 +34,8 @@ DEPS = $(OBJECTS:.o=.d)
# pass some information # pass some information
ICUINFO_OPTS=-i ../../data/out/build/$(ICUDATA_PLATFORM_NAME)
CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\" CPPFLAGS+= -DU_PLATFORM=\"@platform@\" -DU_BUILD=\"@build@\" -DU_HOST=\"@host@\" -DU_CC=\"@CC@\" -DU_CXX=\"@CXX@\"
# -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ " # -DENABLE_RELEASE=@ENABLE_RELEASE@ -DENABLE_DEBUG=@ENABLE_DEBUG@ "

10
icu4c/source/tools/icuinfo/icuinfo.cpp
View File

@ -39,7 +39,7 @@
static UOption options[]={ static UOption options[]={
/*0*/ UOPTION_HELP_H, /*0*/ UOPTION_HELP_H,
/*1*/ UOPTION_HELP_QUESTION_MARK, /*1*/ UOPTION_HELP_QUESTION_MARK,
/*2*/ UOPTION_DEF("interactive", 'i', UOPT_NO_ARG), /*2*/ UOPTION_ICUDATADIR,
/*3*/ UOPTION_VERBOSE, /*3*/ UOPTION_VERBOSE,
/*4*/ UOPTION_DEF("list-plugins", 'L', UOPT_NO_ARG), /*4*/ UOPTION_DEF("list-plugins", 'L', UOPT_NO_ARG),
/*5*/ UOPTION_DEF("milisecond-time", 'm', UOPT_NO_ARG), /*5*/ UOPTION_DEF("milisecond-time", 'm', UOPT_NO_ARG),
@ -297,8 +297,8 @@ void cmd_version(UBool noLoad)
printf("Cygwin: CYGWINMSVC\n"); printf("Cygwin: CYGWINMSVC\n");
#endif #endif
printf("ICUDATA: %s\n", U_ICUDATA_NAME); printf("ICUDATA: %s\n", U_ICUDATA_NAME);
printf("Data Directory: %s\n", u_getDataDirectory());
u_init(&status); u_init(&status);
printf("Data Directory: %s\n", u_getDataDirectory());
printf("ICU Initialization returned: %s\n", u_errorName(status)); printf("ICU Initialization returned: %s\n", u_errorName(status));
printf( "Default locale: %s\n", uloc_getDefault()); printf( "Default locale: %s\n", uloc_getDefault());
{ {
@ -678,8 +678,10 @@ main(int argc, char* argv[]) {
} }
if(options[2].doesOccur) { if(options[2].doesOccur) {
doInteractive(); u_setDataDirectory(options[2].value);
} else if(options[5].doesOccur) { }
if(options[5].doesOccur) {
cmd_millis(); cmd_millis();
didSomething=TRUE; didSomething=TRUE;
} else { } else {