added python script to setup sleuthkit branch in appveyor and travis

.travis.yml

@@ -6,17 +6,20 @@ os:
 env:
  global:
   - TSK_HOME=$TRAVIS_BUILD_DIR/sleuthkit/sleuthkit
+python:
+  - "2.7"
 jdk:
  - oraclejdk8
 before_install:
- - git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit 	
+ - git clone https://github.com/sleuthkit/sleuthkit.git sleuthkit/sleuthkit
+ - python setupSleuthkitBranch.py
 install:
  - sudo apt-get install testdisk
- - cd sleuthkit/sleuthkit 
+ - cd sleuthkit/sleuthkit
  - sh travis_build.sh
 script:
  - set -e
- - echo "building autopsy..." && echo -en 'travis_fold:start:script.build\\r'	
+ - echo "building autopsy..." && echo -en 'travis_fold:start:script.build\\r'
  - cd $TRAVIS_BUILD_DIR/
  - ant -q build
  - echo -en 'travis_fold:end:script.build\\r'

appveyor.yml

@@ -1,21 +1,18 @@
 version: 4.6.0.{build}
 
 cache:
-  - C:\Users\appveyor\.ant -> appveyor.yml
+  - C:\Users\appveyor\.ant
-  - C:\Users\appveyor\.ivy2 -> appveyor.yml
+  - C:\ProgramData\chocolatey\bin
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+  - C:\libewf_64bit
+  - C:\libvhdi_64bit
+  - C:\libvmdk_64bit
+  - C:\zlib
+  - '%APPVEYOR_BUILD_FOLDER%\Core\test\qa-functional\data'
 
-branches:
-    only:
-      - develop
 
 image: Visual Studio 2015
 platform: x64
-init:
-  - 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%
 environment:
     global:
       TSK_HOME: "C:\\sleuthkit"
@@ -27,10 +24,14 @@ environment:
       PYTHON: "C:\\Python36-x64"
 
 install:
-  - ps: pushd C:\
+  - ps: choco install ant --ignore-dependencies
   - git clone https://github.com/sleuthkit/sleuthkit
-  - ps: popd
+  - ps: $env:Path="C:\Program Files\Java\jdk1.8.0\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant"
-
+  - set PATH=C:\Python36-x64\';%PATH%
+  - cd C:\
+  - git clone https://github.com/sleuthkit/sleuthkit
+  - cd %APPVEYOR_BUILD_FOLDER%
+  - python setupSleuthkitBranch.py
 services:
   - postgresql95
 

setupSleuthkitBranch.py

@@ -0,0 +1,56 @@
+# This python script sets the sleuthkit branch based on the autopsy build branch
+# in appveyor and travis
+
+import os
+import sys
+import subprocess
+import xml.etree.ElementTree as ET
+
+TSK_HOME=os.getenv("TSK_HOME",False)
+passed = 1
+
+def gitSleuthkitCheckout(branch):
+    global passed
+    cmd = ['git','checkout',branch]
+    passed = subprocess.call(cmd,stdout=sys.stdout,cwd=TSK_HOME)
+
+def parseXML(xmlFile):
+    tree = ET.parse('TSKVersion.xml')
+    root = tree.getroot()
+    for child in root:
+        if child.attrib['name']=='TSK_VERSION':
+            return child.attrib['value']
+    return None
+
+def main():
+    global passed
+
+    if not TSK_HOME:
+        sys.exit(1)
+        print('Please set TSK_HOME env variable')
+
+    TRAVIS=os.getenv("TRAVIS",False)
+    APPVEYOR=os.getenv("APPVEYOR",False)
+    if TRAVIS == "true":
+        CURRENT_BRANCH=os.getenv("TRAVIS_BRANCH",False)
+    elif APPVEYOR:
+        CURRENT_BRANCH=os.getenv("APPVEYOR_REPO_BRANCH",False)
+    else:
+        cmd=['git','rev-parse','--abbrev-ref','HEAD']
+        output = subprocess.check_output(cmd)
+        CURRENT_BRANCH=output.strip()
+
+    if CURRENT_BRANCH.startswith('custom-'):
+        gitSleuthkitCheckout(CURRENT_BRANCH)
+    else:
+        version = parseXML('TSKVersion.xml')
+        RELEASE_BRANCH = "release-"+version
+        gitSleuthkitCheckout(RELEASE_BRANCH)
+
+    if passed != 0:
+        gitSleuthkitCheckout('develop')
+    if passed != 0:
+            print('Something gone wrong')
+            sys.exit(1)
+if __name__ == '__main__':
+    main()