From 66b924e2713bbdb11e9bc513e60005e2928dd76c Mon Sep 17 00:00:00 2001
From: rishwanth1995 <rishwanthsenthilkumar@hotmail.com>
Date: Wed, 18 Apr 2018 09:14:50 -0400
Subject: [PATCH] added build cache sleuthkit libraries
---
appveyor.yml | 14 ++++++++------
setupLibs.py | 6 ++++--
win32/updateBuildLibs.py | 1 -
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index a00843bc1..7c8ba04a8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,11 +1,13 @@
version: 4.6.0.{build}
cache:
- - C:\Users\appveyor\.ant -> appveyor.yml
- - C:\Users\appveyor\.ivy2 -> appveyor.yml
- - C:\ProgramData\chocolatey\bin -> appveyor.yml
- - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
+ - C:\Users\appveyor\.ant
+ - C:\ProgramData\chocolatey\bin
+ - C:\ProgramData\chocolatey\lib
+ - C:\libvhdi_64bit
+ - C:\libvmdk_64bit
+ - C:\libewf_64bit
+ - C:\zlib
branches:
only:
- develop
@@ -13,7 +15,7 @@ branches:
image: Visual Studio 2015
-init:
+install:
- ps: choco install ant --ignore-dependencies
- ps: $env:Path="C:\Program Files\Java\jdk1.8.0\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant"
- set PATH=C:\Python36-x64\';%PATH%
diff --git a/setupLibs.py b/setupLibs.py
index da58702b8..74c20af70 100644
--- a/setupLibs.py
+++ b/setupLibs.py
@@ -15,14 +15,16 @@ def setupLibrary(path):
''' sets up the library path variable '''
git_repository_url = "https://github.com/sleuthkit/"
git_zlib_repository_url="https://github.com/madler/"
- gitClone(git_zlib_repository_url,"zlib",path["libewf_64bit"])
+ zlib_path = os.path.normpath(os.path.join(path["libewf_64bit"],"zlib"))
+ if not os.path.exists(zlib_path):
+ gitClone(git_zlib_repository_url,"zlib",path["libewf_64bit"])
for library,base_library_path in path.items():
library_path = os.path.normpath(os.path.join(base_library_path , library))
if not os.path.exists(library_path):
gitClone(git_repository_url, library, base_library_path)
def gitClone(URL, repo, path):
-
+ # This method will clone the library if it does not exist
cmd = ["git", "clone", URL + repo + ".git" ]
ret = subprocess.call(cmd, stdout=sys.stdout, cwd=path)
if ret != 0:
diff --git a/win32/updateBuildLibs.py b/win32/updateBuildLibs.py
index 9a04d61a2..5c7c93de4 100644
--- a/win32/updateBuildLibs.py
+++ b/win32/updateBuildLibs.py
@@ -176,7 +176,6 @@ def buildDependentLibs(libHome, wPlatform, targetDll):
elif wPlatform == 32:
vs.append("/p:platform=Win32")
vs.append("/v:quiet")
- vs.append("/t:clean")
vs.append("/t:build")
outputFile = os.path.join(LOG_PATH, targetDll + "Output.txt")
--
GitLab