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

TIMOB-10226: BlackBerry: Build script trigger wrong build type #118

Merged

Conversation

alexandergalstyan
Copy link

Reviewers: JP

Description:
"blackberry\builder.py run -t device" command triggers Device-Release build, while should trigger Device-Debug.
Setup the VARIANT_LIST macro (defined from qrules.mk) within make command to direct it to the proper build.

Changelog:

  • Add the VARIANTLIST to make command.

Test cases:

  • Build the mobile sdk.
  • Create project using project.py.
  • Build it with builder.py using different build types (simulator, device, deploy).
  • Make sure it builds with correct build type.

NOTE: Will fail to build with build type 'deploy' due to known issue with R6.

Reviewers: JP

Changelog:
- Add the VARIANTLIST to make command.

Test cases:
- Build the mobile sdk.
- Create project using project.py.
- Build it with builder.py using different build types (simulator, device, deploy).
- Make sure it builds with correct build type.

NOTE: Will fail to build with build type 'deploy' due to known issue with R6.
assert os.path.exists(project)
templateDir = os.path.abspath(os.path.dirname(sys._getframe(0).f_code.co_filename))
cpuList = 'CPULIST=' + cpu
bbRoot = 'BB_ROOT=' + templateDir
variant = 'VARIANTLIST=' + ('g' if variant[-2:] == '-g' else '')
Copy link

Choose a reason for hiding this comment

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

trivial: would be easier to read and understand if it used if variant.endswith('-g')

Copy link
Author

Choose a reason for hiding this comment

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

Done

@jpl-mac
Copy link

jpl-mac commented Jul 30, 2012

Please add to the description an explanation of what the issue is/was and how it presents itself. And why/how this change fixes the issue. This should be standard for any bug fix review.

So far i can't see any reference to VARIANTLIST in the makefiles. But i see VARIANTS being used.

Reviewers: JP

Description:
 "blackberry\builder.py run -t device" command triggers Device-Release build, while should trigger Device-Debug.
 Setup the VARIANT_LIST macro (defined from qrules.mk) within make command to direct it to the proper build.

Changelog:
- Minor change.

Test cases:
- Build the mobile sdk.
- Create project using project.py.
- Build it with builder.py using different build types (simulator, device, deploy).
- Make sure it builds with correct build type.

NOTE: Will fail to build with build type 'deploy' due to known issue with R6.
@alexandergalstyan
Copy link
Author

Updated.

@jpl-mac
Copy link

jpl-mac commented Jul 31, 2012

I still can't understand it, i can see VARIANT_LIST in qmacros.mk but no reference to VARIANTLIST anywhere in the mk files within our project except for qde preferences.

I ran tests and it does do what you described, and can't argue with that :)

Approved

alexandergalstyan added a commit that referenced this pull request Aug 1, 2012
TIMOB-10226: BlackBerry: Build script trigger wrong build type
@alexandergalstyan alexandergalstyan merged commit 263c8e9 into Macadamian:blackberry Aug 1, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants