Windows thirdparty sources updates

7 files changed, 180 insertions, 168 deletions

diff --git a/distribution/src/thirdparty/README.txt b/distribution/src/thirdparty/README.txt
index 8e785b5661f..1d92cdd1dc2 100644
--- a/distribution/src/thirdparty/README.txt
+++ b/distribution/src/thirdparty/README.txt
@@ -77,14 +77,13 @@ these recommendations:
 bzip2
 -----
 
-The bzip2-1.0.6 distribution does not directly support creating DLLs.
-The file bzlib.patch in this archive contains a patch for bzlib.h that
-allows bzip2 to be compiled into a DLL.
+The file bzip2/patch.bzip2-1.0.6 in this archive contains updates to allow
+compile bzip2 as a DLL with VC and MINGW compilers
 
 After extracting the bzip2 source distribution, change to the
 top-level directory and apply the patch as shown below:
 
-  > patch -p0 bzlib.h < ..\bzip2\bzlib.patch
+  > patch -p0 < ..\bzip2\patch.bzip2-1.0.6
 
 
 mcpp
@@ -146,10 +145,9 @@ If you have not already applied the patch for bzip2, please read the
 
      > set CPP_COMPILER=VC100
 
-  2) Change to the source directory and use the
-     replacement makefile included in this archive:
+  2) Change to the source directory and build:
 
-     > nmake /f ..\bzip2\Makefile.mak
+     > nmake /f Makefile.mak
 
 - MinGW
 
@@ -163,8 +161,7 @@ If you have not already applied the patch for bzip2, please read the
      makefile included in this archive:
 
      > cd bzip2-1.0.6
-     > bash
-     > make -f ../bzip2/Makefile
+     > make -f Makefile-libbz2_so
 
 
 mcpp
diff --git a/distribution/src/thirdparty/bzip2/Makefile b/distribution/src/thirdparty/bzip2/Makefile
deleted file mode 100755
index fd629ae77f4..00000000000
--- a/distribution/src/thirdparty/bzip2/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# This Makefile builds a shared version of the library, 
-# libbz2.so.1.0.6, with soname libbz2.so.1.0,
-# at least on x86-Linux (RedHat 7.2), 
-# with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).  
-# Please see the README file for some important info 
-# about building the library like this.
-
-# ------------------------------------------------------------------
-# This file is part of bzip2/libbzip2, a program and library for
-# lossless, block-sorting data compression.
-#
-# bzip2/libbzip2 version 1.0.6 of 6 September 2010
-# Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-#
-# Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-# README file.
-#
-# This program is released under the terms of the license contained
-# in the file LICENSE.
-# ------------------------------------------------------------------
-
-
-SHELL=/bin/sh
-CC=gcc
-BIGFILES=-D_FILE_OFFSET_BITS=64
-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-
-OBJS= blocksort.o  \
-      huffman.o    \
-      crctable.o   \
-      randtable.o  \
-      compress.o   \
-      decompress.o \
-      bzlib.o
-
-all: $(OBJS)
-	$(CC) -shared $(OBJS) -o bzip2_mingw.dll
-	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c bzip2_mingw.dll
-
-clean: 
-	rm -f $(OBJS) bzip2.o bzip2_mingw.dll bzip2-shared
-
-blocksort.o: blocksort.c
-	$(CC) $(CFLAGS) -c blocksort.c
-huffman.o: huffman.c
-	$(CC) $(CFLAGS) -c huffman.c
-crctable.o: crctable.c
-	$(CC) $(CFLAGS) -c crctable.c
-randtable.o: randtable.c
-	$(CC) $(CFLAGS) -c randtable.c
-compress.o: compress.c
-	$(CC) $(CFLAGS) -c compress.c
-decompress.o: decompress.c
-	$(CC) $(CFLAGS) -c decompress.c
-bzlib.o: bzlib.c
-	$(CC) $(CFLAGS) -c bzlib.c
diff --git a/distribution/src/thirdparty/bzip2/Makefile.mak b/distribution/src/thirdparty/bzip2/Makefile.mak
deleted file mode 100644
index c4892a10009..00000000000
--- a/distribution/src/thirdparty/bzip2/Makefile.mak
+++ /dev/null
@@ -1,77 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-#
-# This is a replacement for the makefile.msc file that comes with the
-# bzip2 source distribution. The key differences are that this
-# makefile performs both release and debug builds and makes DLLs
-# instead of static libraries.
-#
-
-CC=cl
-
-DEBUG_CFLAGS  = /c /DWIN32 /Fo.\Debug\ /MDd /Zi /Od /D_FILE_OFFSET_BITS=64 /DBZ_EXPORT /nologo
-REL_CFLAGS    = /c /DWIN32 /Fo.\Release\ /MD /Ox /D_FILE_OFFSET_BITS=64 /DBZ_EXPORT /nologo
-
-TOOL_CFLAGS   = /DWIN32 /MD /Od /D_FILE_OFFSET_BITS=64 /nologo
-
-FILES 	      = DIR\blocksort.c  \
-      		DIR\huffman.c    \
-      		DIR\crctable.c   \
-      		DIR\randtable.c  \
-      		DIR\compress.c   \
-      		DIR\decompress.c \
-      		DIR\bzlib.c
-
-SRCS	= $(FILES:DIR=.)
-OBJS	= $(FILES:.c=.obj)
-
-!if "$(CPP_COMPILER)" == "VC90"
-DLLSUFFIX	= _vc90
-!endif
-
-all: debuglib releaselib bzip2
-
-bzip2: releaselib
-	$(CC) $(TOOL_CFLAGS) /Febzip2 bzip2.c libbz2.lib setargv.obj
-	@if exist bzip2.exe.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
-	    mt.exe -nologo -manifest bzip2.exe.manifest -outputresource:bzip2.exe;#1 && del /q bzip2.exe.manifest
-	$(CC) $(TOOL_CFLAGS) /Febzip2recover bzip2recover.c
-	@if exist bzip2recover.exe.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
-	    mt.exe -nologo -manifest bzip2recover.exe.manifest -outputresource:bzip2recover.exe;#1 && \
-	    del /q bzip2recover.exe.manifest
-
-debuglib: $(OBJS:DIR=.\Debug)
-	link  /dll /implib:libbz2d.lib /out:bzip2$(DLLSUFFIX)d.dll $**
-	@if exist bzip2$(DLLSUFFIX)d.dll.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
-	    mt.exe -nologo -manifest bzip2$(DLLSUFFIX)d.dll.manifest -outputresource:bzip2$(DLLSUFFIX)d.dll;#2 && \
-	    del /q bzip2$(DLLSUFFIX)d.dll.manifest
-
-releaselib: $(OBJS:DIR=.\Release)
-	link  /dll /release /implib:libbz2.lib /out:bzip2$(DLLSUFFIX).dll $**
-	@if exist bzip2$(DLLSUFFIX).dll.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
-	    mt.exe -nologo -manifest bzip2$(DLLSUFFIX).dll.manifest -outputresource:bzip2$(DLLSUFFIX).dll;#2 && \
-	    del /q bzip2$(DLLSUFFIX).dll.manifest
-
-$(OBJS:DIR=.\Debug): $(SRCS)
-	if not exist .\Debug mkdir .\Debug
-	$(CC) $(DEBUG_CFLAGS) $?
-
-$(OBJS:DIR=.\Release): $(SRCS)
-	if not exist .\Release mkdir .\Release
-	$(CC) $(REL_CFLAGS) $?
-
-clean: 
-	del *.obj
-	del .\Release\*.obj
-	del .\Debug\*.obj
-	del bzip2*.dll
-	del libbz*.lib
-	del bzip2.exe
-	del bzip2recover.exe
diff --git a/distribution/src/thirdparty/bzip2/README.TXT b/distribution/src/thirdparty/bzip2/README.TXT
deleted file mode 100644
index dfd109af957..00000000000
--- a/distribution/src/thirdparty/bzip2/README.TXT
+++ /dev/null
@@ -1,9 +0,0 @@
-The bzip2-1.0.5 distribution does not directly support creating DLLs.
-In order to re-create the DLL included in the Ice distribution, apply
-the patch bzlib.patch to the bzlib.h header and run the following
-command
-
-  nmake /f Makefile.mak
-
-using the supplied Makefile.mak file. This will build the release and
-debug versions of the bzip2 DLLs.
diff --git a/distribution/src/thirdparty/bzip2/bzlib.patch b/distribution/src/thirdparty/bzip2/bzlib.patch
deleted file mode 100644
index e9f37e6a74b..00000000000
--- a/distribution/src/thirdparty/bzip2/bzlib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-69,70c69,70
-< #ifndef BZ_IMPORT
-< #define BZ_EXPORT
----
-> #ifndef BZ_EXPORT
-> #define BZ_IMPORT
-86c86
-< #   define BZ_EXTERN extern
----
-> #   define BZ_EXTERN __declspec(dllexport)
-89,90c89,90
-< #   define BZ_API(func) (WINAPI * func)
-< #   define BZ_EXTERN
----
-> #   define BZ_API(func) WINAPI  func
-> #   define BZ_EXTERN __declspec(dllimport)
diff --git a/distribution/src/thirdparty/bzip2/patch.bzip2-1.0.6 b/distribution/src/thirdparty/bzip2/patch.bzip2-1.0.6
new file mode 100644
index 00000000000..cdb4c778f3a
--- /dev/null
+++ b/distribution/src/thirdparty/bzip2/patch.bzip2-1.0.6
@@ -0,0 +1,171 @@
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
+diff -r -c -N ../bzip2-1.0.6-old/bzlib.h ./bzlib.h
+*** ../bzip2-1.0.6-old/bzlib.h	2010-09-11 01:08:42.000000000 +0200
+--- ./bzlib.h	2014-10-09 21:41:18.358897587 +0200
+***************
+*** 66,73 ****
+     bz_stream;
+  
+  
+! #ifndef BZ_IMPORT
+! #define BZ_EXPORT
+  #endif
+  
+  #ifndef BZ_NO_STDIO
+--- 66,73 ----
+     bz_stream;
+  
+  
+! #ifndef BZ_EXPORT
+! #define BZ_IMPORT
+  #endif
+  
+  #ifndef BZ_NO_STDIO
+***************
+*** 83,93 ****
+  #   endif
+  #   ifdef BZ_EXPORT
+  #   define BZ_API(func) WINAPI func
+! #   define BZ_EXTERN extern
+  #   else
+     /* import windows dll dynamically */
+! #   define BZ_API(func) (WINAPI * func)
+! #   define BZ_EXTERN
+  #   endif
+  #else
+  #   define BZ_API(func) func
+--- 83,93 ----
+  #   endif
+  #   ifdef BZ_EXPORT
+  #   define BZ_API(func) WINAPI func
+! #   define BZ_EXTERN __declspec(dllexport)
+  #   else
+     /* import windows dll dynamically */
+! #   define BZ_API(func) WINAPI  func
+! #   define BZ_EXTERN __declspec(dllimport)
+  #   endif
+  #else
+  #   define BZ_API(func) func
+diff -r -c -N ../bzip2-1.0.6-old/Makefile-libbz2_so ./Makefile-libbz2_so
+*** ../bzip2-1.0.6-old/Makefile-libbz2_so	2010-09-11 01:07:52.000000000 +0200
+--- ./Makefile-libbz2_so	2014-10-09 21:41:18.358897587 +0200
+***************
+*** 24,30 ****
+  SHELL=/bin/sh
+  CC=gcc
+  BIGFILES=-D_FILE_OFFSET_BITS=64
+! CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES)
+  
+  OBJS= blocksort.o  \
+        huffman.o    \
+--- 24,30 ----
+  SHELL=/bin/sh
+  CC=gcc
+  BIGFILES=-D_FILE_OFFSET_BITS=64
+! CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
+  
+  OBJS= blocksort.o  \
+        huffman.o    \
+***************
+*** 35,47 ****
+        bzlib.o
+  
+  all: $(OBJS)
+! 	$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
+! 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+! 	rm -f libbz2.so.1.0
+! 	ln -s libbz2.so.1.0.6 libbz2.so.1.0
+  
+  clean: 
+! 	rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
+  
+  blocksort.o: blocksort.c
+  	$(CC) $(CFLAGS) -c blocksort.c
+--- 35,45 ----
+        bzlib.o
+  
+  all: $(OBJS)
+! 	$(CC) -shared $(OBJS) -o bzip2_mingw.dll
+! 	$(CC) $(CFLAGS) -o bzip2-shared bzip2.c bzip2_mingw.dll
+  
+  clean: 
+! 	rm -f $(OBJS) bzip2.o bzip2_mingw.dll bzip2-shared
+  
+  blocksort.o: blocksort.c
+  	$(CC) $(CFLAGS) -c blocksort.c
+diff -r -c -N ../bzip2-1.0.6-old/Makefile.mak ./Makefile.mak
+*** ../bzip2-1.0.6-old/Makefile.mak	1970-01-01 01:00:00.000000000 +0100
+--- ./Makefile.mak	2014-10-09 21:41:18.358897587 +0200
+***************
+*** 0 ****
+--- 1,68 ----
++ #
++ # This is a replacement for the makefile.msc file that comes with the
++ # bzip2 source distribution. The key differences are that this
++ # makefile performs both release and debug builds and makes DLLs
++ # instead of static libraries.
++ #
++ 
++ CC=cl
++ 
++ DEBUG_CFLAGS  = /c /DWIN32 /Fo.\Debug\ /MDd /Zi /Od /D_FILE_OFFSET_BITS=64 /DBZ_EXPORT /nologo
++ REL_CFLAGS    = /c /DWIN32 /Fo.\Release\ /MD /Ox /D_FILE_OFFSET_BITS=64 /DBZ_EXPORT /nologo
++ 
++ TOOL_CFLAGS   = /DWIN32 /MD /Od /D_FILE_OFFSET_BITS=64 /nologo
++ 
++ FILES 	      = DIR\blocksort.c  \
++       		DIR\huffman.c    \
++       		DIR\crctable.c   \
++       		DIR\randtable.c  \
++       		DIR\compress.c   \
++       		DIR\decompress.c \
++       		DIR\bzlib.c
++ 
++ SRCS	= $(FILES:DIR=.)
++ OBJS	= $(FILES:.c=.obj)
++ 
++ !if "$(CPP_COMPILER)" == "VC100"
++ DLLSUFFIX	= _vc100
++ !endif
++ 
++ all: debuglib releaselib bzip2
++ 
++ bzip2: releaselib
++ 	$(CC) $(TOOL_CFLAGS) /Febzip2 bzip2.c libbz2.lib setargv.obj
++ 	@if exist bzip2.exe.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
++ 	    mt.exe -nologo -manifest bzip2.exe.manifest -outputresource:bzip2.exe;#1 && del /q bzip2.exe.manifest
++ 	$(CC) $(TOOL_CFLAGS) /Febzip2recover bzip2recover.c
++ 	@if exist bzip2recover.exe.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
++ 	    mt.exe -nologo -manifest bzip2recover.exe.manifest -outputresource:bzip2recover.exe;#1 && \
++ 	    del /q bzip2recover.exe.manifest
++ 
++ debuglib: $(OBJS:DIR=.\Debug)
++ 	link  /dll /implib:libbz2d.lib /out:bzip2$(DLLSUFFIX)d.dll $**
++ 	@if exist bzip2$(DLLSUFFIX)d.dll.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
++ 	    mt.exe -nologo -manifest bzip2$(DLLSUFFIX)d.dll.manifest -outputresource:bzip2$(DLLSUFFIX)d.dll;#2 && \
++ 	    del /q bzip2$(DLLSUFFIX)d.dll.manifest
++ 
++ releaselib: $(OBJS:DIR=.\Release)
++ 	link  /dll /release /implib:libbz2.lib /out:bzip2$(DLLSUFFIX).dll $**
++ 	@if exist bzip2$(DLLSUFFIX).dll.manifest echo ^ ^ ^ Embedding manifest using mt.exe && \
++ 	    mt.exe -nologo -manifest bzip2$(DLLSUFFIX).dll.manifest -outputresource:bzip2$(DLLSUFFIX).dll;#2 && \
++ 	    del /q bzip2$(DLLSUFFIX).dll.manifest
++ 
++ $(OBJS:DIR=.\Debug): $(SRCS)
++ 	if not exist .\Debug mkdir .\Debug
++ 	$(CC) $(DEBUG_CFLAGS) $?
++ 
++ $(OBJS:DIR=.\Release): $(SRCS)
++ 	if not exist .\Release mkdir .\Release
++ 	$(CC) $(REL_CFLAGS) $?
++ 
++ clean: 
++ 	del *.obj
++ 	del .\Release\*.obj
++ 	del .\Debug\*.obj
++ 	del bzip2*.dll
++ 	del libbz*.lib
++ 	del bzip2.exe
++ 	del bzip2recover.exe
diff --git a/distribution/src/thirdparty/mcpp/patch.mcpp.2.7.2 b/distribution/src/thirdparty/mcpp/patch.mcpp.2.7.2
index 8103cf09204..2204f08b539 100644
--- a/distribution/src/thirdparty/mcpp/patch.mcpp.2.7.2
+++ b/distribution/src/thirdparty/mcpp/patch.mcpp.2.7.2
@@ -1,3 +1,6 @@
+#
+# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+#
 diff -r -c -N ../mcpp-2.7.2-old/noconfig/vc2010.dif ./noconfig/vc2010.dif
 *** ../mcpp-2.7.2-old/noconfig/vc2010.dif	Wed Dec 31 20:30:00 1969
 --- ./noconfig/vc2010.dif	Fri May 14 12:47:22 2010