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.

Sign up for GitHub

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

Jump to bottom

[cmake] Reuse version.txt and add-on API parsing across buildsystems #9845

Merged
merged 1 commit into from
Jun 1, 2016
Merged

[cmake] Reuse version.txt and add-on API parsing across buildsystems #9845

merged 1 commit into from
Jun 1, 2016

Conversation

hudokkow
Copy link
Member

Alternative to #9742

Do we want Macros.cmake copied to APP_LIB_DIR?
@fetzerch, @wsnipex

@hudokkow hudokkow added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v17 Krypton Component: Add-ons CMake labels May 20, 2016
@wsnipex
Copy link
Member

wsnipex commented May 20, 2016

Nice, I prefer this one.

@hudokkow
Copy link
Member Author

Yeah, a lot less shuffling around.

fetzerch
fetzerch reviewed May 20, 2016
View reviewed changes
project/cmake/scripts/common/Macros.cmake
#
# The following variables are set from libKODI_guilib.h:
# guilib_version - current ADDONGUI API version
# guilib_version_min - minimal ADDONGUI API version
macro(core_find_versions)
include(CMakeParseArguments)
core_file_read_filtered(version_list ${CORE_SOURCE_DIR}/version.txt)
string(REPLACE " " ";" version_list "${version_list}")

This comment was marked as spam.

Sign in to view

@hudokkow hudokkow force-pushed the cmake_generate_version_macro_alternative branch from 61789d6 to d0f6c68 Compare May 20, 2016 22:15
@hudokkow
Copy link
Member Author

@fetzerch, done.
Requests are fine, of course! We're here to improve stuff, correct? 😉

jenkins build this with addons please

@hudokkow hudokkow mentioned this pull request May 20, 2016
Closed
@hudokkow
Copy link
Member Author

what? jenkins build this with addons please

@hudokkow hudokkow force-pushed the cmake_generate_version_macro_alternative branch from d0f6c68 to 6e635b1 Compare May 23, 2016 12:48
@hudokkow
Copy link
Member Author

Just noticed cmake_parse_arguments doesn't like URLs.
Parsing http://kodi.tv results in the variable being set to http: only.

Any ideas? cmake_parse_arguments documentation is scarce and unhelpful.

@fetzerch
Copy link
Member

@hudokkow: it's caused by this: https://github.com/xbmc/xbmc/blob/master/project/cmake/scripts/common/Macros.cmake#L241 It could probably be fixed by prepending a space the the regexp (or [ \t] (not sure if cmake understands \s)).

@hudokkow hudokkow force-pushed the cmake_generate_version_macro_alternative branch from 6e635b1 to 76b4414 Compare May 25, 2016 08:35
@hudokkow
Copy link
Member Author

Completely missed that. Thanks.
Corrected. Unfortunately CMake's regex support is a bit lacking.

@hudokkow hudokkow force-pushed the cmake_generate_version_macro_alternative branch 3 times, most recently from 1afa457 to 18d125d Compare June 1, 2016 08:43
@hudokkow hudokkow force-pushed the cmake_generate_version_macro_alternative branch from 18d125d to e47fe61 Compare June 1, 2016 08:45
@hudokkow
Copy link
Member Author

hudokkow commented Jun 1, 2016

jenkins build this with addons please

@hudokkow
Copy link
Member Author

hudokkow commented Jun 1, 2016

Build is fine. IOS is acting up.

@hudokkow hudokkow merged commit cddf632 into xbmc:master Jun 1, 2016
@hudokkow hudokkow added this to the Krypton 17.0-alpha2 milestone Jun 1, 2016
@hudokkow hudokkow deleted the cmake_generate_version_macro_alternative branch June 1, 2016 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CMake Component: Add-ons Type: Cleanup non-breaking change which removes non-working or unmaintained functionality v17 Krypton
Projects
None yet
Milestone
Krypton 17.0-alpha2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@hudokkow @wsnipex @fetzerch