mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-10 07:39:16 +00:00
ICU-1247 Fix tests and test builds so that tests will run against installed libraries.
X-SVN-Rev: 5954
This commit is contained in:
Andy Heninger
parent
469b0444aa
commit
71f004be68
22 changed files with 85 additions and 58 deletions
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-aix,v 1.21 2001/08/10 20:49:59 aheninger Exp $
|
||||
## $Id: mh-aix,v 1.22 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -59,7 +59,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -brtl -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -brtl -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -brtl -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -brtl -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL= -brtl -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -brtl -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-aix-va,v 1.10 2001/04/23 23:12:28 rviswanadha Exp $
|
||||
## $Id: mh-aix-va,v 1.11 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -M $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -54,7 +54,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
## Link commands to link to ICU libs
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-alpha-linux-cc,v 1.2 2001/08/17 02:33:04 rviswanadha Exp $
|
||||
## $Id: mh-alpha-linux-cc,v 1.3 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
#GEN_DEPS.c= $(CC) $(DEFS) $(CPPFLAGS) -MD -c -msg_quiet
|
||||
|
|
@ -64,7 +64,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -call_shared -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -call_shared -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-alpha-linux-gcc,v 1.2 2001/08/17 02:33:04 rviswanadha Exp $
|
||||
## $Id: mh-alpha-linux-gcc,v 1.3 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -63,7 +63,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-bsd-gcc,v 1.2 2001/09/06 01:06:36 grhoten-oss Exp $
|
||||
## $Id: mh-bsd-gcc,v 1.3 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -59,7 +59,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 2001, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-cygwin,v 1.1 2001/06/01 10:01:09 yves Exp $
|
||||
## $Id: mh-cygwin,v 1.2 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -62,7 +62,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
## Link commands to link to ICU libs
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-darwin,v 1.16 2000/11/02 22:49:10 yves Exp $
|
||||
## $Id: mh-darwin,v 1.17 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -dynamic
|
||||
|
|
@ -56,7 +56,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
## Link commands to link to ICU libs
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-hpux-acc,v 1.23 2001/08/10 20:49:59 aheninger Exp $
|
||||
## $Id: mh-hpux-acc,v 1.24 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= :
|
||||
|
|
@ -57,7 +57,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-hpux-cc,v 1.26 2001/08/31 20:24:05 grhoten-oss Exp $
|
||||
## $Id: mh-hpux-cc,v 1.27 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
|
||||
## This causes source/tools/pkgdata generated makefiles to create and link
|
||||
|
|
@ -64,7 +64,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-irix,v 1.17 2000/11/29 16:25:25 srl Exp $
|
||||
## $Id: mh-irix,v 1.18 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -shared
|
||||
|
|
@ -62,7 +62,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
## Link commands to link to ICU libs
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-linux,v 1.26 2001/09/21 03:41:20 yves-oss Exp $
|
||||
## $Id: mh-linux,v 1.27 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -63,7 +63,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -l$(ICUPREFIX)data
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc$(ICULIBSUFFIX) $(LIBICUDT) -Wl,-rpath-link $(top_builddir)/data
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n$(ICULIBSUFFIX)
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw$(ICULIBSUFFIX)
|
||||
LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil$(ICULIBSUFFIX)
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio$(ICULIBSUFFIX)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-ptx,v 1.14 2000/10/16 18:05:34 yves Exp $
|
||||
## $Id: mh-ptx,v 1.15 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -KPIC
|
||||
|
|
@ -56,7 +56,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
## Link commands to link to ICU libs
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-solaris,v 1.22 2001/08/10 20:49:59 aheninger Exp $
|
||||
## $Id: mh-solaris,v 1.23 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -KPIC
|
||||
|
|
@ -61,7 +61,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -licudata
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-solaris-gcc,v 1.21 2001/08/22 17:26:47 grhoten-oss Exp $
|
||||
## $Id: mh-solaris-gcc,v 1.22 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Flags for position independent code
|
||||
SHAREDLIBCFLAGS = -fPIC
|
||||
|
|
@ -63,7 +63,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -licudata
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL= -L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
## Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
## others. All Rights Reserved.
|
||||
##
|
||||
## $Id: mh-solaris-sparcv9,v 1.18 2001/08/21 00:19:05 grhoten-oss Exp $
|
||||
## $Id: mh-solaris-sparcv9,v 1.19 2001/09/28 00:31:53 aheninger-oss Exp $
|
||||
|
||||
## Commands to generate dependency files
|
||||
GEN_DEPS.c= $(CC) -xtarget=ultra -xarch=v9 -xM $(DEFS) $(CPPFLAGS)
|
||||
|
|
@ -55,7 +55,7 @@ INSTALL-L = $(INSTALL_DATA)
|
|||
LIBICUDT= -L$(top_builddir)/data -L$(top_builddir)/stubdata -licudata
|
||||
LIBICUUC= -L$(top_builddir)/common -l$(ICUPREFIX)uc $(LIBICUDT)
|
||||
LIBICUI18N= -L$(top_builddir)/i18n -l$(ICUPREFIX)i18n
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw
|
||||
LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -l$(ICUPREFIX)ctestfw
|
||||
LIBICUTOOLUTIL=-L$(top_builddir)/tools/toolutil -l$(ICUPREFIX)toolutil
|
||||
LIBUSTDIO= -L$(top_builddir)/extra/ustdio -lustdio
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,11 @@ endif
|
|||
|
||||
DEFS = @DEFS@
|
||||
|
||||
DATADIR := $(shell pwd)/../../../data
|
||||
|
||||
# we define ICU_UNICODE_VERSION so we can test it
|
||||
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/ctestfw -I$(top_srcdir)/tools/toolutil \
|
||||
-DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_NAME)\" -DU_SRCDATADIR=\"$(top_srcdir)/../data/\"
|
||||
-DICU_UNICODE_VERSION=\"$(UNICODE_VERSION)\" -DICU_VERSION=\"@VERSION@\" -DICUDATA_NAME=\"$(ICUDATA_NAME)\" -DU_SRCDATADIR=\"$(DATADIR)/\"
|
||||
CFLAGS = @CFLAGS@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
ENABLE_RPATH = @ENABLE_RPATH@
|
||||
|
|
|
|||
|
|
@ -1304,14 +1304,9 @@ static FileStream * getFractionalUCA(void)
|
|||
uprv_strcat(newPath, "unidata" U_FILE_SEP_STRING );
|
||||
uprv_strcat(newPath, "FractionalUCA.txt");
|
||||
|
||||
#if defined (U_SRCDATADIR) /* points to the icu/data directory */
|
||||
/* If defined, we'll try an alternate directory second */
|
||||
uprv_strcpy(backupPath, U_SRCDATADIR);
|
||||
#else
|
||||
uprv_strcpy(backupPath, u_getDataDirectory());
|
||||
uprv_strcat(backupPath, ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data");
|
||||
uprv_strcat(backupPath, U_FILE_SEP_STRING);
|
||||
#endif
|
||||
uprv_strcat(backupPath, "unidata" U_FILE_SEP_STRING );
|
||||
uprv_strcat(backupPath, "FractionalUCA.txt");
|
||||
|
||||
|
|
|
|||
|
|
@ -589,14 +589,9 @@ static void TestUnicodeData()
|
|||
strcpy(newPath, u_getDataDirectory());
|
||||
strcat(newPath, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
|
||||
|
||||
#if defined (U_SRCDATADIR) /* points to the icu/data directory */
|
||||
/* If defined, we'll try an alternate directory second */
|
||||
strcpy(backupPath, U_SRCDATADIR);
|
||||
#else
|
||||
strcpy(backupPath, u_getDataDirectory());
|
||||
strcat(backupPath, ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data");
|
||||
strcat(backupPath, U_FILE_SEP_STRING);
|
||||
#endif
|
||||
strcat(backupPath, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
|
||||
|
||||
u_versionFromString(expectVersionArray, U_UNICODE_VERSION);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@ CLEANFILES = *~ $(DEPS)
|
|||
TARGET = intltest
|
||||
|
||||
DEFS = @DEFS@
|
||||
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_SRCDATADIR=$(MACRO_SEPARATOR)"$(top_srcdir)/../data/"'
|
||||
DATADIR := $(shell pwd)/../../../data
|
||||
CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/common -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -D'U_SRCDATADIR=$(MACRO_SEPARATOR)"$(DATADIR)/"'
|
||||
CFLAGS = @CFLAGS@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
LDFLAGS = @LDFLAGS@ \
|
||||
|
|
|
|||
|
|
@ -58,14 +58,9 @@ void NormalizerConformanceTest::TestConformance(void) {
|
|||
strcat(newPath, "unidata" U_FILE_SEP_STRING );
|
||||
strcat(newPath, TEST_SUITE_FILE);
|
||||
|
||||
#if defined (U_SRCDATADIR) /* points to the icu/data directory */
|
||||
/* If defined, we'll try an alternate directory second */
|
||||
strcpy(backupPath, U_SRCDATADIR);
|
||||
#else
|
||||
strcpy(backupPath, u_getDataDirectory());
|
||||
strcat(backupPath, ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data");
|
||||
strcat(backupPath, U_FILE_SEP_STRING);
|
||||
#endif
|
||||
strcat(backupPath, "unidata" U_FILE_SEP_STRING );
|
||||
strcat(backupPath, TEST_SUITE_FILE);
|
||||
|
||||
|
|
|
|||
|
|
@ -476,14 +476,9 @@ void UnicodeTest::TestUnicodeData()
|
|||
strcpy(newPath, u_getDataDirectory());
|
||||
strcat(newPath, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
|
||||
|
||||
#if defined (U_SRCDATADIR) /* points to the icu/data directory */
|
||||
/* If defined, we'll try an alternate directory second */
|
||||
strcpy(backupPath, U_SRCDATADIR);
|
||||
#else
|
||||
strcpy(backupPath, u_getDataDirectory());
|
||||
strcat(backupPath, ".." U_FILE_SEP_STRING ".." U_FILE_SEP_STRING "data");
|
||||
strcat(backupPath, U_FILE_SEP_STRING);
|
||||
#endif
|
||||
strcat(backupPath, "unidata" U_FILE_SEP_STRING "UnicodeData.txt");
|
||||
|
||||
errorCode=U_ZERO_ERROR;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
## others. All Rights Reserved.
|
||||
## Stephen F. Booth
|
||||
|
||||
SO_TARGET_VERSION = @LIB_VERSION@
|
||||
SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
|
||||
|
||||
## Source directory information
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
|
|
@ -21,7 +24,26 @@ subdir = tools/ctestfw
|
|||
CLEANFILES = *~ $(DEPS)
|
||||
|
||||
## Target information
|
||||
TARGET = libctestfw.$(SO)
|
||||
#TARGET = libctestfw.$(SO)
|
||||
|
||||
ENABLE_STATIC = @ENABLE_STATIC@
|
||||
ENABLE_SHARED = @ENABLE_SHARED@
|
||||
|
||||
ifneq ($(ENABLE_STATIC),)
|
||||
TARGET = $(LIBICU)ctestfw$(ICULIBSUFFIX).a
|
||||
RANLIB = @RANLIB@
|
||||
endif
|
||||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
SO_TARGET = $(LIBICU)ctestfw$(ICULIBSUFFIX).$(SO)
|
||||
ALL_SO_TARGETS = $(SO_TARGET) $(MIDDLE_SO_TARGET) $(FINAL_SO_TARGET)
|
||||
endif
|
||||
|
||||
ALL_TARGETS = $(TARGET) $(ALL_SO_TARGETS)
|
||||
|
||||
DYNAMICCPPFLAGS = $(SHAREDLIBCPPFLAGS)
|
||||
DYNAMICCFLAGS = $(SHAREDLIBCFLAGS)
|
||||
DYNAMICCXXFLAGS = $(SHAREDLIBCXXFLAGS)
|
||||
|
||||
DEFS = @DEFS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
|
|
@ -32,6 +54,8 @@ LIBS = @LIBS@
|
|||
|
||||
OBJECTS = ctest.o
|
||||
|
||||
STATIC_OBJECTS = $(OBJECTS:.o=.$(STATIC_O))
|
||||
|
||||
DEPS = $(OBJECTS:.o=.d)
|
||||
|
||||
## List of phony targets
|
||||
|
|
@ -49,15 +73,28 @@ distclean : distclean-local
|
|||
dist: dist-local
|
||||
check: all check-local
|
||||
|
||||
all-local: $(TARGET)
|
||||
all-local: $(ALL_TARGETS)
|
||||
|
||||
install-local: all-local
|
||||
install-local: install-library
|
||||
|
||||
install-library: all-local
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(libdir)
|
||||
ifneq ($(ENABLE_STATIC),)
|
||||
$(INSTALL-L) $(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
|
||||
endif
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
$(INSTALL-L) $(FINAL_SO_TARGET) $(DESTDIR)$(libdir)/$(FINAL_SO_TARGET)
|
||||
ifneq ($(FINAL_SO_TARGET),$(SO_TARGET))
|
||||
cd $(DESTDIR)$(libdir) && $(RM) $(MIDDLE_SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(MIDDLE_SO_TARGET)
|
||||
cd $(DESTDIR)$(libdir) && $(RM) $(SO_TARGET) && ln -s $(FINAL_SO_TARGET) $(SO_TARGET)
|
||||
endif
|
||||
endif
|
||||
|
||||
dist-local:
|
||||
|
||||
clean-local:
|
||||
test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
|
||||
$(RMV) $(OBJECTS) $(TARGET)
|
||||
$(RMV) $(OBJECTS) $(STATIC_OBJECTS) $(ALL_TARGETS)
|
||||
|
||||
distclean-local: clean-local
|
||||
$(RMV) Makefile
|
||||
|
|
@ -68,8 +105,15 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
$(TARGET) : $(OBJECTS)
|
||||
$(SHLIB.c) -o $@ $^ $(LIBS)
|
||||
ifneq ($(ENABLE_STATIC),)
|
||||
$(TARGET): $(TARGET)($(STATIC_OBJECTS))
|
||||
$(RANLIB) $@
|
||||
endif
|
||||
|
||||
ifneq ($(ENABLE_SHARED),)
|
||||
$(FINAL_SO_TARGET): $(OBJECTS)
|
||||
$(SHLIB.cc) $(LD_SONAME) -o $@ $^ $(LIBS)
|
||||
endif
|
||||
|
||||
ifeq (,$(MAKECMDGOALS))
|
||||
-include $(DEPS)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue