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

[BUILD] ZeroC Ice 3.7 compatibility #3211

Merged
merged 3 commits into from Aug 3, 2017

Conversation

@ghost
Copy link

commented Aug 3, 2017

Fixes #3210

Ice 3.7 seems to have changed some folder's capital case around (Ice -> ice), added an include path to fix that.

Besides that IceUtil merged into Ice, added some logic to select the correct linking params.

Didn't test actual running with ice enabled in settings, it compiles and murmur runs without problems. Also I couldn't test it with 3.6, since I don't have 3.6 installed on any of my machines anymore.

Please be free to suggest improvements, I didn't wrote any qmake stuff before.

More Ice 3.7 stuff: https://doc.zeroc.com/display/Ice37/Upgrading+your+Application+from+Ice+3.6

ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0))
ICE_MINOR_VERSION = $$section(ICE_VERSION, ., 1, 1)

lessThan(ICE_MAJOR_VERSION, 3) | lessThan(ICE_MINOR_VERSION, 7) {

This comment has been minimized.

Copy link
@mkrautz

mkrautz Aug 3, 2017

Member

Should probably be something like:

!equals(ICE_MAJOR_VERSION, 3) {
     error("Unsupported Ice version")
}
lessThan(ICE_MINOR_VERSION, 7) {
    # Ice < 3.7
    LIBS *= -lIce -lIceUtil
}  else {
    # Ice 3.7+
    LIBS *= -lIce
}
@ghost

This comment has been minimized.

Copy link
Author

commented Aug 3, 2017

I think something is not right with the splitting of the version string, that equals triggers even with an 3.7 ice version.

LIBS *= -lIce -lIceUtil
# check Ice version, 3.7 merged IceUtil into Ice
ICE_VERSION = $$system(slice2cpp --version 2>&1)
ICE_MAJOR_VERSION = $$section(ICE_VERSION, ., 0, 0))

This comment has been minimized.

Copy link
@mkrautz

mkrautz Aug 3, 2017

Member

The error is because you have an extra right parenthesis at the end here.
So ICE_MAJOR_VERSION gets set to 3) 😢

This comment has been minimized.

Copy link
@ghost

ghost Aug 3, 2017

Author

Don't know how I missed that one :) Fixing it now.

@mkrautz
mkrautz approved these changes Aug 3, 2017
Copy link
Member

left a comment

LGTM

@mkrautz mkrautz merged commit f90ab07 into mumble-voip:master Aug 3, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@ghost ghost deleted the patch-ice-3.7 branch Aug 3, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.