Merge pull request #75 from microclimate-dev2ops/buildFix

Build fix

Author: tetchel

dev/ant_build/build-mdt.xml

@@ -29,12 +29,12 @@
           <echo>Build label is "${buildLabel}"</echo>
      </target>
 
-    <!--target name="checkBuildLabelFile" >
+    <target name="checkBuildLabelFile" >
         <available file="${mdt_build.basedir}/buildLabel.properties" property="buildLabel.present"/>
-    </target-->
+    </target>
 
-    <!--target name="createBuildLabelFile" depends="checkBuildLabelFile" unless="buildLabel.present"-->
-    <target name="createBuildLabelFile">
+    <target name="createBuildLabelFile" depends="checkBuildLabelFile" unless="buildLabel.present">
+    <!--target name="createBuildLabelFile"-->
         <tstamp>
               <format property="buildLabel" pattern="yyyyMMdd_HHmm" timezone="UTC"/>
         </tstamp>

dev/build.gradle

@@ -42,7 +42,7 @@ dependencies {
     // corelibs "com.nimbusds:oauth2-oidc-sdk:6.5"
 }
 
-defaultTasks 'clean', 'getCoreDependencies', 'compile', 'generateOpenMDTUpdateSite', 'deployDHE'
+defaultTasks 'clean', 'getCoreDependencies', 'compile', 'generateOpenMDTUpdateSite'
 
 task importAnt {
     ClassLoader antClassLoader = org.apache.tools.ant.Project.class.classLoader
@@ -58,6 +58,7 @@ task importAnt {
     // build-mdt provides the generateOpenMDTUpdateSite target, which is the entry point
     // for the compilation and assembling of updatesites
     ant.importBuild('ant_build/build-mdt.xml')
+    println "Imported ant code"
 }
 
 def projDir = projectDir.getAbsolutePath()
@@ -187,10 +188,8 @@ gradleGenerateMDTUpdateSite.dependsOn generateOpenMDTUpdateSite
 build.dependsOn compile
 build.dependsOn generateOpenMDTUpdateSite
 
-compile.dependsOn importAnt
 compile.dependsOn downloadEclipseSDK
 compile.dependsOn downloadEclipseTargetPlatform
-compile.dependsOn getCoreDependencies
 
 //// build version from the artifacts to avoid version mismatch
 import static groovy.io.FileType.FILES
@@ -210,9 +209,9 @@ def getBuildLabelFromArtifact() {
 
         buildLabel = (fileName =~ "${filePrefix}(.*).zip")[0][1]
 
-    if (buildLabel.isEmpty()) {
-        buildLabel = ant.properties['buildLabel']
-        println "Unable to grab build label - ant buildLabel is used instead."
+        if (buildLabel.isEmpty()) {
+            buildLabel = ant.properties['buildLabel']
+            println "Unable to grab build label - ant buildLabel is used instead."
         }
     }
     return buildLabel
@@ -426,6 +425,10 @@ task cleanBuilds(type: Delete) {
         println 'Delete ' + artifactsDir
         file(artifactsDir).deleteDir()
 
+        def buildLabelFile = project.properties['build.label.file']
+        println 'Delete ' + buildLabelFile
+        file(buildLabelFile).delete()
+
         println 'Delete ' + toolsImageFolder
         file(toolsImageFolder).deleteDir()
     }
@@ -438,7 +441,6 @@ task cleanBuilds(type: Delete) {
 // Delete all prereq files, downloaded artifacts and build output
 task clean(type: Delete) {
     doLast {
-
     }
 
     onlyIf {

dev/gradle.properties

@@ -23,6 +23,7 @@ eclipse.target.platform.folder=/target_platform
 eclipse.target.platform.ies.folder=/target_platform/prereqs/ies
 eclipse.temp.folder=/target_platform/prereqs/temp/plugins
 ant.artifacts.folder=ant_build/artifacts/
+build.label.file=ant_build/buildLabel.properties
 tools.image.folder=/tools.image
 
 microclimate.core.prereqlib.folder=/com.ibm.microclimate.core/lib