Merge pull request #1208 from rishwanth1995/appveyor_Sleuthkit

appveyor fixed environment variables

appveyor.yml

@@ -25,12 +25,13 @@ environment:
       LIBEWF_HOME: "C:\\libewf_64bit"
       POSTGRESQL_HOME_64: "C:\\Program Files\\PostgreSQL\\9.5"
       PYTHON: "C:\\Python36-x64"
+      JDK_HOME: C:\Program Files\Java\jdk1.8.0
 services:
       - postgresql95;
 
 build_script:
       - python setupLibs.py
-      - python %TSK_HOME%\win32\updateBuildLibs.py -m
+      - python win32\updateBuildLibs.py -m
       - ps: ant -version
       - ps: pushd bindings/java
       - cmd: ant dist-PostgreSQL

setupLibs.py

@@ -39,17 +39,18 @@ def main():
         base_Library_path["libewf_64bit"] = os.path.dirname(libewf_home)
     else:
         print('Please set the env variable LIBEWF_HOME')
+        sys.exit(1)
 
     if(libvhdi_home != None):
         base_Library_path["libvhdi_64bit"] = os.path.dirname(libvhdi_home)
     else:
         print('Please set the env variable LIBVHDI_HOME')
-
+        sys.exit(1)
     if(libvmdk_home != None):
         base_Library_path["libvmdk_64bit"] = os.path.dirname(os.path.dirname(libvmdk_home))
     else:
         print('Please set the env variable LIBVMDK_HOME')
-
+        sys.exit(1)
 
     setupLibrary(base_Library_path);
 

win32/updateBuildLibs.py

@@ -20,7 +20,6 @@
 CURRENT_PATH = os.getcwd()
 # save the build log in the output directory
 LOG_PATH = os.path.join(CURRENT_PATH, 'output', time.strftime("%Y.%m.%d-%H.%M.%S"))
-APPVEYOR = os.getenv("APPVEYOR",False)
 MINIMAL = False
 def pullAndBuildAllDependencies(branch):
     '''
@@ -210,7 +209,12 @@ def buildTSK(wPlatform, target):
 
     print ("Building TSK " + str(wPlatform) + "-bit " + target + " build.")
     sys.stdout.flush()
-    if(APPVEYOR):
+    TSK_HOME = os.getenv("TSK_HOME",False)
+
+    if not TSK_HOME:
+        print("Please set the TSK_HOME environment variable")
+        sys.exit(1)
+    else:
         os.chdir(os.path.join(os.getenv("TSK_HOME"),"win32"))
 
     vs = []