Changes in Jenkins/Distribute [ad915e0:6c9e0bc]

File:

• Jenkins/Distribute (modified) (5 diffs)

Jenkins/Distribute

@@ -26 +26 @@
                 wrap([$class: 'TimestamperBuildWrapper']) {
 
-                        final commit, build
-                        (commit, build) = prepare_build()
+                        final commit = prepare_build()
 
                         node('x64') {
@@ -36 +35 @@
 
                                 Tools.Checkout( commit )
-
-                                final version = GetVersion( build )
                         }
 
@@ -77 +74 @@
 // Main compilation routines
 //===========================================================================================================
-def GetVersion(build) {
-        final pver = sh(
-                returnStdout: true,
-                script: "sed 's/AC_INIT(\\[cfa-cc\\],\\[\\(.*\\)\\],\\[cforall@plg.uwaterloo.ca\\])/\\1/;t;d' ${SrcDir}/configure.ac"
-        ).trim()
 
-        final version = "${pver}.${build}"
 
-        echo "Package Version: ${pver}"
-        echo "Build   Version: ${build}"
-        echo "Long    Version: ${version}"
+//Compilation script is done here but environnement set-up and error handling is done in main loop
+// def checkout() {
+//      build_stage('Checkout', true) {
+//              //checkout the source code and clean the repo
+//              final scmVars = checkout scm
+//              Settings.GitNewRef = scmVars.GIT_COMMIT
+//              Settings.GitOldRef = scmVars.GIT_PREVIOUS_COMMIT
 
-        return version
-}
-
+//              echo GitLogMessage()
+//      }
+// }
 
 //===========================================================================================================
@@ -112 +107 @@
                                         defaultValue: '',                                                               \
                                 ],                                                                                              \
-                                [$class: 'StringParameterDefinition',                                           \
-                                        description: 'Build Number to put into the version',                    \
-                                        name: 'Build',                                                                  \
-                                        defaultValue: '0',                                                              \
-                                ],                                                                                              \
                         ],
                 ]])
@@ -131 +121 @@
         echo "Distributing git commit ${ref}"
 
-        return [params.GitRef, params.Build]
+        return params.GitRef
 }