diff --git a/appveyor.yml b/appveyor.yml index a00843bc1f41ad27097f5ab2c2e021afbcdad2a8..7c8ba04a84f47fe99cea0399e620de97bae94a3c 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 da58702b806106e37d0ec4da19f6499d0aebb654..74c20af705e00d5929de4538976aad9903c6940c 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 9a04d61a2c775b5bb455b7f121d843fbf65bffe3..5c7c93de48e6b0706ad64de765aa1ddefcb97950 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")