ICE-6703 - Windows dependencies and third party packages.

6 files changed, 33 insertions, 71 deletions

diff --git a/config/makedepend.vbs b/config/makedepend.vbs
index 5a5f61e7672..c3f7c7f8632 100644
--- a/config/makedepend.vbs
+++ b/config/makedepend.vbs
@@ -15,7 +15,7 @@ baseName = WScript.Arguments(0)
 
 
 topSrcDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\..")
-
+cppThirdPartyDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\third-party-packages\")
 cppSrcDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\src\")
 cppIncludeDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\include\")
 cppTestIncludeDir = fs.GetAbsolutePathName(WScript.Arguments(1) & "\test\include\")
@@ -42,36 +42,40 @@ outFile.WriteLine("	" & WScript.Arguments(0) & " \")
 Set stream = fs.OpenTextFile(Replace(basename, ".cpp", ".d"), ForReading)
 
 Do While Not stream.AtEndOfStream
-    line = stream.ReadLine()
-
-    i = InStr(1, line, "Note: including file:")
-    If i > 0 Then
-        i = i + Len("Note: including file:")
-        line = Mid(line, i)
-        line = Trim(line)
-
-        line = fs.GetAbsolutePathName(line)
-        If InStr(1, line, topSrcDir) Then
-            If InStr(1, line, workDir & "\") > 0 Then
-                line = Right(line, len(line) - len(workDir) -1)
-            Elseif InStr(1, line, cppSrcDir) > 0 Then
-                line = WScript.Arguments(1) & "\src" & Right(line, len(line) - len(cppSrcDir))
-            Elseif InStr(1, line, cppIncludeDir) > 0 Then
-                line = "$(includedir)" & Right(line, len(line) - len(cppIncludeDir))
-            Elseif InStr(1, line, iceCppIncludeDir) > 0 Then
-                line = "$(ice_cpp_dir)\include" & Right(line, len(line) - len(iceCppIncludeDir))
-            Elseif InStr(1, line, cppTestIncludeDir) > 0 Then
-                line = "$(top_srcdir)\test\include" & Right(line, len(line) - len(cppTestIncludeDir))
-            End If
-
-            line = "    """ & line & """ \"
-            If Not depends.Exists(line) Then
-                depends.Add line, ""
-                outFile.WriteLine(line)
+    Do
+        line = stream.ReadLine()
+
+        i = InStr(1, line, "Note: including file:")
+        If i > 0 Then
+            i = i + Len("Note: including file:")
+            line = Mid(line, i)
+            line = Trim(line)
+
+            line = fs.GetAbsolutePathName(line)
+            
+            If InStr(1, line, cppThirdPartyDir) Then Exit Do
+
+            If InStr(1, line, topSrcDir) Then
+                If InStr(1, line, workDir & "\") > 0 Then
+                    line = Right(line, len(line) - len(workDir) -1)
+                Elseif InStr(1, line, cppSrcDir) > 0 Then
+                    line = WScript.Arguments(1) & "\src" & Right(line, len(line) - len(cppSrcDir))
+                Elseif InStr(1, line, cppIncludeDir) > 0 Then
+                    line = "$(includedir)" & Right(line, len(line) - len(cppIncludeDir))
+                Elseif InStr(1, line, iceCppIncludeDir) > 0 Then
+                    line = "$(ice_cpp_dir)\include" & Right(line, len(line) - len(iceCppIncludeDir))
+                Elseif InStr(1, line, cppTestIncludeDir) > 0 Then
+                    line = "$(top_srcdir)\test\include" & Right(line, len(line) - len(cppTestIncludeDir))
+                End If
+
+                line = "    """ & line & """ \"
+                If Not depends.Exists(line) Then
+                    depends.Add line, ""
+                    outFile.WriteLine(line)
+                End If
             End If
         End If
-    End If
-
+    Loop While False
 Loop
 
 stream.Close()
diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak
index 1ee75d15f30..0f96c3f9385 100755
--- a/cpp/src/Freeze/.depend.mak
+++ b/cpp/src/Freeze/.depend.mak
@@ -211,8 +211,6 @@ BackgroundSaveEvictorI.obj: \
     "ObjectStore.h" \
     "$(includedir)\Freeze\EvictorStorage.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
@@ -608,8 +606,6 @@ ConnectionI.obj: \
     "$(includedir)\Freeze\Index.h" \
     "$(includedir)\Freeze\DB.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "SharedDbEnv.h" \
     "$(includedir)\Freeze\Map.h" \
     "$(includedir)\Freeze\Exception.h" \
@@ -764,8 +760,6 @@ EvictorI.obj: \
     "ObjectStore.h" \
     "$(includedir)\Freeze\EvictorStorage.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
@@ -913,8 +907,6 @@ EvictorIteratorI.obj: \
     "ObjectStore.h" \
     "$(includedir)\Freeze\EvictorStorage.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "$(includedir)\IceUtil\Cache.h" \
     "$(includedir)\IceUtil\CountDownLatch.h" \
     "EvictorI.h" \
@@ -1076,8 +1068,6 @@ Index.obj: \
     "ObjectStore.h" \
     "$(includedir)\Freeze\EvictorStorage.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
@@ -1231,8 +1221,6 @@ IndexI.obj: \
     "ObjectStore.h" \
     "$(includedir)\Freeze\EvictorStorage.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
@@ -1242,8 +1230,6 @@ MapDb.obj: \
 	MapDb.cpp \
     "MapDb.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "ConnectionI.h" \
     "$(includedir)\Freeze\Connection.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -1513,8 +1499,6 @@ MapI.obj: \
     "$(includedir)\Freeze\ConnectionF.h" \
     "$(includedir)\Freeze\Index.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
     "MapDb.h" \
@@ -1652,8 +1636,6 @@ ObjectStore.obj: \
     "$(includedir)\Freeze\Index.h" \
     "TransactionI.h" \
     "$(includedir)\Freeze\Transaction.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "$(includedir)\IceUtil\Cache.h" \
     "$(includedir)\IceUtil\CountDownLatch.h" \
     "EvictorI.h" \
@@ -1810,8 +1792,6 @@ SharedDbEnv.obj: \
     "$(includedir)\Freeze\Connection.h" \
     "$(includedir)\Freeze\Transaction.h" \
     "..\..\src\IceUtil\FileUtil.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "Util.h" \
     "MapDb.h" \
     "ConnectionI.h" \
@@ -1992,8 +1972,6 @@ TransactionalEvictorContext.obj: \
     "$(includedir)\Freeze\CatalogData.h" \
     "ObjectStore.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
@@ -2150,8 +2128,6 @@ TransactionalEvictorI.obj: \
     "ObjectStore.h" \
     "$(includedir)\Freeze\EvictorStorage.h" \
     "TransactionI.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
     "..\..\src\IceUtil\FileUtil.h" \
@@ -2216,8 +2192,6 @@ TransactionI.obj: \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Freeze\Transaction.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "ConnectionI.h" \
     "$(includedir)\Freeze\Connection.h" \
     "$(includedir)\Ice\Version.h" \
@@ -2449,8 +2423,6 @@ Util.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "$(includedir)\Freeze\DB.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
     "$(includedir)\Freeze\Exception.h" \
 
 BackgroundSaveEvictor.obj: \
diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak
index f77623aef6c..2a99698be24 100755
--- a/cpp/src/FreezeScript/.depend.mak
+++ b/cpp/src/FreezeScript/.depend.mak
@@ -863,8 +863,6 @@ Util.obj: \
     "$(includedir)\Freeze\ConnectionF.h" \
     "$(includedir)\Freeze\Index.h" \
     "$(includedir)\Slice\Preprocessor.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
 
 Grammar.obj: \
 	Grammar.cpp \
@@ -1475,8 +1473,6 @@ Transformer.obj: \
     "$(includedir)\Freeze\Index.h" \
     "..\..\src\IceXML\Parser.h" \
     "$(includedir)\IceUtil\InputUtil.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
 
 transformdb.obj: \
 	transformdb.cpp \
@@ -1621,8 +1617,6 @@ transformdb.obj: \
     "$(includedir)\IceUtil\Options.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "..\..\src\IceUtil\FileUtil.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
 
 DumpDescriptors.obj: \
 	DumpDescriptors.cpp \
@@ -1758,8 +1752,6 @@ DumpDescriptors.obj: \
     "Util.h" \
     "$(includedir)\Freeze\CatalogData.h" \
     "$(includedir)\IceUtil\InputUtil.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
 
 DumpDB.obj: \
 	DumpDB.cpp \
@@ -1902,5 +1894,3 @@ DumpDB.obj: \
     "$(includedir)\IceUtil\Options.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "..\..\src\IceUtil\FileUtil.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db_cxx.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\berkeley.db.v140\build\native\include\db.h" \
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
index 8c3320a48f5..729802a005d 100755
--- a/cpp/src/Ice/.depend.mak
+++ b/cpp/src/Ice/.depend.mak
@@ -1463,7 +1463,6 @@ ConnectionI.obj: \
     "BatchRequestQueue.h" \
     "SharedContext.h" \
     "ProxyFactory.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\bzip2.v140\build\native\include\bzlib.h" \
 
 ConnectionRequestHandler.obj: \
 	ConnectionRequestHandler.cpp \
diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak
index 892b2baf31a..32ebf0f27a2 100755
--- a/cpp/src/IcePatch2Lib/.depend.mak
+++ b/cpp/src/IcePatch2Lib/.depend.mak
@@ -272,7 +272,6 @@ Util.obj: \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\IcePatch2\Config.h" \
     "$(includedir)\IcePatch2\FileServer.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\bzip2.v140\build\native\include\bzlib.h" \
 
 FileInfo.obj: \
 	FileInfo.cpp \
diff --git a/cpp/src/IceXML/.depend.mak b/cpp/src/IceXML/.depend.mak
index 00495c0e3b2..3d66f0fd053 100755
--- a/cpp/src/IceXML/.depend.mak
+++ b/cpp/src/IceXML/.depend.mak
@@ -8,5 +8,3 @@ Parser.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\Exception.h" \
     "..\..\src\IceUtil\FileUtil.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\expat.v140\build\native\include\expat.h" \
-    "C:\Users\benoit\ice\cpp\third-party-packages\expat.v140\build\native\include\expat_external.h" \