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

murmur_ice: use `slice2cpp --version` to guess the slice include path for slice2cpp. #2617

Merged
merged 1 commit into from Nov 3, 2016

Conversation

@mkrautz
Copy link
Member

commented Nov 3, 2016

No description provided.

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Nov 3, 2016

slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.0/slice/ -I/usr/share/Ice-3.5.1/slice/ ${QMAKE_FILE_NAME}
ICE_VERSION = $$system(slice2cpp --version 2>&1)
EXTRA_SLICEFLAGS =
!isEmpty(ICE_VERSION) {

This comment has been minimized.

Copy link
@Kissaki

Kissaki Nov 3, 2016

Member

So --version was introduced with 3.6?
I think we should document that on the ICE_VERSION variable.

This comment has been minimized.

Copy link
@Kissaki

Kissaki Nov 3, 2016

Member

Neither 3.5 nor 3.6 doc documents --version

This comment has been minimized.

Copy link
@Kissaki

Kissaki Nov 3, 2016

Member

Nevermind, they have separately documented standard options. But those have --version for 3.4 and 3.5 as well!

So should we be able to drop a lot more below?

This comment has been minimized.

Copy link
@mkrautz

mkrautz Nov 3, 2016

Author Member

Then we need to be careful. I'm not sure if $$system checks the exit code for the process.

The problem is that slice2cpp --version prints the version to stderr.

But if we try that on a version of slice2cpp that doesn't know the option, ICE_VERSION will probably not be empty, but contain a lot of swearing about an unknown option.

I'll check if $$system respects the exit code.

This comment has been minimized.

Copy link
@mkrautz

mkrautz Nov 3, 2016

Author Member

OK, my comment above was out of date when I wrote it. My browser hadn't updated to show your last two comments.

This comment has been minimized.

Copy link
@mkrautz

mkrautz Nov 3, 2016

Author Member

I dropped all the versioned slice includes from the slice2cpp invocation. PTAL.

ICE_VERSION = $$system(slice2cpp --version 2>&1)
EXTRA_SLICEFLAGS =
!isEmpty(ICE_VERSION) {
EXTRA_SLICEFLAGS = -I/usr/share/Ice-$$ICE_VERSION/slice/ -IitWorked

This comment has been minimized.

Copy link
@Kissaki

Kissaki Nov 3, 2016

Member

-IitWorked lol. Testing testing?

This comment has been minimized.

Copy link
@mkrautz

mkrautz Nov 3, 2016

Author Member

Uh. Oops! Yep. :-)

This comment has been minimized.

Copy link
@mkrautz

mkrautz Nov 3, 2016

Author Member

Removed.

murmur_ice: use `slice2cpp --version` to guess the slice include path…
… for slice2cpp.

Also, while we're here, remove the old list of hard-coded Ice versions
from slice2cpp's arguments.

@mkrautz mkrautz force-pushed the mkrautz:query-extra-sliceflags branch from a9460ef to 8396904 Nov 3, 2016

@mkrautz

This comment has been minimized.

Copy link
Member Author

commented Nov 3, 2016

@Kissaki PTAL

@Kissaki
Kissaki approved these changes Nov 3, 2016
Copy link
Member

left a comment

Nice cleanup. LGTM

@Kissaki Kissaki merged commit b595d65 into mumble-voip:master Nov 3, 2016

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