Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use old *_build folder in case of a new branch #34

Merged
merged 5 commits into from
Jul 10, 2013

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented Jul 4, 2013

No description provided.

@daschuer
Copy link
Member Author

daschuer commented Jul 9, 2013

This branch avoids a full rebuild for new branches, in a ready build working copy.

# no chached build dir found, assume this is a branch from the old branch
# if not, no problem because scons will rebuild all chaned files in any case
# copy the old_virtual_dir back
if old_virtual_build_dir:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will fail with NameError if .sconsign.branch doesn't exist.

@daschuer
Copy link
Member Author

daschuer commented Jul 9, 2013

Thank you @rryan. I have issued fixes for all comments.

# no chached build dir found, assume this is a branch from the old branch
# if not, no problem because scons will rebuild all chaned files in any case
# copy the old_virtual_dir back
if sconsign_branch:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if and the two nested ifs (if old_virtual_build_dir and old_virtual_sconsign_file) seem redundant since old_virtual_build_dir will not evaluate to True unless it is a non-empty string and it's only a non-empty string if sconsign_branch is non-empty. Both could probably be removed becuase os.path.isdir('') and isfile('') will return false.

@rryan
Copy link
Member

rryan commented Jul 9, 2013

LGTM, thanks for the changes!

daschuer added a commit that referenced this pull request Jul 10, 2013
Use old *_build folder in case of a new branch
@daschuer daschuer merged commit 8460da1 into mixxxdj:master Jul 10, 2013
@daschuer daschuer mentioned this pull request Dec 28, 2014
@daschuer daschuer mentioned this pull request Jun 11, 2018
11 tasks
daschuer added a commit that referenced this pull request Dec 12, 2018
QCollator: Extensions and minor improvements
Swiftb0y pushed a commit to Swiftb0y/mixxx that referenced this pull request Nov 8, 2019
AutoDJProcessorTest.FadeToDeck2_Long_Transition fix
Holzhaus pushed a commit to Holzhaus/mixxx that referenced this pull request Aug 23, 2020
Holzhaus pushed a commit to Holzhaus/mixxx that referenced this pull request Aug 23, 2020
m0dB pushed a commit to m0dB/mixxx that referenced this pull request Jan 21, 2024
Changed download links to 2.1.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants