Removes comments and refs
This commit is contained in:
1 parent
d6584b3519
commit
6bb80ee9c8
12 files changed
+215
-215
No files matched your search
+18
-18
@@ -11,7 +11,7 @@ import time
|
||||
import ConfigParser
|
||||
import fnmatch
|
||||
|
||||
# helper functions
|
||||
|
||||
loc = os.path.dirname( sys.argv[0] )
|
||||
loc = os.path.abspath( loc )
|
||||
exec(compile(open('helpers.py').read(), 'helpers.py', 'exec'))
|
||||
@@ -85,17 +85,17 @@ class build(object):
|
||||
die( 'Unable to find a valid spec file in %s' % specdir )
|
||||
|
||||
def copy_spec( self, dest_dir, spec_fullpath ):
|
||||
# copy spec to build
|
||||
|
||||
f = open( spec_fullpath, 'r' )
|
||||
content = f.read()
|
||||
f.close()
|
||||
|
||||
# Jenkins Build Tag (wird von Jenkins gesetzt wenn darüber gebaut wird)
|
||||
|
||||
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'
|
||||
|
||||
# Versionsinformationen übergeben
|
||||
|
||||
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)
|
||||
@@ -112,7 +112,7 @@ class build(object):
|
||||
if self.cmake_build_flags:
|
||||
cmake_flags += ' %s ' % self.cmake_build_flags
|
||||
|
||||
# und den Buildtype
|
||||
|
||||
cmake_flags += '-DCMAKE_BUILD_TYPE="%s" ' % self.buildtype
|
||||
|
||||
filename = 'project.%s.cfg' % self.project_name
|
||||
@@ -164,8 +164,8 @@ class build(object):
|
||||
info( "Packing pack %s" % ( os.path.split( src_dir )[1]) )
|
||||
info( "--------------------------------" )
|
||||
|
||||
removeDirectory( xzfilename ) # falls es ein directory ist
|
||||
if os.path.exists( xzfilename ): # falls es eine datei ist
|
||||
removeDirectory( xzfilename )
|
||||
if os.path.exists( xzfilename ):
|
||||
os.remove( xzfilename )
|
||||
if not os.path.exists( dest_dir ):
|
||||
os.makedirs( dest_dir )
|
||||
@@ -174,16 +174,16 @@ class build(object):
|
||||
cmd = "tar cJf %s %s" % ( xzfilename, os.path.split( src_dir )[1] )
|
||||
system( cmd, sys.stdout ) and die( "while packing. cmd: %s" % command )
|
||||
|
||||
# svn export ${svn} ${base}
|
||||
|
||||
|
||||
# fixup_rde_header ${base} "c"
|
||||
# fixup_rde_header ${base} "h"
|
||||
# fixup_rde_header ${base} "cpp"
|
||||
# fixup_rde_header ${base} "hpp"
|
||||
# fixup_rde_header ${base} "txt"
|
||||
# fixup_rde_header ${base} "py"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# cp ${base}/specs/ctc.spec /usr/src/packages/SPECS/
|
||||
|
||||
|
||||
|
||||
def usage():
|
||||
@@ -226,14 +226,14 @@ def main():
|
||||
except:
|
||||
die( "Invalid version format (maj.min): %s" % a )
|
||||
|
||||
# b.check_rpm("ctc_EXTFW_%s" % os_str)
|
||||
|
||||
|
||||
b.version_date = os.getenv( "VERSION_DATE" )
|
||||
b.init()
|
||||
b.printOptions()
|
||||
|
||||
rpmbase_dir = '/shd/CTC/TOOLS/rpmbuild'
|
||||
# project_base_dir = '/builds/projects-domain-live/tds'
|
||||
|
||||
project_base_dir = os.getenv( "WORKSPACE" )
|
||||
specdir = os.path.join( rpmbase_dir, "SPECS" )
|
||||
if not os.path.exists(specdir):
|
||||
@@ -247,7 +247,7 @@ def main():
|
||||
|
||||
b.pack_sources( os.path.join(project_base_dir, 'legatus'), os.path.join( rpmbase_dir, "SOURCES" ) )
|
||||
exec_rpmbuild( specdir, specname )
|
||||
# move rpms to FOO-1.2-345
|
||||
|
||||
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,
|
||||
|
||||
Reference in new issue
Block a user