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. 41
      Scripts/Detail/Config.py
  2. 8
      Scripts/build.py

@ -107,28 +107,11 @@ class Configuration():
self.platformVersion = "-".join( platformInfo )
utility.printItem( "platformVersion: ", self.platformVersion )
utility.printHeading( "Loading configuration..." )
def configureProductVersion( self ):
versionFile = open( self.productVersionPath, "r" )
versionData = versionFile.read()
versionFile.close()
versionParts = re.findall( r'set \(SYNERGY_VERSION_\w+ "?(\w+)"?\)', versionData )
if len( versionParts ) != 4:
printError( "Failed to extract version information." )
raise SystemExit( 1 )
self.productVersion = ".".join( versionParts[ 0:3 ] )
self.productStage = versionParts[ 3 ]
self.productPackageName = "-".join( [ self.productName, self.productVersion, self.productStage, self.platformVersion ] ).lower()
utility.printItem( "productVersion: ", self.productVersion )
utility.printItem( "productStage: ", self.productStage )
utility.printItem( "productPackageName: ", self.productPackageName )
utility.printHeading( "Loading configuration..." )
self.updateProductVersion()
loadConfiguration( self, configPath )
@ -145,6 +128,26 @@ class Configuration():
configurePlatformVersion( self )
configureProductVersion( self )
def updateProductVersion( self ):
versionFile = open( self.productVersionPath, "r" )
versionData = versionFile.read()
versionFile.close()
versionParts = re.findall( r'set \(SYNERGY_VERSION_\w+ "?(\w+)"?\)', versionData )
if len( versionParts ) != 4:
printError( "Failed to extract version information." )
raise SystemExit( 1 )
self.productVersion = ".".join( versionParts[ 0:3 ] )
self.productStage = versionParts[ 3 ]
self.productPackageName = "-".join( [ self.productName, self.productVersion, self.productStage, self.platformVersion ] ).lower()
utility.printItem( "productVersion: ", self.productVersion )
utility.printItem( "productStage: ", self.productStage )
utility.printItem( "productPackageName: ", self.productPackageName )
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