From c8b3b853ccd68119c0cdec5061789e2d9dd1e346 Mon Sep 17 00:00:00 2001
From: apriestman <apriestman@basistech.com>
Date: Sat, 22 Aug 2020 20:21:22 -0400
Subject: [PATCH] Update build script. Removed some missed env variables.
---
appveyor.yml | 9 -----
win32/istat/istat.vcxproj | 2 +-
win32/libtsk/libtsk.vcxproj | 6 ++--
.../tsk_logical_imager.vcxproj | 2 +-
win32/updateAndBuildAll.py | 34 -------------------
5 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 5b7bfa760..18b9612b2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,10 +4,6 @@ cache:
- C:\Users\appveyor\.ant
- C:\ProgramData\chocolatey\bin
- C:\ProgramData\chocolatey\lib
- - C:\libvhdi_64bit
- - C:\libvmdk_64bit
- - C:\libewf_64bit
- - C:\zlib
image: Visual Studio 2015
@@ -20,10 +16,6 @@ install:
environment:
global:
TSK_HOME: "%APPVEYOR_BUILD_FOLDER%"
- LIBVHDI_HOME: "C:\\libvhdi_64bit"
- LIBVMDK_HOME: "C:\\libvmdk_64bit\\libvmdk"
- LIBEWF_HOME: "C:\\libewf_64bit"
- OPENSSL_HOME: "C:\\OpenSSL-v111-Win64"
PYTHON: "C:\\Python36-x64"
JDK_HOME: C:\Program Files\Java\jdk1.8.0
services:
@@ -32,7 +24,6 @@ before_build:
- nuget restore win32\libtsk -PackagesDirectory win32\packages
build_script:
- - python setupDevRepos.py
- python win32\updateAndBuildAll.py -m
- ps: ant -version
- ps: pushd bindings/java
diff --git a/win32/istat/istat.vcxproj b/win32/istat/istat.vcxproj
index 9a3630bf0..6a4a1f1ee 100755
--- a/win32/istat/istat.vcxproj
+++ b/win32/istat/istat.vcxproj
@@ -229,7 +229,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LIBEWF_HOME)\msvscpp\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
diff --git a/win32/libtsk/libtsk.vcxproj b/win32/libtsk/libtsk.vcxproj
index febecd17c..72851289a 100755
--- a/win32/libtsk/libtsk.vcxproj
+++ b/win32/libtsk/libtsk.vcxproj
@@ -135,7 +135,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(TskNugetIncludes);$(LIBEWF_HOME)\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(TskNugetIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_DEPRECATE;GUID_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_LIBEWF;HAVE_LIBVMDK;HAVE_LIBVHDI;HAVE_LIBZ;WIN32;_DEBUG;_LIB;_ITERATOR_DEBUG_LEVEL=2;WINVER=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -157,7 +157,7 @@ copy "$(LibVhdiLib)\libvhdi.dll" "$(OutDir)"</Command>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(TskNugetIncludes);$(LIBEWF_HOME)\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(TskNugetIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_DEPRECATE;GUID_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_LIBEWF;HAVE_LIBVMDK;HAVE_LIBVHDI;HAVE_LIBZ;WIN32;_DEBUG;_LIB;WINVER=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -178,7 +178,7 @@ copy "$(LibVhdiLib)\libvhdi.dll" "$(OutDir)"</Command>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(TskNugetIncludes);$(LIBEWF_HOME)\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)\..\..\;$(TskNugetIncludes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_DEPRECATE;GUID_WINDOWS;_CRT_SECURE_NO_WARNINGS;HAVE_LIBEWF;HAVE_LIBZ;HAVE_LIBVMDK;HAVE_LIBVHDI;WIN32;NDEBUG;_LIB;WINVER=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/win32/tsk_logical_imager/tsk_logical_imager.vcxproj b/win32/tsk_logical_imager/tsk_logical_imager.vcxproj
index b4dd11da9..83ad938b0 100755
--- a/win32/tsk_logical_imager/tsk_logical_imager.vcxproj
+++ b/win32/tsk_logical_imager/tsk_logical_imager.vcxproj
@@ -250,7 +250,7 @@
</ClCompile>
<Link>
<AdditionalDependencies>Shlwapi.lib;Ws2_32.lib;comsuppw.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(LIBEWF_HOME)\msvscpp\x64\release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/win32/updateAndBuildAll.py b/win32/updateAndBuildAll.py
index afd419a28..3cd257e5a 100644
--- a/win32/updateAndBuildAll.py
+++ b/win32/updateAndBuildAll.py
@@ -37,40 +37,6 @@ def pullAndBuildAllDependencies(depBranch):
global passed
passed = True
- # get the LIBEWF_HOME, LIBVHDI_HOME, LIBVMDH_HOME
- ewfHome = os.getenv("LIBEWF_HOME", "C:\\libewf_64bit")
- vhdiHome = os.getenv("LIBVHDI_HOME", "C:\\libvhdi_64bit")
- vmdkHome = os.getenv("LIBVMDK_HOME", "C:\\libvmdk_64bit\\libvmdk")
- # check if ewfHome, vhdiHome or vmdhHome exits
- checkPathExist(ewfHome)
- checkPathExist(vhdiHome)
- checkPathExist(vmdkHome)
- # git update libewf, libvhdi and libvmdk
- if(passed):
- gitPull(ewfHome, "libewf_64bit", depBranch)
- if(passed):
- gitPull(vhdiHome, "libvhdi_64bit", depBranch)
- if(passed):
- gitPull(vmdkHome, "libvmdk_64bit", depBranch)
-
- if not MINIMAL:
- # build 32-bit of libewf, libvhdi, libvmdk and TSK
- if(passed):
- buildDependentLibs(ewfHome, 32, "libewf", "libewf_dll")
- if(passed):
- buildDependentLibs(vhdiHome, 32, "libvhdi", "libvhdi")
- if(passed):
- buildDependentLibs(vmdkHome, 32, "libvmdk", "libvmdk")
-
-
- # build 64-bit of libewf, libvhdi, libvmdk and TSK
- if(passed):
- buildDependentLibs(ewfHome, 64, "libewf", "libewf_dll")
- if(passed):
- buildDependentLibs(vhdiHome, 64, "libvhdi", "libvhdi")
- if(passed):
- buildDependentLibs(vmdkHome, 64, "libvmdk", "libvmdk")
-
# get all nuget packages needed by the solution
if(passed):
TSK_HOME = os.getenv("TSK_HOME", False)
--
GitLab