rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix %setup now the scripts have been cleaned up.

Browse Source
This commit is contained in:
Chris Johns 2013-03-01 10:01:11 +11:00
parent 4754f1e747
commit 7618a74c62
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source-builder/sb/build.py
View File

@ -285,10 +285,10 @@ class build:
source_tag = 0 source_tag = 0
quiet = False quiet = False
unpack_default_source = True unpack_default_source = True
unpack_before_chdir = True
delete_before_unpack = True delete_before_unpack = True
create_dir = False create_dir = False
name = None name = None
unpack_before_chdir = True
for o in opts: for o in opts:
if o[0] == '-q': if o[0] == '-q':
quiet = True quiet = True
@ -325,7 +325,7 @@ class build:
# #
# If -a? then change directory before unpacking. # If -a? then change directory before unpacking.
# #
if not unpack_before_chdir: if not unpack_before_chdir and create_dir:
self.script.append(self.config.expand('cd ' + name)) self.script.append(self.config.expand('cd ' + name))
# #
# Unpacking the source. Note, treated the same as -a0. # Unpacking the source. Note, treated the same as -a0.
@ -336,11 +336,9 @@ class build:
raise error.general('no setup source0 tag found') raise error.general('no setup source0 tag found')
self.script.append(self.config.expand(source0['script'])) self.script.append(self.config.expand(source0['script']))
self.script.append(self.config.expand(source['script'])) self.script.append(self.config.expand(source['script']))
if unpack_before_chdir: if unpack_before_chdir and not create_dir:
self.script.append(self.config.expand('cd ' + name)) self.script.append(self.config.expand('cd ' + name))
self.script.append(self.config.expand('%{__setup_post}')) self.script.append(self.config.expand('%{__setup_post}'))
if create_dir:
self.script.append(self.config.expand('cd ..'))
def run(self, command, shell_opts = '', cwd = None): def run(self, command, shell_opts = '', cwd = None):
e = execute.capture_execution(log = log.default, dump = self.opts.quiet()) e = execute.capture_execution(log = log.default, dump = self.opts.quiet())