diff --git a/Scripts/Detail/Config.py b/Scripts/Detail/Config.py index 97ca1c7..5bd6c2c 100644 --- a/Scripts/Detail/Config.py +++ b/Scripts/Detail/Config.py @@ -20,10 +20,10 @@ class Configuration(): platformVersion = "" - productName = "" + productName = "Synergy" productVersion = "unknown-version" productStage = "snapshot" - productPackageName = "" + productPackageName = "-".join( [ productName, productVersion, productStage ] ).lower() productRepoPath = "" productBuildPath = "" productVersionPath = "" @@ -110,12 +110,13 @@ class Configuration(): self.platformVersion = "-".join( platformInfo ) utility.printItem( "platformVersion: ", self.platformVersion ) - utility.printHeading( "Loading configuration..." ) def configureProductVersion( self ): self.updateProductVersion() + utility.printHeading( "Loading configuration..." ) + loadConfiguration( self, configPath ) utility.printHeading( "Git configuration..." ) diff --git a/Scripts/build.py b/Scripts/build.py index 103fc1b..deef813 100755 --- a/Scripts/build.py +++ b/Scripts/build.py @@ -19,9 +19,10 @@ def configureSubmodules(): utility.runCommand( "git submodule update --init --remote --recursive" ) statusAfter = utility.captureCommandOutput( "git submodule status" ) + print( statusAfter ) if statusBefore != statusAfter: - print( statusAfter ) + utility.printHeading( "Updating product version..." ) config.updateProductVersion() def configureEnvironment(): @@ -34,9 +35,11 @@ def configureEnvironment(): for name, value in variables.items(): - print( "\tSetting ${" + utility.style.bold + name + utility.style.none + "}" ) - - os.environ[ name ] = value + if value: + print( "\tSetting: ${" + utility.style.bold + name + utility.style.none + "}" ) + os.environ[ name ] = value + else: + print( "\tUnused: " + utility.style.error + name + utility.style.none ) def buildProducts():