[Firebird-checkins] SF.net SVN: firebird:[60317] firebird/trunk

[<hv...@us...>]

Revision: 60317
          http://sourceforge.net/p/firebird/code/60317
Author:   hvlad
Date:     2014-12-01 09:04:39 +0000 (Mon, 01 Dec 2014)
Log Message:
-----------
Support for zlib on Windows

Modified Paths:
--------------
    firebird/trunk/builds/win32/make_boot.bat
    firebird/trunk/builds/win32/msvc10/firebird2.props
    firebird/trunk/builds/win32/msvc12/firebird2.props
    firebird/trunk/src/include/gen/autoconfig_msvc.h
    firebird/trunk/src/remote/remote.cpp

Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat	2014-12-01 09:03:36 UTC (rev 60316)
+++ firebird/trunk/builds/win32/make_boot.bat	2014-12-01 09:04:39 UTC (rev 60317)
@@ -42,6 +42,9 @@
 call :LibTomMath
 if "%ERRLEV%"=="1" goto :END
 
+call :zlib
+if "%ERRLEV%"=="1" goto :END
+
 @echo Generating DSQL parser...
 @call parse.bat %*
 if "%ERRLEV%"=="1" goto :END
@@ -69,17 +72,19 @@
 
 @findstr /V "@UDF_COMMENT@" %FB_ROOT_PATH%\builds\install\misc\firebird.conf.in > %FB_BIN_DIR%\firebird.conf
 
-:: Copy ICU both to Debug and Release configurations
+:: Copy ICU and zlib both to Debug and Release configurations
 
 @call set_build_target.bat %* RELEASE
 @mkdir %FB_BIN_DIR%
 @copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1
 @copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1
+@copy %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%\*.dll %FB_BIN_DIR% >nul 2>&1
 
 @call set_build_target.bat %* DEBUG
 @mkdir %FB_BIN_DIR%
 @copy %FB_ROOT_PATH%\extern\icu\icudt???.dat %FB_BIN_DIR% >nul 2>&1
 @copy %FB_ICU_SOURCE_BIN%\*.dll %FB_BIN_DIR% >nul 2>&1
+@copy %FB_ROOT_PATH%\extern\zlib\%FB_TARGET_PLATFORM%\*.dll %FB_BIN_DIR% >nul 2>&1
 
 @call set_build_target.bat %*
 
@@ -133,6 +138,18 @@
 goto :EOF
 
 ::===================
+:: Extract zlib
+:zlib
+@echo Extracting pre-built zlib
+if exist %FB_ROOT_PATH%\extern\zlib\zlib.h (
+  @echo %FB_ROOT_PATH%\extern\zlib\zlib.h already extracted
+) else (
+  %FB_ROOT_PATH%\extern\zlib\zlib.exe -y > zlib_%FB_TARGET_PLATFORM%.log
+  if errorlevel 1 call :boot2 zlib
+)
+goto :EOF
+
+::===================
 :: BUILD gpre_boot
 :gpre_boot
 @echo.

Modified: firebird/trunk/builds/win32/msvc10/firebird2.props
===================================================================
--- firebird/trunk/builds/win32/msvc10/firebird2.props	2014-12-01 09:03:36 UTC (rev 60316)
+++ firebird/trunk/builds/win32/msvc10/firebird2.props	2014-12-01 09:04:39 UTC (rev 60317)
@@ -10,7 +10,7 @@
     <ClCompile>
       <AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>

Modified: firebird/trunk/builds/win32/msvc12/firebird2.props
===================================================================
--- firebird/trunk/builds/win32/msvc12/firebird2.props	2014-12-01 09:03:36 UTC (rev 60316)
+++ firebird/trunk/builds/win32/msvc12/firebird2.props	2014-12-01 09:04:39 UTC (rev 60317)
@@ -10,7 +10,7 @@
     <ClCompile>
       <AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/icu/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>
       </ExceptionHandling>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>

Modified: firebird/trunk/src/include/gen/autoconfig_msvc.h
===================================================================
--- firebird/trunk/src/include/gen/autoconfig_msvc.h	2014-12-01 09:03:36 UTC (rev 60316)
+++ firebird/trunk/src/include/gen/autoconfig_msvc.h	2014-12-01 09:04:39 UTC (rev 60317)
@@ -156,8 +156,8 @@
 #undef HAVE_SYS_SOCKIO_H
 #undef HAVE_WINSOCK2_H
 #define HAVE_FLOAT_H
+#define HAVE_ZLIB_H
 
-
 /* Functions */
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_TIME

Modified: firebird/trunk/src/remote/remote.cpp
===================================================================
--- firebird/trunk/src/remote/remote.cpp	2014-12-01 09:03:36 UTC (rev 60316)
+++ firebird/trunk/src/remote/remote.cpp	2014-12-01 09:04:39 UTC (rev 60317)
@@ -1385,7 +1385,11 @@
 	public:
 		ZLib(Firebird::MemoryPool&)
 		{
+#ifdef WIN_NT
+			const char* name = "zlib1.dll";
+#else
 			const char* name = "libz." SHRLIB_EXT ".1";
+#endif
 			z.reset(ModuleLoader::fixAndLoadModule(name));
 			if (z)
 				symbols();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.