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

CMake Codeblocks/Qt Creator build file generation support #1

Merged
merged 1 commit into from
Apr 25, 2012

Conversation

mchamberlain
Copy link
Contributor

Just a minor addition: I added support for -b codeblocks to rez-cmake for Codeblocks/Qt Creator project file creation.

@nerdvegas
Copy link
Contributor

Hey Morne,

Cheers for that! I'll look into getting that merged tomorrow. It's a public
holiday here and I finally have a chance to spend a whole day doing some
development, so I hope to get some other improvements in as well.

thx
A

On Mon, Apr 23, 2012 at 5:52 PM, Morné Chamberlain <
reply@reply.github.com

wrote:

Just a minor addition: I added support for -b codeblocks to rez-cmake for
Codeblocks/Qt Creator project file creation.

You can merge this Pull Request by running:

git pull https://github.com/BlackGinger/rez master

Or you can view, comment on it, or merge it online at:

#1

-- Commit Summary --

  • Added codeblocks build file support (for Qt Creator actually) to
    rez-cmake (-b codeblocks).

-- File Changes --

M bin/rez-cmake (6)

-- Patch Links --

https://github.com/nerdvegas/rez/pull/1.patch
https://github.com/nerdvegas/rez/pull/1.diff


Reply to this email directly or view it on GitHub:
#1

@nerdvegas nerdvegas merged commit be73cd5 into AcademySoftwareFoundation:master Apr 25, 2012
nerdvegas pushed a commit that referenced this pull request Jun 13, 2016
Creating a single branch with all the Windows changes.
nerdvegas pushed a commit that referenced this pull request Jul 4, 2016
* Adding Skral's changes (#1)

Creating a single branch with all the Windows changes.

* Adding in a skrall change that fixed an issue with a subprocess-launched shell being left in a blocked state waiting on user input.
nerdvegas pushed a commit that referenced this pull request Jul 4, 2016
* when using rez-build --ba pass the string to bez as well

* solver: fix for variant_select_mode

* update other tests now that pyvariants package added

* install.py: add --keep-symlinks option

* rex: format - allow recursive expansion of namespace vars

* rex: add an expandvars utility function

* -solver improvements, mostly about keeping variants grouped by version
-PackageOrder WIP
-NOTE solver solve_time currently misleading, need different way to calculate

* -some basic simplification in the solver - move to passing solver instance around

* -moved some code to new _PackageEntry class so that resorting of variants is avoided

* -first pass custom reordering added
-added some low-level configurable options to speed solves a little
-implemented better load/solve time tracking

* -version up
-package reorderers rxt save/load

* -minor solver fix
-added context patching code in new file, standalone. NOTE: other code in rez not using this yet.

* -removed context validation on load in GUI, too slow
-added rez-gui --diff option
-single context load now maximises the subwindow

* bind can fail if not all dirs exist at time of bind; makedirs gives mkdir -p functionality

* fixes bad dir creation with LOCAL_SYMLINKS cmake

* rex: fix indentation

* rex: fix for recursive format

* rex: allow recursive formatting to work with kwargs, and add tests

* -upper version

* -fixed bug in graph -> dot conversion
-updated old pkg command conversion to fall back on bash on any error.

* -fixed bug where ResolvedContext.verbosity not defined if loaded from rxt
-changed patching behavior so that a non-conflict patch overrides all refs to that pkg, including !/~
-fixed bug in Requirement.__iter__ when requirement is a conflict

* rex_bindings: '0' should convert to digit (though '00' or '01' don't)

Will make it so that, if in the package.py you do "version.as_tuple() >= (5, 2)",  we won't get an unexpected result if the version is 5.0.  Will still be a (potential) problem if the version is "5.00" - but that's likely a less common case, and at least they now have to the option of using 5.0 if they want to ensure easy numeric comparision

would eventually like to override > / < / == comparison to automatically convert the other side to a Version object if it's a string, and then compare using it's more sophisticated logic... but this is a quick fix for now

* updated license files so that LGPL is clearer

* -added build util for adding copyright/lic to each py file
-added copyright/lic to each py file

* Adding Skral's changes (#1)

Creating a single branch with all the Windows changes.

* Adding in a skrall change that fixed an issue with a subprocess-launched shell being left in a blocked state waiting on user input.

* added shotgun hook for launching apps in a rez context

* -minor updates to rezconfig.py comments to make them more md friendly

* -fixed OS X bug in build selftest package
-added s option to res-selftest to limit to specific shell

* renamed *PackageOrderFunction -> *PackageOrder

* change to licence/copyright comment build util code

add_license.py helper now retains non-me copyright authors

* moved and PEP8-ized

* change to make this PR backwards compatible so existing rebuild.py
files are unaffected.

* minor change to contrib readme

* minor README change again

* minor comment to highlight res-specific change to OS pkg
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