Work on scripts.

master
DominikDeak 5 years ago
parent 47ab532760
commit ad0ec94daf
No known key found for this signature in database
GPG Key ID: 85514EC0CCE7007C
  1. 37
      Scripts/Detail/Config.py
  2. 8
      Scripts/build.py

@ -107,9 +107,29 @@ class Configuration():
self.platformVersion = "-".join( platformInfo )
utility.printItem( "platformVersion: ", self.platformVersion )
utility.printHeading( "Loading configuration..." )
def configureProductVersion( self ):
self.updateProductVersion()
loadConfiguration( self, configPath )
utility.printHeading( "Git configuration..." )
validateToplevelPath( self )
utility.printHeading( "Path configuration..." )
validateConfigurationPaths( self )
utility.printHeading( "Version configuration..." )
configurePlatformVersion( self )
configureProductVersion( self )
def updateProductVersion( self ):
versionFile = open( self.productVersionPath, "r" )
versionData = versionFile.read()
versionFile.close()
@ -128,23 +148,6 @@ class Configuration():
utility.printItem( "productStage: ", self.productStage )
utility.printItem( "productPackageName: ", self.productPackageName )
utility.printHeading( "Loading configuration..." )
loadConfiguration( self, configPath )
utility.printHeading( "Git configuration..." )
validateToplevelPath( self )
utility.printHeading( "Path configuration..." )
validateConfigurationPaths( self )
utility.printHeading( "Version configuration..." )
configurePlatformVersion( self )
configureProductVersion( self )
def variableList( self ):
return dict( ( name, getattr( self, name ) ) for name in dir( self ) if not callable( getattr( self, name ) ) and not name.startswith( '__' ) )

@ -13,8 +13,14 @@ def configureSubmodules():
os.chdir( config.toplevelPath )
status = utility.captureCommandOutput( "git submodule status" )
print( status )
utility.runCommand( "git submodule update --init --remote --recursive" )
if status != utility.captureCommandOutput( "git submodule status" ):
config.updateProductVersion()
def configureEnvironment():
@ -48,4 +54,4 @@ configureSubmodules()
configureEnvironment()
buildProducts()
# buildProducts()

Loading…
Cancel
Save