diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 7d401a9802..8010b8355a 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -720,6 +720,7 @@ CLEAN : GODATA -@erase "*.brk" -@erase "*.res" -@erase "*.txt" + -@erase "*.dict" @cd "$(ICUBLD_PKG)\$(ICUCOL)" -@erase "*.res" -@erase "*.txt" diff --git a/icu4c/source/tools/gendict/gendict.cpp b/icu4c/source/tools/gendict/gendict.cpp index 3d297f5e49..7c42906862 100644 --- a/icu4c/source/tools/gendict/gendict.cpp +++ b/icu4c/source/tools/gendict/gendict.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (C) 2002-2013, International Business Machines +* Copyright (C) 2002-2014, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * @@ -43,42 +43,6 @@ static int elapsedTime() { return (int)uprv_floor((uprv_getRawUTCtime()-startTime)/1000.0); } -#if U_PLATFORM_IMPLEMENTS_POSIX && !U_PLATFORM_HAS_WIN32_API - -#include -#include - -const char *wToolname="gendict"; -const char *wOutname="(some file)"; - -const int firstSeconds = 5; /* seconds between notices*/ -const int nextSeconds = 15; /* seconds between notices*/ - -static void alarm_fn(int /*n*/) { - printf("%s: still writing\t%s (%ds)\t...\n", wToolname, wOutname, elapsedTime()); - - signal(SIGALRM, &alarm_fn); - alarm(nextSeconds); // reset the alarm -} - -static void install_watchdog(const char *toolName, const char *outFileName) { - wToolname=toolName; - wOutname=outFileName; - - signal(SIGALRM, &alarm_fn); - - alarm(firstSeconds); // set the alarm -} - -#else -static void install_watchdog(const char*, const char*) { - // not implemented -} -#endif - - - - U_NAMESPACE_USE static char *progName; @@ -300,10 +264,8 @@ int main(int argc, char **argv) { const char *wordFileName = argv[1]; startTime = uprv_getRawUTCtime(); // initialize start timer - // set up the watchdog - install_watchdog(progName, outFileName); - if (options[ARG_ICUDATADIR].doesOccur) { + if (options[ARG_ICUDATADIR].doesOccur) { u_setDataDirectory(options[ARG_ICUDATADIR].value); }