[#47] Prevent deletion of external dependencies for TPM 2.0 Provisioner (#48)

HIRS_ProvisionerTPM2/build.gradle

@@ -1,10 +1,5 @@
-task cleanup() {
+task cleanup(type: Delete) {
-    delete 'build'
+	delete fileTree(dir: 'build', exclude: 'lib/')
-}
-
-task prep(type: Exec) {
-    workingDir './'
-    commandLine 'mkdir', 'build'
 }
 
 task cmake(type: Exec) {
@@ -18,7 +13,7 @@ task make(type: Exec) {
 }
 
 task fullBuild(type: GradleBuild) {
-	tasks = ['cleanup', 'prep', 'cmake', 'make']
+	tasks = ['cleanup', 'cmake', 'make']
 }
 
 build.dependsOn tasks.fullBuild

HIRS_ProvisionerTPM2/package/package.tpm2.centos7.sh

@@ -12,8 +12,15 @@ fi
 cd $( dirname "${BASH_SOURCE[0]}" )
 
 # Ensure clean build environment
-rm -rf BUILD
+shopt -s extglob
-mkdir BUILD
+# Delete everything but downloaded dependencies
+rm -rf BUILD/!(lib)
+shopt -u extglob
+
+# Make BUILD directory if it doesn't already exist
+if [ ! -d "BUILD" ]; then
+    mkdir BUILD
+fi
 
 # Navigate to build directory
 cd BUILD

HIRS_ProvisionerTPM2/package/package.tpm2.ubuntu.sh

@@ -12,8 +12,15 @@ fi
 cd $( dirname "${BASH_SOURCE[0]}" )
 
 # Ensure clean build environment
-rm -rf BUILD
+shopt -s extglob
-mkdir BUILD
+# Delete everything but downloaded dependencies
+rm -rf BUILD/!(lib)
+shopt -u extglob
+
+# Make BUILD directory if it doesn't already exist
+if [ ! -d "BUILD" ]; then
+    mkdir BUILD
+fi
 
 # Navigate to build directory
 cd BUILD