mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Dont rebuild extensions during a rebase
This commit is contained in:
parent
fc8aa605a3
commit
5481f1f820
@ -18,6 +18,7 @@ if flags == '1': # A branch checkout
|
|||||||
|
|
||||||
prev_branch, cur_branch = map(get_branch_name, (prev_rev, current_rev))
|
prev_branch, cur_branch = map(get_branch_name, (prev_rev, current_rev))
|
||||||
is_qt5_transition = 'qt5' in (prev_branch, cur_branch)
|
is_qt5_transition = 'qt5' in (prev_branch, cur_branch)
|
||||||
|
print ('Transitioning from', prev_branch, 'to', cur_branch)
|
||||||
|
|
||||||
if is_qt5_transition:
|
if is_qt5_transition:
|
||||||
# Remove compiled .ui files as they must be re-generated
|
# Remove compiled .ui files as they must be re-generated
|
||||||
@ -27,11 +28,12 @@ if flags == '1': # A branch checkout
|
|||||||
os.remove(os.path.join(dirpath, f))
|
os.remove(os.path.join(dirpath, f))
|
||||||
|
|
||||||
# Rebuild PyQt extensions
|
# Rebuild PyQt extensions
|
||||||
for ext in ('progress_indicator',):
|
if not os.path.exists('.git/rebase-merge'): # Dont rebuild if we are rebasing
|
||||||
extdir = os.path.join('build', 'pyqt', ext)
|
for ext in ('progress_indicator',):
|
||||||
if os.path.exists(extdir):
|
extdir = os.path.join('build', 'pyqt', ext)
|
||||||
shutil.rmtree(extdir)
|
if os.path.exists(extdir):
|
||||||
subprocess.check_call(['python', 'setup.py', 'build', '--only', ext])
|
shutil.rmtree(extdir)
|
||||||
|
subprocess.check_call(['python', 'setup.py', 'build', '--only', ext])
|
||||||
|
|
||||||
subprocess.check_call(['python', 'setup.py', 'gui', '--summary'])
|
subprocess.check_call(['python', 'setup.py', 'gui', '--summary'])
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user