From 4b7a911aad26a319845672e874c5c76b81cb3bd5 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 29 Sep 2006 11:02:41 +0000 Subject: [PATCH] Add SED to the 3rd party dependencies build script for Microsoft Visual Studio. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3517 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/win32/External-msvc | 1 + bacula/src/win32/build-depkgs-msvc.cmd | 18 + bacula/src/win32/patches/sed_msc.patch | 927 ++++++++++++++++++ bacula/src/win32/tools/dbcheck/dbcheck.vcproj | 2 +- 4 files changed, 947 insertions(+), 1 deletion(-) create mode 100644 bacula/src/win32/patches/sed_msc.patch diff --git a/bacula/src/win32/External-msvc b/bacula/src/win32/External-msvc index 5a10b3daba..62702a82fb 100644 --- a/bacula/src/win32/External-msvc +++ b/bacula/src/win32/External-msvc @@ -30,3 +30,4 @@ WX|http://superb-west.dl.sourceforge.net/sourceforge/wxwindows/wxWidgets-2.7.0.z NSIS_BIN|http://superb-west.dl.sourceforge.net/sourceforge/nsis/nsis-2.17.zip MTX|http://superb-west.dl.sourceforge.net/sourceforge/mtx/mtx-1.3.9.tar.gz MT|ftp://ftp.ibiblio.org/pub/linux/system/backup/mt-st-0.9b.tar.gz +SED|ftp://mirrors.kernel.org/gnu/sed/sed-4.1.5.tar.gz diff --git a/bacula/src/win32/build-depkgs-msvc.cmd b/bacula/src/win32/build-depkgs-msvc.cmd index 003e2c7bbb..778301a35f 100644 --- a/bacula/src/win32/build-depkgs-msvc.cmd +++ b/bacula/src/win32/build-depkgs-msvc.cmd @@ -70,6 +70,7 @@ REM CALL :process_scons CALL :process_nsis CALL :process_mtx CALL :process_mt + CALL :process_sed GOTO :EOF :ProcessArgs @@ -315,6 +316,23 @@ REM find . -name makefile.gcc -exec sh -c "sed -f %SCRIPT_DIR%/patches/wx.sed {% ECHO Unable to download mt source from %URL_MT% EXIT /B 1 +:process_sed + CALL :get_source %URL_SED% %DIR_SED% %MKD_SED% + IF ERRORLEVEL 2 GOTO :sed_error + IF ERRORLEVEL 1 GOTO :sed_skip_patch + ECHO Patching sed + COPY /Y nul patch.log + CALL :do_patch sed_msc.patch +:sed_skip_patch + ECHO Building sed + CALL :do_nmake Makefile.msc all + ECHO Installing sed + CALL :do_nmake Makefile.msc install + EXIT /B 0 +:sed_error + ECHO Unable to download sed source from %URL_MT% + EXIT /B 1 + :do_patch SET PATCH_FILE=%SCRIPT_DIR%\patches\%1 SHIFT diff --git a/bacula/src/win32/patches/sed_msc.patch b/bacula/src/win32/patches/sed_msc.patch new file mode 100644 index 0000000000..b347e25044 --- /dev/null +++ b/bacula/src/win32/patches/sed_msc.patch @@ -0,0 +1,927 @@ +diff -Nru ../release/sed-4.1.5/config_h.msc ./config_h.msc +--- ../release/sed-4.1.5/config_h.msc 1969-12-31 16:00:00.000000000 -0800 ++++ ./config_h.msc 2006-09-28 19:34:18.620414300 -0700 +@@ -0,0 +1,387 @@ ++/* config_h.in. Generated from configure.ac by autoheader. */ ++/* config_h.msc. Modified for Microsoft Visual Studio. */ ++ ++#define O_CREAT _O_CREAT ++#define O_EXCL _O_EXCL ++#define O_RDWR _O_RDWR ++ ++#define popen _popen ++#define pclose _pclose ++#define alloca _alloca ++#define strcasecmp stricmp ++ ++#define S_ISREG(x) (((x) & _S_IFMT) == _S_IFREG) ++ ++#define HAVE_FCNTL_H 1 ++ ++/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP ++ systems. This function is required for `alloca.c' support on those systems. ++ */ ++#undef CRAY_STACKSEG_END ++ ++/* Define to 1 if using `alloca.c'. */ ++#undef C_ALLOCA ++ ++/* Define to 1 if translation of program messages to the user's native ++ language is requested. */ ++#undef ENABLE_NLS ++ ++/* Define to 1 if you have `alloca', as a function or macro. */ ++#define HAVE_ALLOCA 1 ++ ++/* Define to 1 if you have and it should be used (not on Ultrix). ++ */ ++#undef HAVE_ALLOCA_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_ARGZ_H ++ ++/* Define to 1 if you have the `bcopy' function. */ ++#undef HAVE_BCOPY ++ ++/* Define to 1 if you have the `btowc' function. */ ++#undef HAVE_BTOWC ++ ++/* Define to 1 if you have the `bzero' function. */ ++#undef HAVE_BZERO ++ ++/* Define if the GNU dcgettext() function is already present or preinstalled. ++ */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#define HAVE_DIRENT_H 1 ++ ++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ ++#undef HAVE_DOPRNT ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_ERRNO_H 1 ++ ++/* Define to 1 if you have the `fchmod' function. */ ++#undef HAVE_FCHMOD ++ ++/* Define to 1 if you have the `fchown' function. */ ++#undef HAVE_FCHOWN ++ ++/* Define to 1 if you have the `feof_unlocked' function. */ ++#undef HAVE_FEOF_UNLOCKED ++ ++/* Define to 1 if you have the `fgets_unlocked' function. */ ++#undef HAVE_FGETS_UNLOCKED ++ ++/* Define to 1 if you have the `getcwd' function. */ ++#define HAVE_GETCWD 1 ++ ++/* Define to 1 if you have the `getc_unlocked' function. */ ++#undef HAVE_GETC_UNLOCKED ++ ++/* Define to 1 if you have the `getegid' function. */ ++#undef HAVE_GETEGID ++ ++/* Define to 1 if you have the `geteuid' function. */ ++#undef HAVE_GETEUID ++ ++/* Define to 1 if you have the `getgid' function. */ ++#undef HAVE_GETGID ++ ++/* Define to 1 if you have the `getpagesize' function. */ ++#undef HAVE_GETPAGESIZE ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the `getuid' function. */ ++#undef HAVE_GETUID ++ ++/* Define if you have the iconv() function. */ ++#undef HAVE_ICONV ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_IO_H 1 ++ ++/* Define to 1 if you have the `isascii' function. */ ++#define HAVE_ISASCII 1 ++ ++/* Define to 1 if you have the `isatty' function. */ ++#undef HAVE_ISATTY ++ ++/* Define to 1 if you have the `isblank' function. */ ++#undef HAVE_ISBLANK ++ ++/* Define if you have and nl_langinfo(CODESET). */ ++#undef HAVE_LANGINFO_CODESET ++ ++/* Define if your file defines LC_MESSAGES. */ ++#define HAVE_LC_MESSAGES 1 ++ ++/* Define to 1 if you have the `regex' library (-lregex). */ ++#undef HAVE_LIBREGEX ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_LIMITS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you support file names longer than 14 characters. */ ++#define HAVE_LONG_FILE_NAMES 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MALLOC_H 1 ++ ++/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ ++#undef HAVE_MBRTOWC ++ ++/* Define to 1 if declares mbstate_t. */ ++#undef HAVE_MBSTATE_T ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MCHECK_H ++ ++/* Define to 1 if you have the `memchr' function. */ ++#define HAVE_MEMCHR 1 ++ ++/* Define to 1 if you have the `memcmp' function. */ ++#define HAVE_MEMCMP 1 ++ ++/* Define to 1 if you have the `memcpy' function. */ ++#define HAVE_MEMCPY 1 ++ ++/* Define to 1 if you have the `memmove' function. */ ++#define HAVE_MEMMOVE 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mempcpy' function. */ ++#undef HAVE_MEMPCPY ++ ++/* Define to 1 if you have the `memset' function. */ ++#define HAVE_MEMSET 1 ++ ++/* Define to 1 if you have the `mkstemp' function. */ ++#undef HAVE_MKSTEMP ++ ++/* Define to 1 if you have a working `mmap' system call. */ ++#undef HAVE_MMAP ++ ++/* Define to 1 if you have the `munmap' function. */ ++#undef HAVE_MUNMAP ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NL_TYPES_H ++ ++/* Define to 1 if libc includes obstacks. */ ++#undef HAVE_OBSTACK ++ ++/* Define to 1 if you have the `pathconf' function. */ ++#undef HAVE_PATHCONF ++ ++/* Define to 1 if you have the `popen' function. */ ++#define HAVE_POPEN 1 ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_REGEX_H ++ ++/* Define to 1 if you have the `setenv' function. */ ++#define HAVE_SETENV 1 ++ ++/* Define to 1 if you have the `setlocale' function. */ ++#undef HAVE_SETLOCALE ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDARG_H 1 ++ ++/* Define to 1 if stdbool.h conforms to C99. */ ++#undef HAVE_STDBOOL_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDDEF_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the `stpcpy' function. */ ++#undef HAVE_STPCPY ++ ++/* Define to 1 if you have the `strcasecmp' function. */ ++#undef HAVE_STRCASECMP ++ ++/* Define to 1 if you have the `strchr' function. */ ++#define HAVE_STRCHR 1 ++ ++/* Define to 1 if you have the `strdup' function. */ ++#define HAVE_STRDUP 1 ++ ++/* Define to 1 if you have the `strerror' function. */ ++#define HAVE_STRERROR 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the `strtoul' function. */ ++#define HAVE_STRTOUL 1 ++ ++/* Define to 1 if you have the `strverscmp' function. */ ++#undef HAVE_STRVERSCMP ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#define HAVE_SYS_DIR_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_FILE_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#define HAVE_SYS_NDIR_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_PARAM_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the `tsearch' function. */ ++#define HAVE_TSEARCH 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `vprintf' function. */ ++#define HAVE_VPRINTF 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_WCHAR_H ++ ++/* Define to 1 if you have the `wcrtomb' function. */ ++#undef HAVE_WCRTOMB ++ ++/* Define to 1 if you have the `wcscoll' function. */ ++#undef HAVE_WCSCOLL ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_WCTYPE_H ++ ++/* Define to 1 if the system has the type `_Bool'. */ ++#undef HAVE__BOOL ++ ++/* Define to 1 if you have the `__argz_count' function. */ ++#undef HAVE___ARGZ_COUNT ++ ++/* Define to 1 if you have the `__argz_next' function. */ ++#undef HAVE___ARGZ_NEXT ++ ++/* Define to 1 if you have the `__argz_stringify' function. */ ++#undef HAVE___ARGZ_STRINGIFY ++ ++/* Define as const if the declaration of iconv() needs const. */ ++#undef ICONV_CONST ++ ++/* Name of package */ ++#define PACKAGE "sed" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to the version of GNU sed whose features are supported by this sed. ++ */ ++#define SED_FEATURE_VERSION "5.1" ++ ++/* If using the C implementation of alloca, define if you know the ++ direction of stack growth for your system; otherwise it will be ++ automatically deduced at run-time. ++ STACK_DIRECTION > 0 => grows toward higher addresses ++ STACK_DIRECTION < 0 => grows toward lower addresses ++ STACK_DIRECTION = 0 => direction of growth unknown */ ++#undef STACK_DIRECTION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Version number of package */ ++#define VERSION "4.1.5" ++ ++/* Define to 1 if on AIX 3. ++ System headers sometimes define this. ++ We just want to avoid a redefinition error message. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ ++/* Define to 1 if on MINIX. */ ++#undef _MINIX ++ ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++#undef _POSIX_1_SOURCE ++ ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++#undef _POSIX_SOURCE ++ ++/* Include BSD functions in regex, used by the testsuite */ ++#undef _REGEX_RE_COMP ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++#define inline __inline ++#endif ++ ++/* Define to a type if does not define. */ ++#define mbstate_t int ++ ++/* Define to `long' if does not define. */ ++#undef off_t ++ ++/* Define to `unsigned' if does not define. */ ++#undef size_t ++ ++/* Define to `int' if does not define. */ ++#undef ssize_t +diff -Nru ../release/sed-4.1.5/config_h.msc~ ./config_h.msc~ +--- ../release/sed-4.1.5/config_h.msc~ 1969-12-31 16:00:00.000000000 -0800 ++++ ./config_h.msc~ 2006-09-28 13:56:59.922178500 -0700 +@@ -0,0 +1,386 @@ ++/* config_h.in. Generated from configure.ac by autoheader. */ ++ ++#define O_CREAT _O_CREAT ++#define O_EXCL _O_EXCL ++#define O_RDWR _O_RDWR ++ ++#define popen _popen ++#define pclose _pclose ++#define alloca _alloca ++#define strcasecmp stricmp ++ ++#define S_ISREG(x) (((x) & _S_IFMT) == _S_IFREG) ++ ++#define HAVE_FCNTL_H 1 ++ ++/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP ++ systems. This function is required for `alloca.c' support on those systems. ++ */ ++#undef CRAY_STACKSEG_END ++ ++/* Define to 1 if using `alloca.c'. */ ++#undef C_ALLOCA ++ ++/* Define to 1 if translation of program messages to the user's native ++ language is requested. */ ++#undef ENABLE_NLS ++ ++/* Define to 1 if you have `alloca', as a function or macro. */ ++#define HAVE_ALLOCA 1 ++ ++/* Define to 1 if you have and it should be used (not on Ultrix). ++ */ ++#undef HAVE_ALLOCA_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_ARGZ_H ++ ++/* Define to 1 if you have the `bcopy' function. */ ++#undef HAVE_BCOPY ++ ++/* Define to 1 if you have the `btowc' function. */ ++#undef HAVE_BTOWC ++ ++/* Define to 1 if you have the `bzero' function. */ ++#undef HAVE_BZERO ++ ++/* Define if the GNU dcgettext() function is already present or preinstalled. ++ */ ++#undef HAVE_DCGETTEXT ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#define HAVE_DIRENT_H 1 ++ ++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ ++#undef HAVE_DOPRNT ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_ERRNO_H 1 ++ ++/* Define to 1 if you have the `fchmod' function. */ ++#undef HAVE_FCHMOD ++ ++/* Define to 1 if you have the `fchown' function. */ ++#undef HAVE_FCHOWN ++ ++/* Define to 1 if you have the `feof_unlocked' function. */ ++#undef HAVE_FEOF_UNLOCKED ++ ++/* Define to 1 if you have the `fgets_unlocked' function. */ ++#undef HAVE_FGETS_UNLOCKED ++ ++/* Define to 1 if you have the `getcwd' function. */ ++#define HAVE_GETCWD 1 ++ ++/* Define to 1 if you have the `getc_unlocked' function. */ ++#undef HAVE_GETC_UNLOCKED ++ ++/* Define to 1 if you have the `getegid' function. */ ++#undef HAVE_GETEGID ++ ++/* Define to 1 if you have the `geteuid' function. */ ++#undef HAVE_GETEUID ++ ++/* Define to 1 if you have the `getgid' function. */ ++#undef HAVE_GETGID ++ ++/* Define to 1 if you have the `getpagesize' function. */ ++#undef HAVE_GETPAGESIZE ++ ++/* Define if the GNU gettext() function is already present or preinstalled. */ ++#undef HAVE_GETTEXT ++ ++/* Define to 1 if you have the `getuid' function. */ ++#undef HAVE_GETUID ++ ++/* Define if you have the iconv() function. */ ++#undef HAVE_ICONV ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_IO_H 1 ++ ++/* Define to 1 if you have the `isascii' function. */ ++#define HAVE_ISASCII 1 ++ ++/* Define to 1 if you have the `isatty' function. */ ++#undef HAVE_ISATTY ++ ++/* Define to 1 if you have the `isblank' function. */ ++#undef HAVE_ISBLANK ++ ++/* Define if you have and nl_langinfo(CODESET). */ ++#undef HAVE_LANGINFO_CODESET ++ ++/* Define if your file defines LC_MESSAGES. */ ++#define HAVE_LC_MESSAGES 1 ++ ++/* Define to 1 if you have the `regex' library (-lregex). */ ++#undef HAVE_LIBREGEX ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_LIMITS_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_LOCALE_H ++ ++/* Define to 1 if you support file names longer than 14 characters. */ ++#define HAVE_LONG_FILE_NAMES 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MALLOC_H 1 ++ ++/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ ++#undef HAVE_MBRTOWC ++ ++/* Define to 1 if declares mbstate_t. */ ++#undef HAVE_MBSTATE_T ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_MCHECK_H ++ ++/* Define to 1 if you have the `memchr' function. */ ++#define HAVE_MEMCHR 1 ++ ++/* Define to 1 if you have the `memcmp' function. */ ++#define HAVE_MEMCMP 1 ++ ++/* Define to 1 if you have the `memcpy' function. */ ++#define HAVE_MEMCPY 1 ++ ++/* Define to 1 if you have the `memmove' function. */ ++#define HAVE_MEMMOVE 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mempcpy' function. */ ++#undef HAVE_MEMPCPY ++ ++/* Define to 1 if you have the `memset' function. */ ++#define HAVE_MEMSET 1 ++ ++/* Define to 1 if you have the `mkstemp' function. */ ++#undef HAVE_MKSTEMP ++ ++/* Define to 1 if you have a working `mmap' system call. */ ++#undef HAVE_MMAP ++ ++/* Define to 1 if you have the `munmap' function. */ ++#undef HAVE_MUNMAP ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_NL_TYPES_H ++ ++/* Define to 1 if libc includes obstacks. */ ++#undef HAVE_OBSTACK ++ ++/* Define to 1 if you have the `pathconf' function. */ ++#undef HAVE_PATHCONF ++ ++/* Define to 1 if you have the `popen' function. */ ++#define HAVE_POPEN 1 ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_REGEX_H ++ ++/* Define to 1 if you have the `setenv' function. */ ++#define HAVE_SETENV 1 ++ ++/* Define to 1 if you have the `setlocale' function. */ ++#undef HAVE_SETLOCALE ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDARG_H 1 ++ ++/* Define to 1 if stdbool.h conforms to C99. */ ++#undef HAVE_STDBOOL_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDDEF_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STDINT_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the `stpcpy' function. */ ++#undef HAVE_STPCPY ++ ++/* Define to 1 if you have the `strcasecmp' function. */ ++#undef HAVE_STRCASECMP ++ ++/* Define to 1 if you have the `strchr' function. */ ++#define HAVE_STRCHR 1 ++ ++/* Define to 1 if you have the `strdup' function. */ ++#define HAVE_STRDUP 1 ++ ++/* Define to 1 if you have the `strerror' function. */ ++#define HAVE_STRERROR 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the `strtoul' function. */ ++#define HAVE_STRTOUL 1 ++ ++/* Define to 1 if you have the `strverscmp' function. */ ++#undef HAVE_STRVERSCMP ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#define HAVE_SYS_DIR_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_SYS_FILE_H ++ ++/* Define to 1 if you have the header file, and it defines `DIR'. ++ */ ++#define HAVE_SYS_NDIR_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_PARAM_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the `tsearch' function. */ ++#define HAVE_TSEARCH 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNISTD_H ++ ++/* Define to 1 if you have the `vprintf' function. */ ++#define HAVE_VPRINTF 1 ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_WCHAR_H ++ ++/* Define to 1 if you have the `wcrtomb' function. */ ++#undef HAVE_WCRTOMB ++ ++/* Define to 1 if you have the `wcscoll' function. */ ++#undef HAVE_WCSCOLL ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_WCTYPE_H ++ ++/* Define to 1 if the system has the type `_Bool'. */ ++#undef HAVE__BOOL ++ ++/* Define to 1 if you have the `__argz_count' function. */ ++#undef HAVE___ARGZ_COUNT ++ ++/* Define to 1 if you have the `__argz_next' function. */ ++#undef HAVE___ARGZ_NEXT ++ ++/* Define to 1 if you have the `__argz_stringify' function. */ ++#undef HAVE___ARGZ_STRINGIFY ++ ++/* Define as const if the declaration of iconv() needs const. */ ++#undef ICONV_CONST ++ ++/* Name of package */ ++#define PACKAGE "sed" ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to the version of GNU sed whose features are supported by this sed. ++ */ ++#define SED_FEATURE_VERSION "5.1" ++ ++/* If using the C implementation of alloca, define if you know the ++ direction of stack growth for your system; otherwise it will be ++ automatically deduced at run-time. ++ STACK_DIRECTION > 0 => grows toward higher addresses ++ STACK_DIRECTION < 0 => grows toward lower addresses ++ STACK_DIRECTION = 0 => direction of growth unknown */ ++#undef STACK_DIRECTION ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Version number of package */ ++#define VERSION "4.1.5" ++ ++/* Define to 1 if on AIX 3. ++ System headers sometimes define this. ++ We just want to avoid a redefinition error message. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++ ++/* Number of bits in a file offset, on hosts where this is settable. */ ++#undef _FILE_OFFSET_BITS ++ ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++ ++/* Define for large files, on AIX-style hosts. */ ++#undef _LARGE_FILES ++ ++/* Define to 1 if on MINIX. */ ++#undef _MINIX ++ ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++#undef _POSIX_1_SOURCE ++ ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++#undef _POSIX_SOURCE ++ ++/* Include BSD functions in regex, used by the testsuite */ ++#undef _REGEX_RE_COMP ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++#define inline __inline ++#endif ++ ++/* Define to a type if does not define. */ ++#define mbstate_t int ++ ++/* Define to `long' if does not define. */ ++#undef off_t ++ ++/* Define to `unsigned' if does not define. */ ++#undef size_t ++ ++/* Define to `int' if does not define. */ ++#undef ssize_t +diff -Nru ../release/sed-4.1.5/lib/Makefile.msc ./lib/Makefile.msc +--- ../release/sed-4.1.5/lib/Makefile.msc 1969-12-31 16:00:00.000000000 -0800 ++++ ./lib/Makefile.msc 2006-09-28 19:10:18.880835600 -0700 +@@ -0,0 +1,20 @@ ++SOURCES=getline.c getopt.c getopt1.c mkstemp.c obstack.c regex.c strverscmp.c utils.c ++ ++OBJECTS=$(SOURCES:.c=.obj) ++ ++CFLAGS=-I.. -I. -DBOOTSTRAP -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_CONFIG_H ++ ++all : libsed.lib ++ ++install : ++ ++clean : ++ del $(OBJECTS) regex.h libsed.lib *~ 2>nul ++ ++regex.h : regex_.h ++ copy /b $**+nul $@ ++ ++$(OBJECTS) : ..\config.h ++ ++libsed.lib : regex.h $(OBJECTS) ++ lib /out:$@ $(OBJECTS) +diff -Nru ../release/sed-4.1.5/lib/regcomp.c ./lib/regcomp.c +--- ../release/sed-4.1.5/lib/regcomp.c 2005-12-06 00:46:51.000000000 -0800 ++++ ./lib/regcomp.c 2006-09-28 04:36:14.084476200 -0700 +@@ -506,11 +506,7 @@ + from either regcomp or regexec. We don't use PREG here. */ + + size_t +-regerror (errcode, preg, errbuf, errbuf_size) +- int errcode; +- const regex_t *__restrict preg; +- char *__restrict errbuf; +- size_t errbuf_size; ++regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf, size_t errbuf_size) + { + const char *msg; + size_t msg_size; +diff -Nru ../release/sed-4.1.5/lib/regex_internal.h ./lib/regex_internal.h +--- ../release/sed-4.1.5/lib/regex_internal.h 2005-12-06 00:50:56.000000000 -0800 ++++ ./lib/regex_internal.h 2006-09-28 04:33:10.987210800 -0700 +@@ -410,7 +410,9 @@ + #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx)) + #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx)) + ++#ifdef HAVE_ALLOCA_H + #include ++#endif + + #ifndef _LIBC + # if HAVE_ALLOCA +diff -Nru ../release/sed-4.1.5/lib/regexec.c ./lib/regexec.c +--- ../release/sed-4.1.5/lib/regexec.c 2005-12-06 00:46:56.000000000 -0800 ++++ ./lib/regexec.c 2006-09-28 04:50:51.101314600 -0700 +@@ -18,6 +18,12 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#ifdef BOOTSTRAP ++#define bool int ++#define true 1 ++#define false 0 ++#endif ++ + static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags, + int n) internal_function; + static void match_ctx_clean (re_match_context_t *mctx) internal_function; +@@ -2894,7 +2900,7 @@ + sizeof (re_dfastate_t *) * (path->alloc - old_alloc)); + } + +- str_idx = path->next_idx ?: top_str; ++ str_idx = path->next_idx ? path->next_idx : top_str; + + /* Temporary modify MCTX. */ + backup_state_log = mctx->state_log; +diff -Nru ../release/sed-4.1.5/Makefile.msc ./Makefile.msc +--- ../release/sed-4.1.5/Makefile.msc 1969-12-31 16:00:00.000000000 -0800 ++++ ./Makefile.msc 2006-09-28 19:10:18.552737900 -0700 +@@ -0,0 +1,17 @@ ++DIRS=lib sed ++ ++all : config.h ++ ++dummy_target : ++ ++install : dummy_target ++ ++all install : ++ @for %%i in ( $(DIRS) ) do @( cd %%i & nmake /nologo -f Makefile.msc $@ & cd .. ) ++ ++clean : ++ del config.h *~ 2>nul ++ @for %%i in ( $(DIRS) ) do @( cd %%i & nmake /nologo -f Makefile.msc $@ & cd .. ) ++ ++config.h : config_h.msc ++ copy /b $**+nul $@ +diff -Nru ../release/sed-4.1.5/sed/compile.c ./sed/compile.c +--- ../release/sed-4.1.5/sed/compile.c 2006-02-03 01:06:26.000000000 -0800 ++++ ./sed/compile.c 2006-09-28 05:48:12.636140800 -0700 +@@ -451,9 +451,7 @@ + + static int snarf_char_class P_((struct buffer *b, mbstate_t *cur_stat)); + static int +-snarf_char_class(b, cur_stat) +- struct buffer *b; +- mbstate_t *cur_stat; ++snarf_char_class(struct buffer *b, mbstate_t *cur_stat) + { + int ch; + int state = 0; +@@ -531,9 +529,7 @@ + + static struct buffer *match_slash P_((int slash, bool regex)); + static struct buffer * +-match_slash(slash, regex) +- int slash; +- bool regex; ++match_slash(int slash, bool regex) + { + struct buffer *b; + int ch; +diff -Nru ../release/sed-4.1.5/sed/Makefile.msc ./sed/Makefile.msc +--- ../release/sed-4.1.5/sed/Makefile.msc 1969-12-31 16:00:00.000000000 -0800 ++++ ./sed/Makefile.msc 2006-09-28 19:10:19.193309600 -0700 +@@ -0,0 +1,18 @@ ++SOURCES=sed.c compile.c execute.c regexp.c fmt.c mbcs.c ++ ++OBJECTS=$(SOURCES:.c=.obj) ++ ++CFLAGS=-I.. -I. -I../lib -DBOOTSTRAP -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_CONFIG_H ++ ++all : sed.exe ++ ++install : ++ copy sed.exe ..\..\..\bin ++ ++clean : ++ del $(OBJECTS) sed.exe *~ 2>nul ++ ++$(OBJECTS) : ..\config.h ++ ++sed.exe : $(OBJECTS) ++ link /out:sed.exe /subsystem:console /opt:ref $(OBJECTS) ..\lib\libsed.lib diff --git a/bacula/src/win32/tools/dbcheck/dbcheck.vcproj b/bacula/src/win32/tools/dbcheck/dbcheck.vcproj index d27e931a49..32b5c58e85 100644 --- a/bacula/src/win32/tools/dbcheck/dbcheck.vcproj +++ b/bacula/src/win32/tools/dbcheck/dbcheck.vcproj @@ -141,7 +141,7 @@ Name="VCLinkerTool" AdditionalDependencies="bacula_cats.lib" LinkIncremental="1" - AdditionalLibraryDirectories="..\..\debug" + AdditionalLibraryDirectories="..\..\release" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" -- 2.39.5