diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-02-23 12:04:06 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-23 12:05:40 +0000 |
commit | caf607f20373df99e67f271ca0e9aaa7118838fb (patch) | |
tree | 8d9c2339a908eeb282c3108f186ffa3d06b90704 /clucene | |
parent | Add shl/LOADER/URELIB to make --without-sytem-libxml work on Mac OS X (diff) | |
download | core-caf607f20373df99e67f271ca0e9aaa7118838fb.tar.gz core-caf607f20373df99e67f271ca0e9aaa7118838fb.zip |
wcsdup not universally available on non-windows
Diffstat (limited to 'clucene')
-rw-r--r-- | clucene/configs/_clucene-config-LINUX.h | 112 | ||||
-rw-r--r-- | clucene/configs/_clucene-config-MSVC.h | 112 | ||||
-rw-r--r-- | clucene/configs/_clucene-config-generic.h | 2 | ||||
-rw-r--r-- | clucene/configs/clucene-config-MSVC.h | 148 | ||||
-rw-r--r-- | clucene/source/Makefile | 6 |
5 files changed, 378 insertions, 2 deletions
diff --git a/clucene/configs/_clucene-config-LINUX.h b/clucene/configs/_clucene-config-LINUX.h new file mode 100644 index 000000000000..e8871084abe4 --- /dev/null +++ b/clucene/configs/_clucene-config-LINUX.h @@ -0,0 +1,112 @@ +#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/_clucene-config.h. +* Generated automatically at end of cmake. +* These are internal definitions, and this file does not need to be distributed +*/ + +/* CMake will look for these functions: */ +/* #undef _CL_HAVE_FUNCTION__VSNWPRINTF */ +/* #undef _CL_HAVE_FUNCTION__SNWPRINTF */ +#define _CL_HAVE_FUNCTION_WCSCASECMP +#define _CL_HAVE_FUNCTION_WCSCAT 1 +#define _CL_HAVE_FUNCTION_WCSCHR 1 +#define _CL_HAVE_FUNCTION_WCSCMP 1 +#define _CL_HAVE_FUNCTION_WCSCPY 1 +#define _CL_HAVE_FUNCTION_WCSCSPN 1 +/* #undef _CL_HAVE_FUNCTION_WCSICMP */ +#define _CL_HAVE_FUNCTION_WCSLEN 1 +#define _CL_HAVE_FUNCTION_WCSNCMP 1 +#define _CL_HAVE_FUNCTION_WCSNCPY 1 +#define _CL_HAVE_FUNCTION_WCSSTR 1 +#define _CL_HAVE_FUNCTION_WCSTOD 1 +#define _CL_HAVE_FUNCTION_WCSDUP 1 +#define _CL_HAVE_FUNCTION_WCSTOLL 1 +/* #undef _CL_HAVE_FUNCTION_WCSUPR */ +#define _CL_HAVE_FUNCTION_GETTIMEOFDAY 1 +/* #undef _CL_HAVE_FUNCTION_MAPVIEWOFFILE */ + +/* #undef _CL_HAVE_FUNCTION_LLTOA */ +/* #undef _CL_HAVE_FUNCTION_LLTOW */ +#define _CL_HAVE_FUNCTION_PRINTF 1 +#define _CL_HAVE_FUNCTION_SNPRINTF 1 +#define _CL_HAVE_FUNCTION_MMAP 1 +/* #undef _CL_HAVE_FUNCTION_STRLWR */ +#define _CL_HAVE_FUNCTION_STRTOLL 1 +/* #undef _CL_HAVE_FUNCTION_STRUPR */ +/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */ +#define _CL_HAVE_FUNCTION_USLEEP 1 +/* #undef _CL_HAVE_FUNCTION_SLEEP */ + +#define CL_MAX_PATH 4096 +//this is the max filename... for now its just the same, +//but this could change, so we use a different name +#define CL_MAX_NAME CL_MAX_PATH +//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb. +//the above logic for CL_MAX_NAME should be correct enough to handle all file names +#define CL_MAX_DIR CL_MAX_PATH + +#define _O_RANDOM 0 +#define _O_BINARY 0 +#define _S_IREAD S_IREAD +#define _S_IWRITE S_IWRITE +#define _timeb timeb + +#define _ILONG(x) x ## L +#define _ILONGLONG(x) x ## LL + +#define fileStat stat64 +#define cl_stat_t stat64 +#define fileSize CL_NS(util)::Misc::filelength +#define fileSeek lseek64 +#define fileTell(fhandle) fileSeek(fhandle, 0, SEEK_CUR) +#define fileHandleStat fstat64 +#define _realpath realpath +#define _rename rename +#define _close close +#define _read read +#define _cl_open open +#define _write write +#define _snprintf snprintf +#define _mkdir(x) mkdir(x,0777) +#define _unlink unlink +#define _ftime ftime +#define SLEEPFUNCTION usleep + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* Does not support new float byte<->float conversions */ +/* #undef _CL_HAVE_NO_FLOAT_BYTE */ + +/* Define if recursive pthread mutexes are available */ +#define _CL_HAVE_PTHREAD_MUTEX_RECURSIVE 1 + +/** define if you would like to force clucene to use the internal +* character functions. +* Tests may display unpredictable behaviour if this is not defined. +*/ +#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS + #define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1 +#endif + +/** fix ansi for loop scope */ +#if 1==0 + #define for if (0); else for +#endif + + +/* Compiler oddities */ + +//not sure why, but cygwin reports _S_IREAD, but doesn't actually work... +//TODO: make this work properly (this bit shouldn't be necessary) +#ifdef __CYGWIN__ + #define _S_IREAD 0333 + #define _S_IWRITE 0333 +#endif + +#ifdef __BORLANDC__ //borland compiler + #define O_RANDOM 0 +#endif + +#endif diff --git a/clucene/configs/_clucene-config-MSVC.h b/clucene/configs/_clucene-config-MSVC.h new file mode 100644 index 000000000000..d97d8b7f24cb --- /dev/null +++ b/clucene/configs/_clucene-config-MSVC.h @@ -0,0 +1,112 @@ +#ifndef _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H
+#define _SRC_CLUCENE_INTERNAL_CLUCENE_CONFIG_H 1
+
+/* src/shared/CLucene/_clucene-config.h.
+* Generated automatically at end of cmake.
+* These are internal definitions, and this file does not need to be distributed
+*/
+
+/* CMake will look for these functions: */
+#define _CL_HAVE_FUNCTION__VSNWPRINTF
+#define _CL_HAVE_FUNCTION__SNWPRINTF
+/* #undef _CL_HAVE_FUNCTION_WCSCASECMP */
+#define _CL_HAVE_FUNCTION_WCSCAT 1
+#define _CL_HAVE_FUNCTION_WCSCHR 1
+#define _CL_HAVE_FUNCTION_WCSCMP 1
+#define _CL_HAVE_FUNCTION_WCSCPY 1
+#define _CL_HAVE_FUNCTION_WCSCSPN 1
+#define _CL_HAVE_FUNCTION_WCSICMP
+#define _CL_HAVE_FUNCTION_WCSLEN 1
+#define _CL_HAVE_FUNCTION_WCSNCMP 1
+#define _CL_HAVE_FUNCTION_WCSNCPY 1
+#define _CL_HAVE_FUNCTION_WCSSTR 1
+#define _CL_HAVE_FUNCTION_WCSTOD 1
+#define _CL_HAVE_FUNCTION_WCSDUP 1
+/* #undef _CL_HAVE_FUNCTION_WCSTOLL */
+#define _CL_HAVE_FUNCTION_WCSUPR 1
+/* #undef _CL_HAVE_FUNCTION_GETTIMEOFDAY */
+#define _CL_HAVE_FUNCTION_MAPVIEWOFFILE 1
+
+/* #undef _CL_HAVE_FUNCTION_LLTOA */
+/* #undef _CL_HAVE_FUNCTION_LLTOW */
+#define _CL_HAVE_FUNCTION_PRINTF 1
+/* #undef _CL_HAVE_FUNCTION_SNPRINTF */
+/* #undef _CL_HAVE_FUNCTION_MMAP */
+#define _CL_HAVE_FUNCTION_STRLWR 1
+/* #undef _CL_HAVE_FUNCTION_STRTOLL */
+#define _CL_HAVE_FUNCTION_STRUPR 1
+/* #undef _CL_HAVE_FUNCTION_GETPAGESIZE */
+/* #undef _CL_HAVE_FUNCTION_USLEEP */
+#define _CL_HAVE_FUNCTION_SLEEP 1
+
+#define CL_MAX_PATH 4096
+//this is the max filename... for now its just the same,
+//but this could change, so we use a different name
+#define CL_MAX_NAME CL_MAX_PATH
+//this used to be CL_MAX_NAME * 32, but as Alex Hudson points out, this could come to be 128kb.
+//the above logic for CL_MAX_NAME should be correct enough to handle all file names
+#define CL_MAX_DIR CL_MAX_PATH
+
+/* undef _O_RANDOM _O_RANDOM */
+/* undef _O_BINARY _O_BINARY */
+/* undef _S_IREAD _S_IREAD */
+/* undef _S_IWRITE _S_IWRITE */
+/* #undef _timeb */
+
+#define _ILONG(x) x ## L
+#define _ILONGLONG(x) x ## LL
+
+#define fileStat _stati64
+#define cl_stat_t _stati64
+#define fileSize _filelengthi64
+#define fileSeek _lseeki64
+#define fileTell _telli64
+#define fileHandleStat _fstati64
+#define _realpath(rel,abs) ::_fullpath(abs,rel,CL_MAX_PATH)
+#define _rename rename
+/* undef _close _close */
+/* undef _read _read */
+#define _cl_open _open
+/* undef _write _write */
+/* undef _snprintf _snprintf */
+/* undef _mkdir _mkdir */
+/* undef _unlink _unlink */
+/* undef _ftime _ftime */
+#define SLEEPFUNCTION Sleep
+
+/* CMake will determine these specifics. Things like bugs, etc */
+
+/* Does not support new float byte<->float conversions */
+/* #undef _CL_HAVE_NO_FLOAT_BYTE */
+
+/* Define if recursive pthread mutexes are available */
+/* #undef _CL_HAVE_PTHREAD_MUTEX_RECURSIVE */
+
+/** define if you would like to force clucene to use the internal
+* character functions.
+* Tests may display unpredictable behaviour if this is not defined.
+*/
+#ifndef LUCENE_USE_INTERNAL_CHAR_FUNCTIONS
+ #define LUCENE_USE_INTERNAL_CHAR_FUNCTIONS 1
+#endif
+
+/** fix ansi for loop scope */
+#if 1==0
+ #define for if (0); else for
+#endif
+
+
+/* Compiler oddities */
+
+//not sure why, but cygwin reports _S_IREAD, but doesn't actually work...
+//TODO: make this work properly (this bit shouldn't be necessary)
+#ifdef __CYGWIN__
+ #define _S_IREAD 0333
+ #define _S_IWRITE 0333
+#endif
+
+#ifdef __BORLANDC__ //borland compiler
+ #define O_RANDOM 0
+#endif
+
+#endif
diff --git a/clucene/configs/_clucene-config-generic.h b/clucene/configs/_clucene-config-generic.h index e8871084abe4..2666c32a94ed 100644 --- a/clucene/configs/_clucene-config-generic.h +++ b/clucene/configs/_clucene-config-generic.h @@ -21,7 +21,7 @@ #define _CL_HAVE_FUNCTION_WCSNCPY 1 #define _CL_HAVE_FUNCTION_WCSSTR 1 #define _CL_HAVE_FUNCTION_WCSTOD 1 -#define _CL_HAVE_FUNCTION_WCSDUP 1 +/* #undef _CL_HAVE_FUNCTION_WCSDUP 1 */ #define _CL_HAVE_FUNCTION_WCSTOLL 1 /* #undef _CL_HAVE_FUNCTION_WCSUPR */ #define _CL_HAVE_FUNCTION_GETTIMEOFDAY 1 diff --git a/clucene/configs/clucene-config-MSVC.h b/clucene/configs/clucene-config-MSVC.h new file mode 100644 index 000000000000..b12c20b1fafe --- /dev/null +++ b/clucene/configs/clucene-config-MSVC.h @@ -0,0 +1,148 @@ +#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H
+#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1
+
+/* src/shared/CLucene/clucene-config.h.
+* Generated automatically at end of cmake.
+*/
+
+/* CMake will look for these headers: */
+#define _CL_HAVE_STRING_H 1
+#define _CL_HAVE_MEMORY_H 1
+/* #undef _CL_HAVE_UNISTD_H */
+#define _CL_HAVE_IO_H 1
+#define _CL_HAVE_DIRECT_H 1
+/* #undef _CL_HAVE_DIRENT_H */
+/* #undef _CL_HAVE_SYS_DIR_H */
+/* #undef _CL_HAVE_SYS_NDIR_H */
+#define _CL_HAVE_ERRNO_H 1
+#define _CL_HAVE_WCHAR_H 1
+#define _CL_HAVE_WCTYPE_H
+#define _CL_HAVE_CTYPE_H 1
+#define _CL_HAVE_WINDOWS_H 1
+/* #undef _CL_HAVE_WINDEF_H */
+#define _CL_HAVE_SYS_TYPES_H 1
+/* #undef _CL_HAVE_DLFCN_H */
+/* #undef _CL_HAVE_EXT_HASH_MAP */
+/* #undef _CL_HAVE_EXT_HASH_SET */
+/* #undef _CL_HAVE_TR1_UNORDERED_MAP */
+/* #undef _CL_HAVE_TR1_UNORDERED_SET */
+/* #undef _CL_HAVE_HASH_MAP */
+/* #undef _CL_HAVE_HASH_SET */
+/* #undef _CL_HAVE_NDIR_H */
+#define _CL_HAVE_SYS_STAT_H 1
+#define _CL_HAVE_SYS_TIMEB_H 1
+/* #undef _CL_HAVE_SYS_TIME_H */
+#define _CL_HAVE_TCHAR_H 1
+/* #undef _CL_HAVE_SYS_MMAN_H */
+#define _CL_HAVE_WINERROR_H 1
+/* #undef _CL_HAVE_STDINT_H */
+
+// our needed types
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+
+typedef double float_t;
+typedef unsigned long _cl_dword_t;
+/* undef size_t size_t */
+
+/* tchar & _T definitions... */
+/* undef TCHAR TCHAR */
+/* #undef _T */
+
+/* CMake will determine these specifics. Things like bugs, etc */
+
+/* if we can't support the map/set hashing */
+/* #undef LUCENE_DISABLE_HASHING */
+
+/* Define if you have POSIX threads libraries and header files. */
+/* #undef _CL_HAVE_PTHREAD */
+
+/* Define if you have Win32 threads libraries and header files. */
+#define _CL_HAVE_WIN32_THREADS 1
+
+/* Define if we have gcc atomic functions */
+/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */
+
+/* Define what eval method is required for float_t to be defined (for GCC). */
+/* #undef _FLT_EVAL_METHOD */
+
+/* If we use hashmaps, which namespace do we use: */
+#define CL_NS_HASHING(func)
+/* If we use hashmaps, which classes do we use: */
+#define _CL_HASH_MAP
+#define _CL_HASH_SET
+
+/* define if the compiler implements namespaces */
+#define _CL_HAVE_NAMESPACES
+
+/* Defined if the snprintf overflow test fails */
+/* #undef _CL_HAVE_SNPRINTF_BUG */
+
+/* Defined if the swprintf test fails */
+/* #undef _CL_HAVE_SNWPRINTF_BUG */
+
+/* How to define a static const in a class */
+#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment
+
+/* Define to the necessary symbol if this constant uses a non-standard name on
+ your system. */
+//todo: not checked
+/* #undef _CL_PTHREAD_CREATE_JOINABLE */
+
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+//todo: not being checked for...
+/* #undef _CL_STAT_MACROS_BROKEN */
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+//not actually used for anything...
+/* #undef _CL_TIME_WITH_SYS_TIME */
+
+/* Define that we will be using -fvisibility=hidden, and
+ * make public classes visible using __attribute__ ((visibility("default")))
+ */
+/* #undef _CL_HAVE_GCCVISIBILITYPATCH */
+
+
+/* Versions, etc */
+
+/* Name of package */
+#define _CL_PACKAGE "clucene-core"
+
+/* Version number of package */
+#define _CL_VERSION "2.3.3.4"
+
+/* So-Version number of package */
+#define _CL_SOVERSION "1"
+
+/* A comparable version number */
+#define _CL_INT_VERSION 2030304
+
+/* Configured options (from command line) */
+
+/* Forces into Ascii mode */
+/* #undef _ASCII */
+
+/* Conditional Debugging */
+/* #undef _CL__CND_DEBUG */
+
+/* debuging option */
+/* #undef _DEBUG */
+
+/* Disable multithreading */
+/* #undef _CL_DISABLE_MULTITHREADING */
+
+
+#ifdef __BORLANDC__ //borland compiler
+ //todo: bcc incorrectly detects this... fix this in cmake
+ #undef LUCENE_STATIC_CONSTANT
+ #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment }
+#endif
+
+
+#endif
diff --git a/clucene/source/Makefile b/clucene/source/Makefile index b7467b9f4d89..a53a47ea6846 100644 --- a/clucene/source/Makefile +++ b/clucene/source/Makefile @@ -53,8 +53,12 @@ ifeq ($(COM),MSC) cp $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h src/shared/CLucene/_clucene-config.h cp $(SRCDIR)/clucene/configs/clucene-config-MSVC.h src/shared/CLucene/clucene-config.h else - cp $(SRCDIR)/clucene/configs/_clucene-config-generic.h src/shared/CLucene/_clucene-config.h cp $(SRCDIR)/clucene/configs/clucene-config-generic.h src/shared/CLucene/clucene-config.h +ifeq ($(OS),LINUX) + cp $(SRCDIR)/clucene/configs/_clucene-config-LINUX.h src/shared/CLucene/_clucene-config.h +else + cp $(SRCDIR)/clucene/configs/_clucene-config-generic.h src/shared/CLucene/_clucene-config.h +endif endif .DEFAULT_GOAL := all |