HuQiong
/
Synergy-Binaries
mirror of https://github.com/DEAKSoftware/Synergy-Binaries.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Work on scripts.

Browse Source
master
Dominik Deák 5 years ago
parent 350611b26e
commit ac1c5e53c2
No known key found for this signature in database
GPG Key ID: 85514EC0CCE7007C
3 changed files with 69 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 143
      Scripts/Detail/Config.py
  2. 6
      Scripts/build.py
  3. 3
      Scripts/config.txt

143
Scripts/Detail/Config.py
Unescape View File

@ -5,113 +5,100 @@ import os, platform, configparser
import Detail.Utility as utility
class Configuration:
upstreamURL = ""
toplevelPath = ""
synergyCorePath = ""
synergyBuildPath = ""
synergyVersionPath = ""
binariesPath = ""
toolsPath = ""
libQtPath = ""
vcvarsallPath = ""
cmakeGenerator = ""
class Configuration( configparser.ConfigParser ):
# Constructor
def __init__( self, configPath ):
# parser = configparser.ConfigParser
def __init__( self, configPath ):
super().__init__( dict_type = dict, allow_no_value = True )
defaults = {
"upstreamURL" : "",
"toplevelPath" : "",
"synergyCorePath" : "",
"synergyBuildPath" : "",
"synergyVersionPath" : "",
"binariesPath" : "",
"toolsPath" : "",
"libQtPath" : "",
"vcvarsallPath" : "",
"cmakeGenerator" : "",
}
super().__init__( dict_type = dict, allow_no_value = True, default_section = "All", defaults = defaults )
self.read( configPath )
self.__validateToplevelPath()
self.__validateConfigPaths()
# Validation
def __validateToplevelPath( self ):
utility.printHeading( "Git configuration..." )
def validateToplevelPath( config ):
upstreamURL = self.get( "Common", "upstreamURL" )
queriedURL = utility.captureCommandOutput( "git config --get remote.origin.url" )
toplevelPath = utility.captureCommandOutput( "git rev-parse --show-toplevel" )
utility.printHeading( "Git configuration..." )
utility.printItem( "toplevelPath: ", toplevelPath )
utility.printItem( "upstreamURL: ", upstreamURL )
utility.printItem( "queriedURL: ", queriedURL )
section = platform.system();
if not os.path.exists( toplevelPath ):
utility.printError( "Git top level path does not exist: " + toplevelPath )
raise SystemExit( 1 )
upstreamURL = config[ section ][ "upstreamURL" ]
queriedURL = utility.captureCommandOutput( "git config --get remote.origin.url" )
toplevelPath = utility.captureCommandOutput( "git rev-parse --show-toplevel" )
if queriedURL != upstreamURL:
utility.printError( "The upstream URL at the current working directory does not match project upstream URL: " + queriedURL )
raise SystemExit( 1 )
utility.printItem( "toplevelPath: ", toplevelPath )
utility.printItem( "upstreamURL: ", upstreamURL )
utility.printItem( "queriedURL: ", queriedURL )
self.set( "Common", "toplevelPath", toplevelPath )
def __validateConfigPath( self, sectionName, pathName, mustExist = True, isInternal = True ):
if not os.path.exists( toplevelPath ):
utility.printError( "Git top level path does not exist:\n\t", toplevelPath )
raise SystemExit( 1 )
path = self.get( sectionName, pathName, fallback = None )
if queriedURL != upstreamURL:
utility.printError( "The upstream URL at the current working directory does not match project upstream URL:\n\t", queriedURL )
raise SystemExit( 1 )
if path == None:
utility.printError( "Configuration [" + sectionName + "][" + pathName + "] was not defined." )
raise SystemExit( 1 )
config[ section ][ "toplevelPath" ] = toplevelPath
if isInternal:
toplevelPath = self.get( "Common", "toplevelPath" )
path = utility.joinPath( toplevelPath, path )
prefixPath = os.path.commonprefix( [ toplevelPath, path ] )
def validateConfigPaths( config ):
if not os.path.samefile( toplevelPath, prefixPath ):
utility.printError( "Path was not resolved within top-level path scope: " + path )
raise SystemExit( 1 )
def resolvePath( config, name, mustExist = True ):
self.set( sectionName, pathName, path )
section = platform.system();
path = config[ section ][ name ]
utility.printItem( pathName + ": ", path )
if path != "":
if not os.path.exists( path ):
if mustExist:
utility.printError( "Required path does not exist: " + path )
raise SystemExit( 1 )
else:
utility.printWarning( "Path does not exist: " + path )
path = utility.joinPath( config[ section ][ "toplevelPath" ], path )
utility.printItem( name + ": ", path )
def __validateConfigPaths( self ):
if not os.path.exists( path ):
if mustExist:
utility.printError( "Required path does not exist:\n\t", path )
raise SystemExit( 1 )
else:
utility.printWarning( "Path does not exist:\n\t", path )
utility.printHeading( "Path configuration..." )
config[ section ][ name ] = path
self.__validateConfigPath( "Common", "synergyCorePath" )
self.__validateConfigPath( "Common", "synergyBuildPath", mustExist = False )
self.__validateConfigPath( "Common", "binariesPath" )
self.__validateConfigPath( "Common", "toolsPath" )
utility.printHeading( "Path configuration..." )
self.__validateConfigPath( platform.system(), "synergyVersionPath", mustExist = False )
resolvePath( config, "synergyCorePath" )
resolvePath( config, "synergyBuildPath", mustExist = False )
resolvePath( config, "synergyVersionPath", mustExist = False )
resolvePath( config, "binariesPath" )
resolvePath( config, "toolsPath" )
resolvePath( config, "libQtPath" )
resolvePath( config, "vcvarsallPath" )
if platform.system() == "Windows":
self.__validateConfigPath( platform.system(), "libQtPath", isInternal = False )
self.__validateConfigPath( platform.system(), "vcvarsallPath", isInternal = False )
elif platform.system() == "Darwin":
self.__validateConfigPath( platform.system(), "libQtPath", isInternal = False )
validateToplevelPath( self )
validateConfigPaths( self )
# Convenience accessors
def toplevelPath( self ):
return self.get( "Common", "toplevelPath" )
return self.get( platform.system(), "toplevelPath" )
def synergyCorePath( self ):
return self.get( "Common", "synergyCorePath" )
return self.get( platform.system(), "synergyCorePath" )
def synergyBuildPath( self ):
return self.get( "Common", "synergyBuildPath" )
return self.get( platform.system(), "synergyBuildPath" )
def synergyVersionPath( self ):
@ -119,23 +106,23 @@ class Configuration:
def binariesPath( self ):
return self.get( "Common", "binariesPath" )
return self.get( platform.system(), "binariesPath" )
def toolsPath( self ):
return self.get( "Common", "toolsPath" )
return self.get( platform.system(), "toolsPath" )
def libQtPath( self ):
return self.get( platform.system(), "libQtPath", fallback = "" )
return self.get( platform.system(), "libQtPath" )
def vcvarsallPath( self ):
return self.get( platform.system(), "vcvarsallPath", fallback = "" )
return self.get( platform.system(), "vcvarsallPath" )
def cmakeGenerator( self ):
return self.get( platform.system(), "cmakeGenerator", fallback = "" )
return self.get( platform.system(), "cmakeGenerator" )
scriptPath = utility.joinPath( utility.basePathAtSource( __file__ ), ".." )
configPath = utility.joinPath( scriptPath, "config.txt" )

6
Scripts/build.py
Unescape View File

@ -4,9 +4,9 @@
import Detail.Build
# b = Detail.Build.BuildSystem()
b = Detail.Build.BuildSystem()
# b.configure()
# b.make()
b.configure()
b.make()
# b.clean()

3
Scripts/config.txt
Unescape View File

@ -1,7 +1,6 @@
[Common]
[All]
upstreamURL = https://github.com/DEAKSoftware/Synergy-Binaries.git
synergyCorePath = ./Synergy-Core
synergyBuildPath = ./Synergy-Core/build
synergyVersionPath = ./Synergy-Core/build/version

Write Preview
Loading…
Cancel
Save