Reformates with black

This commit is contained in:
torsten committed 2026-07-18 17:20:58 +02:00
1 parent 6bb80ee9c8
commit 6ef895bfa3
6 files changed
+495 -362

No files matched your search

+40 -28
View File
@@ -2,11 +2,6 @@
# -*- coding: utf-8 -*-
import getpass
import os
import re
@@ -18,32 +13,38 @@ import sys
def verbose():
verb = os.getenv("EMERGE_VERBOSE")
if ( not verb == None and verb.isdigit() and int(verb) > 0 ):
if not verb == None and verb.isdigit() and int(verb) > 0:
return int(verb)
else:
return 0
def debug(message):
if verbose() >= 0:
print("debug: %s" % message)
return True
def info(message):
if verbose() >= 0:
print("info: %s" % message)
return True
def warning(message):
print("warning: %s" % message)
return True
def error(message):
die(message)
def die(message):
print >> sys.stderr, "emerge fatal error: %s" % message
sys.exit(1)
def system(cmdstring, file=None):
debug("Executing '%s'" % cmdstring)
out = subprocess.PIPE
@@ -51,55 +52,63 @@ def system( cmdstring, file = None ):
out = file
p = subprocess.Popen(cmdstring, shell=True, stdout=out, stderr=sys.stderr)
ret = p.wait()
if ( ret != 0 ):
if ret != 0:
die("Error executing %s (%s)" % (cmdstring, ret))
ret = ""
if file == None:
ret = p.stdout.read().strip()
return ret
def getOS_Name():
if os.path.exists('/etc/SuSE-release'):
f = open('/etc/SuSE-release', 'r')
rx = re.compile('^VERSION = (.*)$')
if os.path.exists("/etc/SuSE-release"):
f = open("/etc/SuSE-release", "r")
rx = re.compile("^VERSION = (.*)$")
for line in f.readlines():
m = rx.match(line)
if not m:
line = re.sub('\s', '', line)
line = re.sub('\([xX]86[-_]64\)', '', line)
line = line.replace('SUSE', '')
line = line.replace('LinuxEnterpriseServer', 'SLE')
line = line.replace('LinuxEnterpriseDesktop', 'SLE')
line = re.sub("\s", "", line)
line = re.sub("\([xX]86[-_]64\)", "", line)
line = line.replace("SUSE", "")
line = line.replace("LinuxEnterpriseServer", "SLE")
line = line.replace("LinuxEnterpriseDesktop", "SLE")
return line.strip()
return "unknown"
else:
f = open('/etc/os-release', 'r')
f = open("/etc/os-release", "r")
rx = re.compile('^PRETTY_NAME="(.*)"$')
for line in f.readlines():
m = rx.match(line)
if m:
return m.group(1).replace(' ','_')
return m.group(1).replace(" ", "_")
return "unknown"
def removeDirectory(dest_dir):
info("--------------------------------")
info("Removing %s" % (dest_dir))
info("--------------------------------")
if ( os.path.exists( dest_dir ) and os.path.isdir( dest_dir ) ):
if os.path.exists(dest_dir) and os.path.isdir(dest_dir):
for root, dirs, files in os.walk(dest_dir, topdown=False):
for name in files:
try:
os.remove(os.path.join(root, name))
except:
die( "couldn't delete file %s\n ( %s )" % ( name, os.path.join( root, name ) ) )
die(
"couldn't delete file %s\n ( %s )"
% (name, os.path.join(root, name))
)
for name in dirs:
try:
if ( os.path.islink(os.path.join(root, name)) ):
if os.path.islink(os.path.join(root, name)):
os.remove(os.path.join(root, name))
else:
os.rmdir(os.path.join(root, name))
except:
die( "couldn't delete directory %s\n( %s )" % ( name, os.path.join( root, name ) ) )
die(
"couldn't delete directory %s\n( %s )"
% (name, os.path.join(root, name))
)
os.rmdir(dest_dir)
@@ -108,13 +117,13 @@ def copySrcDirToDestDir( srcdir, dstdir, perm = None, with_subdirs = True ):
info("Copying %s to %s" % (srcdir, dstdir))
info("--------------------------------")
while srcdir[-1] == '/':
while srcdir[-1] == "/":
srcdir = srcdir[:-1]
if with_subdirs:
for root, dirs, files in os.walk(srcdir):
tmpdir = root.replace(srcdir, dstdir)
debug("dstdir = '%s'" % tmpdir)
if ( not os.path.exists( tmpdir ) ):
if not os.path.exists(tmpdir):
debug("Creating dir '%s'" % tmpdir)
os.makedirs(tmpdir)
if perm:
@@ -137,8 +146,8 @@ def copySrcDirToDestDir( srcdir, dstdir, perm = None, with_subdirs = True ):
for f in os.listdir(srcdir):
if os.path.isdir(f):
continue
shutil.copy( os.path.join( srcdir, f ),
os.path.join( dstdir, f ) )
shutil.copy(os.path.join(srcdir, f), os.path.join(dstdir, f))
def moveFilesToDir(srcdir, dstdir, rx_filter=None, with_subdirs=True):
info("--------------------------------")
@@ -173,6 +182,7 @@ def moveFilesToDir( srcdir, dstdir, rx_filter = None, with_subdirs = True ):
shutil.move(src, dstdir)
return moved_files
def adjustPermissions(srcdir):
info("--------------------------------")
info("Adjusting permissions in %s" % srcdir)
@@ -181,10 +191,12 @@ def adjustPermissions( srcdir ):
stat_file = stat.S_IREAD | stat.S_IWRITE | stat.S_IRUSR | stat.S_IROTH
stat_executable = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
stat_dir = stat_file | stat_executable
while srcdir[-1] == '/':
while srcdir[-1] == "/":
srcdir = srcdir[:-1]
for root, dirs, files in os.walk(srcdir):
os.chmod( root, )
os.chmod(
root,
)
for file in files:
f = os.path.join(root, file)
perm = 0
@@ -197,10 +209,10 @@ def adjustPermissions( srcdir ):
perm |= stat_executable
os.chmod(f, perm)
def exec_rpmbuild(spec_dir, spec_filename, buildroot=None):
spec = os.path.join(spec_dir, spec_filename)
cmd = "rpmbuild -ba %s" % spec
if buildroot:
cmd += " --buildroot=%s" % buildroot
system(cmd, sys.stdout) and die("during rpmbuild. cmd: %s" % command)
+88 -61
View File
@@ -14,11 +14,12 @@ import fnmatch
loc = os.path.dirname(sys.argv[0])
loc = os.path.abspath(loc)
exec(compile(open('helpers.py').read(), 'helpers.py', 'exec'))
exec(compile(open("helpers.py").read(), "helpers.py", "exec"))
class build(object):
def __init__(self):
self.project_name = 'ctc'
self.project_name = "ctc"
self.base_dir = os.getcwd()
self.cmake_build_flags = None
self.output_dir = "/shd/CTC/TOOLS/TDS-rpmbuild/"
@@ -30,14 +31,14 @@ class build(object):
self.buildtype = os.getenv("CMAKE_BUILD_TYPE")
if self.buildtype == None or self.buildtype == "":
self.buildtype = 'RelWithDebInfo'
self.buildtype = "RelWithDebInfo"
self.cmake_generator = 'Unix Makefiles'
self.cmake_generator = "Unix Makefiles"
def init(self):
self.extfw_dir = "%s/EXTFW-inst/opt/EXTFW" % self.base_dir
if not os.path.exists(self.extfw_dir):
self.extfw_dir = '/opt/EXTFW'
self.extfw_dir = "/opt/EXTFW"
os.environ["EXTFW"] = self.extfw_dir
os.environ["CMAKE_PREFIX_PATH"] = self.extfw_dir
@@ -48,7 +49,10 @@ class build(object):
print(" Using extfw dir: %s" % self.extfw_dir)
print(" Using buildtype: %s" % self.buildtype)
print(" Project name: %s" % self.project_name)
print(" Version: %s.%s-%s" % ( self.version_maj, self.version_min, self.version_rev ))
print(
" Version: %s.%s-%s"
% (self.version_maj, self.version_min, self.version_rev)
)
print(" GitLab-CI build number: %s" % os.getenv("BUILD_NUMBER"))
print(" Date: %s" % self.version_date)
print("")
@@ -58,65 +62,87 @@ class build(object):
return "%s.%s" % (self.version_maj, self.version_min)
def xzfilename(self):
return self.project_name + '_' + self.repository + '_' + getOS_Name() + '-' + self.version_str() + '.tar.xz'
return (
self.project_name
+ "_"
+ self.repository
+ "_"
+ getOS_Name()
+ "-"
+ self.version_str()
+ ".tar.xz"
)
def specname(self, specdir):
specname = 'ctc_%s_%s.spec' % ( self.repository, self.project_name )
specname = "ctc_%s_%s.spec" % (self.repository, self.project_name)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc_%s.spec' % ( self.repository )
specname = "ctc_%s.spec" % (self.repository)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'lts.spec'
specname = 'lts' + str(os.getenv( "BUILD_VERSION" )) + '.spec'
specname = "lts.spec"
specname = "lts" + str(os.getenv("BUILD_VERSION")) + ".spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc.spec'
specname = "ctc.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = '%s.spec' % self.project_name
specname = "%s.spec" % self.project_name
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
die( 'Unable to find a valid spec file in %s' % specdir )
die("Unable to find a valid spec file in %s" % specdir)
def copy_spec(self, dest_dir, spec_fullpath):
f = open( spec_fullpath, 'r' )
f = open(spec_fullpath, "r")
content = f.read()
f.close()
jenkins_build_tag = os.getenv("BUILD_TAG")
if jenkins_build_tag == None or len(jenkins_build_tag) == 0:
jenkins_build_tag = 'Not build with jenkins job'
jenkins_build_tag = "Not build with jenkins job"
cmake_flags = ""
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_maj)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_min)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (self.cmake_version_prefix, self.version_date)
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_maj,
)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_min,
)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_date,
)
cmake_flags += '-D_pname:STRING="%s" ' % (self.project_name)
jenkins_build_number = os.getenv("BUILD_NUMBER")
if jenkins_build_number != None:
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" '% (jenkins_build_number)
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" ' % (
jenkins_build_number
)
if self.cmake_build_flags:
cmake_flags += ' %s ' % self.cmake_build_flags
cmake_flags += " %s " % self.cmake_build_flags
cmake_flags += '-DCMAKE_BUILD_TYPE="%s" ' % self.buildtype
filename = 'project.%s.cfg' % self.project_name
cmake_flags += '-DTDS_PROJECT_CONFIG_FILE=%s ' % filename
filename = "project.%s.cfg" % self.project_name
cmake_flags += "-DTDS_PROJECT_CONFIG_FILE=%s " % filename
content = content.replace("@PROJECT@", self.project_name)
content = content.replace("@OS_SYSTEM@", getOS_Name())
@@ -130,7 +156,7 @@ class build(object):
content = content.replace("@JENKINS_BUILD_TAG@", jenkins_build_tag)
if not os.path.exists(dest_dir):
os.makedirs(dest_dir)
f = open( os.path.join( dest_dir, os.path.split( spec_fullpath )[1] ), 'w' )
f = open(os.path.join(dest_dir, os.path.split(spec_fullpath)[1]), "w")
f.write(content)
f.close()
@@ -139,7 +165,7 @@ class build(object):
config_files = []
for root, dirs, files in os.walk(folder):
for name in files:
if fnmatch.fnmatch(name, 'lts-cc*conf'):
if fnmatch.fnmatch(name, "lts-cc*conf"):
config_files.append(os.path.join(root, name))
for config_file in config_files:
@@ -151,7 +177,7 @@ class build(object):
if len(config.items(section)) == 0:
config.remove_section(section)
with open(config_file, 'w') as file:
with open(config_file, "w") as file:
config.write(file)
def pack_sources(self, src_dir, dest_dir):
@@ -175,26 +201,30 @@ class build(object):
system(cmd, sys.stdout) and die("while packing. cmd: %s" % command)
def usage():
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0]
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
0
]
def main():
b = build()
try:
opts, args = getopt.getopt(sys.argv[1:], "b:c:f:o:p:r:v:",
["base_dir=", "cmake_build_flags=", "cmake_version_prefix=", "filelist=", "output_dir=", "project_name=", "repository=", "version="])
opts, args = getopt.getopt(
sys.argv[1:],
"b:c:f:o:p:r:v:",
[
"base_dir=",
"cmake_build_flags=",
"cmake_version_prefix=",
"filelist=",
"output_dir=",
"project_name=",
"repository=",
"version=",
],
)
except getopt.GetoptError as err:
print >> sys.stderr, err
usage()
@@ -219,27 +249,25 @@ def main():
if o in ("-r", "--repository"):
b.repository = a
if o in ("-v", "--version"):
version = a.split('.')
version = a.split(".")
try:
b.version_maj = version[0]
b.version_min = version[1]
except:
die("Invalid version format (maj.min): %s" % a)
b.version_date = os.getenv("VERSION_DATE")
b.init()
b.printOptions()
rpmbase_dir = '/shd/CTC/TOOLS/rpmbuild'
rpmbase_dir = "/shd/CTC/TOOLS/rpmbuild"
project_base_dir = os.getenv("PROJECT_BASE_DIR")
specdir = os.path.join(rpmbase_dir, "SPECS")
if not os.path.exists(specdir):
os.makedirs(specdir)
b.clean_lts_cc_conf(os.path.join(project_base_dir, 'Lts', 'Projects'))
specname = b.specname(os.path.join(project_base_dir, 'specs'))
b.clean_lts_cc_conf(os.path.join(project_base_dir, "Lts", "Projects"))
specname = b.specname(os.path.join(project_base_dir, "specs"))
b.copy_spec(specdir, os.path.join(project_base_dir, "specs", specname))
full_version = "%s.%s-%s" % (b.version_maj, b.version_min, b.version_rev)
@@ -248,22 +276,21 @@ def main():
b.pack_sources(project_base_dir, os.path.join(rpmbase_dir, "SOURCES"))
exec_rpmbuild(specdir, specname)
dstdir = os.path.join( b.output_dir, "%s-%s-%s" % ( b.project_name, b.repository, full_version ) )
filter = re.compile( "^.*%s\..*\.rpm$" % full_version )
moved_files = moveFilesToDir( rpmbase_dir,
dstdir,
filter,
True
dstdir = os.path.join(
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
)
filter = re.compile("^.*%s\..*\.rpm$" % full_version)
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
if rpm_filelist != None:
try:
f = open( rpm_filelist, 'w' )
f = open(rpm_filelist, "w")
for m in moved_files:
f.write( '%s\n' % m )
f.write("%s\n" % m)
f.close()
except:
die( 'Error creating fileslist %s' % rpm_filelist )
die("Error creating fileslist %s" % rpm_filelist)
if __name__ == "__main__":
main()
+92 -70
View File
@@ -2,11 +2,6 @@
# -*- coding: utf-8 -*-
import datetime
import getopt
import os
@@ -20,11 +15,12 @@ import fnmatch
loc = os.path.dirname(sys.argv[0])
loc = os.path.abspath(loc)
exec(compile(open('helpers.py').read(), 'helpers.py', 'exec'))
exec(compile(open("helpers.py").read(), "helpers.py", "exec"))
class build(object):
def __init__(self):
self.project_name = 'ctc'
self.project_name = "ctc"
self.base_dir = os.getcwd()
self.cmake_build_flags = None
self.output_dir = "/shd/CTC/TOOLS/TDS-rpmbuild/"
@@ -37,14 +33,14 @@ class build(object):
self.buildtype = os.getenv("CMAKE_BUILD_TYPE")
if self.buildtype == None or self.buildtype == "":
self.buildtype = 'RelWithDebInfo'
self.buildtype = "RelWithDebInfo"
self.cmake_generator = 'Unix Makefiles'
self.cmake_generator = "Unix Makefiles"
def init(self):
self.extfw_dir = "%s/EXTFW-inst/opt/EXTFW" % self.base_dir
if not os.path.exists(self.extfw_dir):
self.extfw_dir = '/opt/EXTFW'
self.extfw_dir = "/opt/EXTFW"
os.environ["EXTFW"] = self.extfw_dir
os.environ["CMAKE_PREFIX_PATH"] = self.extfw_dir
@@ -56,14 +52,18 @@ class build(object):
print(" Using buildtype: %s" % self.buildtype)
print(" Project name: %s" % self.project_name)
print(" SVN Path: %s" % self.svn_fullpath)
print(" Version: %s.%s-%s" % ( self.version_maj, self.version_min, self.version_rev ))
print(
" Version: %s.%s-%s"
% (self.version_maj, self.version_min, self.version_rev)
)
print(" Jenkins build number: %s" % os.getenv("BUILD_NUMBER"))
print(" Date: %s" % self.version_date)
print("")
time.sleep(2)
def svn_export( self, svn_path, dest_dir, svn_revision = "HEAD", svn_user = None, svn_passwd = None ):
def svn_export(
self, svn_path, dest_dir, svn_revision="HEAD", svn_user=None, svn_passwd=None
):
removeDirectory(dest_dir)
@@ -82,63 +82,86 @@ class build(object):
return "%s.%s" % (self.version_maj, self.version_min)
def xzfilename(self):
return self.project_name + '_' + self.repository + '_' + getOS_Name() + '-' + self.version_str() + '.tar.xz'
return (
self.project_name
+ "_"
+ self.repository
+ "_"
+ getOS_Name()
+ "-"
+ self.version_str()
+ ".tar.xz"
)
def specname(self, specdir):
specname = 'ctc_%s_%s.spec' % ( self.repository, self.project_name )
specname = "ctc_%s_%s.spec" % (self.repository, self.project_name)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc_%s.spec' % ( self.repository )
specname = "ctc_%s.spec" % (self.repository)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'lts.spec'
specname = "lts.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc.spec'
specname = "ctc.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = '%s.spec' % self.project_name
specname = "%s.spec" % self.project_name
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
die( 'Unable to find a valid spec file in %s' % specdir )
die("Unable to find a valid spec file in %s" % specdir)
def copy_spec(self, svn_fullpath, dest_dir, spec_fullpath):
f = open( spec_fullpath, 'r' )
f = open(spec_fullpath, "r")
content = f.read()
f.close()
jenkins_build_tag = os.getenv("BUILD_TAG")
if jenkins_build_tag == None or len(jenkins_build_tag) == 0:
jenkins_build_tag = 'Not build with jenkins job'
jenkins_build_tag = "Not build with jenkins job"
cmake_flags = ""
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_maj)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_min)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (self.cmake_version_prefix, self.version_date)
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_maj,
)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_min,
)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_date,
)
cmake_flags += '-D_pname:STRING="%s" ' % (self.project_name)
jenkins_build_number = os.getenv("BUILD_NUMBER")
if jenkins_build_number != None:
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" '% (jenkins_build_number)
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" ' % (
jenkins_build_number
)
if self.cmake_build_flags:
cmake_flags += ' %s ' % self.cmake_build_flags
cmake_flags += " %s " % self.cmake_build_flags
cmake_flags += '-DCMAKE_BUILD_TYPE="%s" ' % self.buildtype
filename = 'project.%s.cfg' % self.project_name
cmake_flags += '-DTDS_PROJECT_CONFIG_FILE=%s ' % filename
filename = "project.%s.cfg" % self.project_name
cmake_flags += "-DTDS_PROJECT_CONFIG_FILE=%s " % filename
content = content.replace("@PROJECT@", self.project_name)
content = content.replace("@OS_SYSTEM@", getOS_Name())
@@ -152,7 +175,7 @@ class build(object):
content = content.replace("@JENKINS_BUILD_TAG@", jenkins_build_tag)
if not os.path.exists(dest_dir):
os.makedirs(dest_dir)
f = open( os.path.join( dest_dir, os.path.split( spec_fullpath )[1] ), 'w' )
f = open(os.path.join(dest_dir, os.path.split(spec_fullpath)[1]), "w")
f.write(content)
f.close()
@@ -160,7 +183,7 @@ class build(object):
config_files = []
for root, dirs, files in os.walk(folder):
for name in files:
if fnmatch.fnmatch(name, 'lts-cc*conf'):
if fnmatch.fnmatch(name, "lts-cc*conf"):
config_files.append(os.path.join(root, name))
for config_file in config_files:
@@ -172,7 +195,7 @@ class build(object):
if len(config.items(section)) == 0:
config.remove_section(section)
with open(config_file, 'w') as file:
with open(config_file, "w") as file:
config.write(file)
def pack_sources(self, src_dir, dest_dir):
@@ -194,26 +217,31 @@ class build(object):
system(cmd, sys.stdout) and die("while packing. cmd: %s" % command)
def usage():
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0]
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
0
]
def main():
b = build()
try:
opts, args = getopt.getopt(sys.argv[1:], "b:c:f:o:p:r:v:s:",
["base_dir=", "cmake_build_flags=", "cmake_version_prefix=", "filelist=", "output_dir=", "project_name=", "repository", "version=", "svn_path="])
opts, args = getopt.getopt(
sys.argv[1:],
"b:c:f:o:p:r:v:s:",
[
"base_dir=",
"cmake_build_flags=",
"cmake_version_prefix=",
"filelist=",
"output_dir=",
"project_name=",
"repository",
"version=",
"svn_path=",
],
)
except getopt.GetoptError as err:
print >> sys.stderr, err
usage()
@@ -239,7 +267,7 @@ def main():
if o in ("-r", "--repository"):
b.repository = a
if o in ("-v", "--version"):
version = a.split('.')
version = a.split(".")
try:
b.version_maj = version[0]
b.version_min = version[1]
@@ -253,30 +281,26 @@ def main():
svn_destdir = os.path.join("/tmp", b.source_dir_rel)
svn_server = "slssvn"
if svn_path.startswith('svn://'):
if svn_path.startswith("svn://"):
b.svn_fullpath = svn_path
else:
b.svn_fullpath = "svn://%s/%s/%s/" % (svn_server, b.repository, svn_path)
b.version_rev = getSvn_Release(b.svn_fullpath)
b.version_date = getSvn_Date(b.svn_fullpath)
b.init()
b.printOptions()
rpmbase_dir = os.path.join( os.getenv( "HOME" ), 'rpmbuild' )
rpmbase_dir = os.path.join(os.getenv("HOME"), "rpmbuild")
specdir = os.path.join(rpmbase_dir, "SPECS")
if not os.path.exists(specdir):
os.makedirs(specdir)
b.svn_export(b.svn_fullpath, svn_destdir)
b.clean_lts_cc_conf(svn_destdir + '/Lts/Projects')
b.clean_lts_cc_conf(svn_destdir + "/Lts/Projects")
specname = b.specname(os.path.join(svn_destdir, "specs"))
b.copy_spec( b.svn_fullpath,
specdir,
os.path.join( svn_destdir, "specs", specname ) )
b.copy_spec(b.svn_fullpath, specdir, os.path.join(svn_destdir, "specs", specname))
full_version = "%s.%s-%s" % (b.version_maj, b.version_min, b.version_rev)
b.printOptions()
@@ -285,23 +309,21 @@ def main():
removeDirectory(svn_destdir)
exec_rpmbuild(specdir, specname)
dstdir = os.path.join( b.output_dir, "%s-%s-%s" % ( b.project_name, b.repository, full_version ) )
filter = re.compile( "^.*%s\..*\.rpm$" % full_version )
moved_files = moveFilesToDir( rpmbase_dir,
dstdir,
filter,
True
dstdir = os.path.join(
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
)
filter = re.compile("^.*%s\..*\.rpm$" % full_version)
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
if rpm_filelist != None:
try:
f = open( rpm_filelist, 'w' )
f = open(rpm_filelist, "w")
for m in moved_files:
f.write( '%s\n' % m )
f.write("%s\n" % m)
f.close()
except:
die( 'Error creating fileslist %s' % rpm_filelist )
die("Error creating fileslist %s" % rpm_filelist)
if __name__ == "__main__":
main()
+92 -70
View File
@@ -2,11 +2,6 @@
# -*- coding: utf-8 -*-
import datetime
import getopt
import os
@@ -20,11 +15,12 @@ import fnmatch
loc = os.path.dirname(sys.argv[0])
loc = os.path.abspath(loc)
exec(compile(open('helpers.py').read(), 'helpers.py', 'exec'))
exec(compile(open("helpers.py").read(), "helpers.py", "exec"))
class build(object):
def __init__(self):
self.project_name = 'ctc'
self.project_name = "ctc"
self.base_dir = os.getcwd()
self.cmake_build_flags = None
self.output_dir = "/shd/CTC/TOOLS/TDS-rpmbuild/"
@@ -37,14 +33,14 @@ class build(object):
self.buildtype = os.getenv("CMAKE_BUILD_TYPE")
if self.buildtype == None or self.buildtype == "":
self.buildtype = 'RelWithDebInfo'
self.buildtype = "RelWithDebInfo"
self.cmake_generator = 'Unix Makefiles'
self.cmake_generator = "Unix Makefiles"
def init(self):
self.extfw_dir = "%s/EXTFW-inst/opt/EXTFW" % self.base_dir
if not os.path.exists(self.extfw_dir):
self.extfw_dir = '/opt/EXTFW'
self.extfw_dir = "/opt/EXTFW"
os.environ["EXTFW"] = self.extfw_dir
os.environ["CMAKE_PREFIX_PATH"] = self.extfw_dir
@@ -56,14 +52,18 @@ class build(object):
print(" Using buildtype: %s" % self.buildtype)
print(" Project name: %s" % self.project_name)
print(" SVN Path: %s" % self.svn_fullpath)
print(" Version: %s.%s-%s" % ( self.version_maj, self.version_min, self.version_rev ))
print(
" Version: %s.%s-%s"
% (self.version_maj, self.version_min, self.version_rev)
)
print(" Jenkins build number: %s" % os.getenv("BUILD_NUMBER"))
print(" Date: %s" % self.version_date)
print("")
time.sleep(2)
def svn_export( self, svn_path, dest_dir, svn_revision = "HEAD", svn_user = None, svn_passwd = None ):
def svn_export(
self, svn_path, dest_dir, svn_revision="HEAD", svn_user=None, svn_passwd=None
):
removeDirectory(dest_dir)
@@ -82,61 +82,84 @@ class build(object):
return "%s.%s" % (self.version_maj, self.version_min)
def xzfilename(self):
return self.project_name + '_' + self.repository + '_' + getOS_Name() + '-' + self.version_str() + '.tar.xz'
return (
self.project_name
+ "_"
+ self.repository
+ "_"
+ getOS_Name()
+ "-"
+ self.version_str()
+ ".tar.xz"
)
def specname(self, specdir):
specname = 'ctc_%s_%s.spec' % ( self.repository, self.project_name )
specname = "ctc_%s_%s.spec" % (self.repository, self.project_name)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc_%s.spec' % ( self.repository )
specname = "ctc_%s.spec" % (self.repository)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'lts15.2.spec'
specname = "lts15.2.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc.spec'
specname = "ctc.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = '%s.spec' % self.project_name
specname = "%s.spec" % self.project_name
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
die( 'Unable to find a valid spec file in %s' % specdir )
die("Unable to find a valid spec file in %s" % specdir)
def copy_spec(self, svn_fullpath, dest_dir, spec_fullpath):
f = open( spec_fullpath, 'r' )
f = open(spec_fullpath, "r")
content = f.read()
f.close()
jenkins_build_tag = os.getenv("BUILD_TAG")
if jenkins_build_tag == None or len(jenkins_build_tag) == 0:
jenkins_build_tag = 'Not build with jenkins job'
jenkins_build_tag = "Not build with jenkins job"
cmake_flags = ""
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_maj)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_min)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (self.cmake_version_prefix, self.version_date)
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_maj,
)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_min,
)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_date,
)
jenkins_build_number = os.getenv("BUILD_NUMBER")
if jenkins_build_number != None:
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" '% (jenkins_build_number)
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" ' % (
jenkins_build_number
)
if self.cmake_build_flags:
cmake_flags += ' %s ' % self.cmake_build_flags
cmake_flags += " %s " % self.cmake_build_flags
cmake_flags += '-DCMAKE_BUILD_TYPE="%s" ' % self.buildtype
filename = 'project.%s.cfg' % self.project_name
cmake_flags += '-DTDS_PROJECT_CONFIG_FILE=%s ' % filename
filename = "project.%s.cfg" % self.project_name
cmake_flags += "-DTDS_PROJECT_CONFIG_FILE=%s " % filename
content = content.replace("@PROJECT@", self.project_name)
content = content.replace("@OS_SYSTEM@", getOS_Name())
@@ -150,7 +173,7 @@ class build(object):
content = content.replace("@JENKINS_BUILD_TAG@", jenkins_build_tag)
if not os.path.exists(dest_dir):
os.makedirs(dest_dir)
f = open( os.path.join( dest_dir, os.path.split( spec_fullpath )[1] ), 'w' )
f = open(os.path.join(dest_dir, os.path.split(spec_fullpath)[1]), "w")
f.write(content)
f.close()
@@ -158,7 +181,7 @@ class build(object):
config_files = []
for root, dirs, files in os.walk(folder):
for name in files:
if fnmatch.fnmatch(name, 'lts-cc*conf'):
if fnmatch.fnmatch(name, "lts-cc*conf"):
config_files.append(os.path.join(root, name))
for config_file in config_files:
@@ -170,7 +193,7 @@ class build(object):
if len(config.items(section)) == 0:
config.remove_section(section)
with open(config_file, 'w') as file:
with open(config_file, "w") as file:
config.write(file)
def pack_sources(self, src_dir, dest_dir):
@@ -192,26 +215,31 @@ class build(object):
system(cmd, sys.stdout) and die("while packing. cmd: %s" % command)
def usage():
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0]
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
0
]
def main():
b = build()
try:
opts, args = getopt.getopt(sys.argv[1:], "b:c:f:o:p:r:v:s:",
["base_dir=", "cmake_build_flags=", "cmake_version_prefix=", "filelist=", "output_dir=", "project_name=", "repository", "version=", "svn_path="])
opts, args = getopt.getopt(
sys.argv[1:],
"b:c:f:o:p:r:v:s:",
[
"base_dir=",
"cmake_build_flags=",
"cmake_version_prefix=",
"filelist=",
"output_dir=",
"project_name=",
"repository",
"version=",
"svn_path=",
],
)
except getopt.GetoptError as err:
print >> sys.stderr, err
usage()
@@ -237,7 +265,7 @@ def main():
if o in ("-r", "--repository"):
b.repository = a
if o in ("-v", "--version"):
version = a.split('.')
version = a.split(".")
try:
b.version_maj = version[0]
b.version_min = version[1]
@@ -251,30 +279,26 @@ def main():
svn_destdir = os.path.join("/tmp", b.source_dir_rel)
svn_server = "slssvn"
if svn_path.startswith('svn://'):
if svn_path.startswith("svn://"):
b.svn_fullpath = svn_path
else:
b.svn_fullpath = "svn://%s/%s/%s/" % (svn_server, b.repository, svn_path)
b.version_rev = getSvn_Release(b.svn_fullpath)
b.version_date = getSvn_Date(b.svn_fullpath)
b.init()
b.printOptions()
rpmbase_dir = os.path.join( os.getenv( "HOME" ), 'rpmbuild' )
rpmbase_dir = os.path.join(os.getenv("HOME"), "rpmbuild")
specdir = os.path.join(rpmbase_dir, "SPECS")
if not os.path.exists(specdir):
os.makedirs(specdir)
b.svn_export(b.svn_fullpath, svn_destdir)
b.clean_lts_cc_conf(svn_destdir + '/Lts/Projects')
b.clean_lts_cc_conf(svn_destdir + "/Lts/Projects")
specname = b.specname(os.path.join(svn_destdir, "specs"))
b.copy_spec( b.svn_fullpath,
specdir,
os.path.join( svn_destdir, "specs", specname ) )
b.copy_spec(b.svn_fullpath, specdir, os.path.join(svn_destdir, "specs", specname))
full_version = "%s.%s-%s" % (b.version_maj, b.version_min, b.version_rev)
b.printOptions()
@@ -283,23 +307,21 @@ def main():
removeDirectory(svn_destdir)
exec_rpmbuild(specdir, specname)
dstdir = os.path.join( b.output_dir, "%s-%s-%s" % ( b.project_name, b.repository, full_version ) )
filter = re.compile( "^.*%s\..*\.rpm$" % full_version )
moved_files = moveFilesToDir( rpmbase_dir,
dstdir,
filter,
True
dstdir = os.path.join(
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
)
filter = re.compile("^.*%s\..*\.rpm$" % full_version)
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
if rpm_filelist != None:
try:
f = open( rpm_filelist, 'w' )
f = open(rpm_filelist, "w")
for m in moved_files:
f.write( '%s\n' % m )
f.write("%s\n" % m)
f.close()
except:
die( 'Error creating fileslist %s' % rpm_filelist )
die("Error creating fileslist %s" % rpm_filelist)
if __name__ == "__main__":
main()
+92 -64
View File
@@ -14,11 +14,12 @@ import fnmatch
loc = os.path.dirname(sys.argv[0])
loc = os.path.abspath(loc)
exec(compile(open('helpers.py').read(), 'helpers.py', 'exec'))
exec(compile(open("helpers.py").read(), "helpers.py", "exec"))
class build(object):
def __init__(self):
self.project_name = 'ctc'
self.project_name = "ctc"
self.base_dir = os.getcwd()
self.cmake_build_flags = None
self.output_dir = "/shd/CTC/TOOLS/TDS-rpmbuild/"
@@ -30,14 +31,14 @@ class build(object):
self.buildtype = os.getenv("CMAKE_BUILD_TYPE")
if self.buildtype == None or self.buildtype == "":
self.buildtype = 'RelWithDebInfo'
self.buildtype = "RelWithDebInfo"
self.cmake_generator = 'Unix Makefiles'
self.cmake_generator = "Unix Makefiles"
def init(self):
self.extfw_dir = "%s/EXTFW-inst/opt/EXTFW" % self.base_dir
if not os.path.exists(self.extfw_dir):
self.extfw_dir = '/opt/EXTFW'
self.extfw_dir = "/opt/EXTFW"
os.environ["EXTFW"] = self.extfw_dir
os.environ["CMAKE_PREFIX_PATH"] = self.extfw_dir
@@ -48,7 +49,10 @@ class build(object):
print(" Using extfw dir: %s" % self.extfw_dir)
print(" Using buildtype: %s" % self.buildtype)
print(" Project name: %s" % self.project_name)
print(" Version: %s.%s-%s" % ( self.version_maj, self.version_min, self.version_rev ))
print(
" Version: %s.%s-%s"
% (self.version_maj, self.version_min, self.version_rev)
)
print(" GitLab-CI build number: %s" % os.getenv("BUILD_NUMBER"))
print(" Date: %s" % self.version_date)
print("")
@@ -58,65 +62,87 @@ class build(object):
return "%s.%s" % (self.version_maj, self.version_min)
def xzfilename(self):
return self.project_name + '_' + self.repository + '_' + getOS_Name() + '-' + self.version_str() + '.tar.xz'
return (
self.project_name
+ "_"
+ self.repository
+ "_"
+ getOS_Name()
+ "-"
+ self.version_str()
+ ".tar.xz"
)
def specname(self, specdir):
specname = 'ctc_%s_%s.spec' % ( self.repository, self.project_name )
specname = "ctc_%s_%s.spec" % (self.repository, self.project_name)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc_%s.spec' % ( self.repository )
specname = "ctc_%s.spec" % (self.repository)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'lts.spec'
specname = 'lts' + str(os.getenv( "OS_VERSION" )) + '.spec'
specname = "lts.spec"
specname = "lts" + str(os.getenv("OS_VERSION")) + ".spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc.spec'
specname = "ctc.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = '%s.spec' % self.project_name
specname = "%s.spec" % self.project_name
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
die( 'Unable to find a valid spec file in %s' % specdir )
die("Unable to find a valid spec file in %s" % specdir)
def copy_spec(self, dest_dir, spec_fullpath):
f = open( spec_fullpath, 'r' )
f = open(spec_fullpath, "r")
content = f.read()
f.close()
jenkins_build_tag = os.getenv("BUILD_TAG")
if jenkins_build_tag == None or len(jenkins_build_tag) == 0:
jenkins_build_tag = 'Not build with jenkins job'
jenkins_build_tag = "Not build with jenkins job"
cmake_flags = ""
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_maj)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_min)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (self.cmake_version_prefix, self.version_date)
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_maj,
)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_min,
)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_date,
)
cmake_flags += '-D_pname:STRING="%s" ' % (self.project_name)
jenkins_build_number = os.getenv("BUILD_NUMBER")
if jenkins_build_number != None:
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" '% (jenkins_build_number)
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" ' % (
jenkins_build_number
)
if self.cmake_build_flags:
cmake_flags += ' %s ' % self.cmake_build_flags
cmake_flags += " %s " % self.cmake_build_flags
cmake_flags += '-DCMAKE_BUILD_TYPE="%s" ' % self.buildtype
filename = 'project.%s.cfg' % self.project_name
cmake_flags += '-DTDS_PROJECT_CONFIG_FILE=%s ' % filename
filename = "project.%s.cfg" % self.project_name
cmake_flags += "-DTDS_PROJECT_CONFIG_FILE=%s " % filename
content = content.replace("@PROJECT@", self.project_name)
content = content.replace("@OS_SYSTEM@", getOS_Name())
@@ -130,7 +156,7 @@ class build(object):
content = content.replace("@JENKINS_BUILD_TAG@", jenkins_build_tag)
if not os.path.exists(dest_dir):
os.makedirs(dest_dir)
f = open( os.path.join( dest_dir, os.path.split( spec_fullpath )[1] ), 'w' )
f = open(os.path.join(dest_dir, os.path.split(spec_fullpath)[1]), "w")
f.write(content)
f.close()
@@ -139,7 +165,7 @@ class build(object):
config_files = []
for root, dirs, files in os.walk(folder):
for name in files:
if fnmatch.fnmatch(name, 'lts-cc*conf'):
if fnmatch.fnmatch(name, "lts-cc*conf"):
config_files.append(os.path.join(root, name))
for config_file in config_files:
@@ -151,7 +177,7 @@ class build(object):
if len(config.items(section)) == 0:
config.remove_section(section)
with open(config_file, 'w') as file:
with open(config_file, "w") as file:
config.write(file)
def pack_sources(self, src_dir, dest_dir):
@@ -175,26 +201,30 @@ class build(object):
system(cmd, sys.stdout) and die("while packing. cmd: %s" % command)
def usage():
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0]
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
0
]
def main():
b = build()
try:
opts, args = getopt.getopt(sys.argv[1:], "b:c:f:o:p:r:v:",
["base_dir=", "cmake_build_flags=", "cmake_version_prefix=", "filelist=", "output_dir=", "project_name=", "repository=", "version="])
opts, args = getopt.getopt(
sys.argv[1:],
"b:c:f:o:p:r:v:",
[
"base_dir=",
"cmake_build_flags=",
"cmake_version_prefix=",
"filelist=",
"output_dir=",
"project_name=",
"repository=",
"version=",
],
)
except getopt.GetoptError as err:
print >> sys.stderr, err
usage()
@@ -219,52 +249,50 @@ def main():
if o in ("-r", "--repository"):
b.repository = a
if o in ("-v", "--version"):
version = a.split('.')
version = a.split(".")
try:
b.version_maj = version[0]
b.version_min = version[1]
except:
die("Invalid version format (maj.min): %s" % a)
b.version_date = os.getenv("VERSION_DATE")
b.init()
b.printOptions()
rpmbase_dir = '/shd/CTC/TOOLS/rpmbuild'
rpmbase_dir = "/shd/CTC/TOOLS/rpmbuild"
project_base_dir = os.getenv("WORKSPACE")
specdir = os.path.join(rpmbase_dir, "SPECS")
if not os.path.exists(specdir):
os.makedirs(specdir)
b.clean_lts_cc_conf(os.path.join(project_base_dir, 'legatus', 'Lts', 'Projects'))
specname = b.specname(os.path.join(project_base_dir,'legatus', 'specs'))
b.copy_spec( specdir, os.path.join(project_base_dir, 'legatus', "specs", specname ))
b.clean_lts_cc_conf(os.path.join(project_base_dir, "legatus", "Lts", "Projects"))
specname = b.specname(os.path.join(project_base_dir, "legatus", "specs"))
b.copy_spec(specdir, os.path.join(project_base_dir, "legatus", "specs", specname))
full_version = "%s.%s-%s" % (b.version_maj, b.version_min, b.version_rev)
b.printOptions()
b.pack_sources( os.path.join(project_base_dir, 'legatus'), os.path.join( rpmbase_dir, "SOURCES" ) )
b.pack_sources(
os.path.join(project_base_dir, "legatus"), os.path.join(rpmbase_dir, "SOURCES")
)
exec_rpmbuild(specdir, specname)
dstdir = os.path.join( b.output_dir, "%s-%s-%s" % ( b.project_name, b.repository, full_version ) )
filter = re.compile( "^.*%s\..*\.rpm$" % full_version )
moved_files = moveFilesToDir( rpmbase_dir,
dstdir,
filter,
True
dstdir = os.path.join(
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
)
filter = re.compile("^.*%s\..*\.rpm$" % full_version)
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
if rpm_filelist != None:
try:
f = open( rpm_filelist, 'w' )
f = open(rpm_filelist, "w")
for m in moved_files:
f.write( '%s\n' % m )
f.write("%s\n" % m)
f.close()
except:
die( 'Error creating fileslist %s' % rpm_filelist )
die("Error creating fileslist %s" % rpm_filelist)
if __name__ == "__main__":
main()
+91 -69
View File
@@ -2,11 +2,6 @@
# -*- coding: utf-8 -*-
import datetime
import getopt
import os
@@ -20,11 +15,12 @@ import fnmatch
loc = os.path.dirname(sys.argv[0])
loc = os.path.abspath(loc)
exec(compile(open('helpers.py').read(), 'helpers.py', 'exec'))
exec(compile(open("helpers.py").read(), "helpers.py", "exec"))
class build(object):
def __init__(self):
self.project_name = 'ctc'
self.project_name = "ctc"
self.base_dir = os.getcwd()
self.cmake_build_flags = None
self.output_dir = "/shd/CTC/TOOLS/TDS-rpmbuild/"
@@ -36,14 +32,14 @@ class build(object):
self.buildtype = os.getenv("CMAKE_BUILD_TYPE")
if self.buildtype == None or self.buildtype == "":
self.buildtype = 'RelWithDebInfo'
self.buildtype = "RelWithDebInfo"
self.cmake_generator = 'Unix Makefiles'
self.cmake_generator = "Unix Makefiles"
def init(self):
self.extfw_dir = "%s/EXTFW-inst/opt/EXTFW" % self.base_dir
if not os.path.exists(self.extfw_dir):
self.extfw_dir = '/opt/EXTFW'
self.extfw_dir = "/opt/EXTFW"
os.environ["EXTFW"] = self.extfw_dir
os.environ["CMAKE_PREFIX_PATH"] = self.extfw_dir
@@ -54,14 +50,18 @@ class build(object):
print(" Using extfw dir: %s" % self.extfw_dir)
print(" Using buildtype: %s" % self.buildtype)
print(" Project name: %s" % self.project_name)
print(" Version: %s.%s-%s" % ( self.version_maj, self.version_min, self.version_rev ))
print(
" Version: %s.%s-%s"
% (self.version_maj, self.version_min, self.version_rev)
)
print(" GitLab-CI build number: %s" % os.getenv("BUILD_NUMBER"))
print(" Date: %s" % self.version_date)
print("")
time.sleep(2)
def svn_export( self, svn_path, dest_dir, svn_revision = "HEAD", svn_user = None, svn_passwd = None ):
def svn_export(
self, svn_path, dest_dir, svn_revision="HEAD", svn_user=None, svn_passwd=None
):
removeDirectory(dest_dir)
@@ -80,64 +80,86 @@ class build(object):
return "%s.%s" % (self.version_maj, self.version_min)
def xzfilename(self):
return self.project_name + '_' + self.repository + '_' + getOS_Name() + '-' + self.version_str() + '.tar.xz'
return (
self.project_name
+ "_"
+ self.repository
+ "_"
+ getOS_Name()
+ "-"
+ self.version_str()
+ ".tar.xz"
)
def specname(self, specdir):
specname = 'ctc_%s_%s.spec' % ( self.repository, self.project_name )
specname = "ctc_%s_%s.spec" % (self.repository, self.project_name)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc_%s.spec' % ( self.repository )
specname = "ctc_%s.spec" % (self.repository)
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ltsSVOnly.spec'
specname = "ltsSVOnly.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = 'ctc.spec'
specname = "ctc.spec"
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
specname = '%s.spec' % self.project_name
specname = "%s.spec" % self.project_name
debug("specname: %s" % os.path.join(specdir, specname))
if os.path.exists(os.path.join(specdir, specname)):
return specname
die( 'Unable to find a valid spec file in %s' % specdir )
die("Unable to find a valid spec file in %s" % specdir)
def copy_spec(self, dest_dir, spec_fullpath):
f = open( spec_fullpath, 'r' )
f = open(spec_fullpath, "r")
content = f.read()
f.close()
jenkins_build_tag = os.getenv("BUILD_TAG")
if jenkins_build_tag == None or len(jenkins_build_tag) == 0:
jenkins_build_tag = 'Not build with jenkins job'
jenkins_build_tag = "Not build with jenkins job"
cmake_flags = ""
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_maj)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (self.cmake_version_prefix, self.version_min)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (self.cmake_version_prefix, self.version_rev)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (self.cmake_version_prefix, self.version_date)
cmake_flags += '-D%s_VERSION_MAJOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_maj,
)
cmake_flags += '-D%s_VERSION_MINOR:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_min,
)
cmake_flags += '-D%s_VERSION_REV:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_PATCH:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_rev,
)
cmake_flags += '-D%s_VERSION_DATE:STRING="%s" ' % (
self.cmake_version_prefix,
self.version_date,
)
cmake_flags += '-D_pname:STRING="%s" ' % (self.project_name)
jenkins_build_number = os.getenv("BUILD_NUMBER")
if jenkins_build_number != None:
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" '% (jenkins_build_number)
cmake_flags += '-DJENKINS_BUILD_NUMBER:STRING="%s" ' % (
jenkins_build_number
)
if self.cmake_build_flags:
cmake_flags += ' %s ' % self.cmake_build_flags
cmake_flags += " %s " % self.cmake_build_flags
cmake_flags += '-DCMAKE_BUILD_TYPE="%s" ' % self.buildtype
filename = 'project.%s.cfg' % self.project_name
cmake_flags += '-DTDS_PROJECT_CONFIG_FILE=%s ' % filename
filename = "project.%s.cfg" % self.project_name
cmake_flags += "-DTDS_PROJECT_CONFIG_FILE=%s " % filename
content = content.replace("@PROJECT@", self.project_name)
content = content.replace("@OS_SYSTEM@", getOS_Name())
@@ -151,7 +173,7 @@ class build(object):
content = content.replace("@JENKINS_BUILD_TAG@", jenkins_build_tag)
if not os.path.exists(dest_dir):
os.makedirs(dest_dir)
f = open( os.path.join( dest_dir, os.path.split( spec_fullpath )[1] ), 'w' )
f = open(os.path.join(dest_dir, os.path.split(spec_fullpath)[1]), "w")
f.write(content)
f.close()
@@ -160,7 +182,7 @@ class build(object):
config_files = []
for root, dirs, files in os.walk(folder):
for name in files:
if fnmatch.fnmatch(name, 'lts-cc*conf'):
if fnmatch.fnmatch(name, "lts-cc*conf"):
config_files.append(os.path.join(root, name))
for config_file in config_files:
@@ -172,7 +194,7 @@ class build(object):
if len(config.items(section)) == 0:
config.remove_section(section)
with open(config_file, 'w') as file:
with open(config_file, "w") as file:
config.write(file)
def pack_sources(self, src_dir, dest_dir):
@@ -185,7 +207,6 @@ class build(object):
info("Packing pack %s" % (os.path.split(src_dir)[1]))
info("--------------------------------")
removeDirectory(xzfilename)
if os.path.exists(xzfilename):
os.remove(xzfilename)
@@ -197,27 +218,31 @@ class build(object):
system(cmd, sys.stdout) and die("while packing. cmd: %s" % command)
def usage():
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[0]
print >> sys.stdout, "Usage: %s [-b <base_dir> ] -f <filelist> -o <output_dir> -r <repository> -v <version> -s <svn_path>" % sys.argv[
0
]
def main():
b = build()
try:
opts, args = getopt.getopt(sys.argv[1:], "b:c:f:o:p:r:v:s:",
["base_dir=", "cmake_build_flags=", "cmake_version_prefix=", "filelist=", "output_dir=", "project_name=", "repository", "version=", "svn_path="])
opts, args = getopt.getopt(
sys.argv[1:],
"b:c:f:o:p:r:v:s:",
[
"base_dir=",
"cmake_build_flags=",
"cmake_version_prefix=",
"filelist=",
"output_dir=",
"project_name=",
"repository",
"version=",
"svn_path=",
],
)
except getopt.GetoptError as err:
print >> sys.stderr, err
usage()
@@ -243,26 +268,25 @@ def main():
if o in ("-r", "--repository"):
b.repository = a
if o in ("-v", "--version"):
version = a.split('.')
version = a.split(".")
try:
b.version_maj = version[0]
b.version_min = version[1]
except:
die("Invalid version format (maj.min): %s" % a)
b.version_date = os.getenv("VERSION_DATE")
b.init()
b.printOptions()
rpmbase_dir = '/shd/CTC/TOOLS/rpmbuild'
rpmbase_dir = "/shd/CTC/TOOLS/rpmbuild"
project_base_dir = os.getenv("PROJECT_BASE_DIR")
specdir = os.path.join(rpmbase_dir, "SPECS")
if not os.path.exists(specdir):
os.makedirs(specdir)
b.clean_lts_cc_conf(os.path.join(project_base_dir, 'Lts', 'Projects'))
specname = b.specname(os.path.join(project_base_dir, 'specs'))
b.clean_lts_cc_conf(os.path.join(project_base_dir, "Lts", "Projects"))
specname = b.specname(os.path.join(project_base_dir, "specs"))
b.copy_spec(specdir, os.path.join(project_base_dir, "specs", specname))
full_version = "%s.%s-%s" % (b.version_maj, b.version_min, b.version_rev)
@@ -271,23 +295,21 @@ def main():
b.pack_sources(project_base_dir, os.path.join(rpmbase_dir, "SOURCES"))
exec_rpmbuild(specdir, specname)
dstdir = os.path.join( b.output_dir, "%s-%s-%s" % ( b.project_name, b.repository, full_version ) )
filter = re.compile( "^.*%s\..*\.rpm$" % full_version )
moved_files = moveFilesToDir( rpmbase_dir,
dstdir,
filter,
True
dstdir = os.path.join(
b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version)
)
filter = re.compile("^.*%s\..*\.rpm$" % full_version)
moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True)
if rpm_filelist != None:
try:
f = open( rpm_filelist, 'w' )
f = open(rpm_filelist, "w")
for m in moved_files:
f.write( '%s\n' % m )
f.write("%s\n" % m)
f.close()
except:
die( 'Error creating fileslist %s' % rpm_filelist )
die("Error creating fileslist %s" % rpm_filelist)
if __name__ == "__main__":
main()