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

Fix Travis OSX build, Support Ice 3.7 #3240

Merged
merged 2 commits into from Oct 15, 2017

Conversation

@Kissaki
Copy link
Member

commented Oct 1, 2017

Our OSX build uses brew to install dependencies, amongst which is Ice.

The brew keg (package) ice was updated from 3.6 to 3.7.
With the update, the slice file path changed to /usr/local/opt/ice/share/ice/slice
(where /usr/local/opt/<keg-name> is the symlinked path to the currently installed keg (=package) files.

  • Use share/ice/slice as a possible subpath for slice file inclusion when running slice2cpp to compile Ice cpp files.
  • Replace method calls that were marked obsolete in Ice 3.7.

@Kissaki Kissaki added the build label Oct 1, 2017

@Kissaki Kissaki force-pushed the Kissaki:fix-travis-osx branch 4 times, most recently from fe9c463 to 9c62ec9 Oct 1, 2017

Kissaki added 2 commits Oct 1, 2017
Fix Travis OSX build - add keg slice subpath
Our OSX build uses brew to install dependencies, among which is Ice[1].

The brew keg (=package) `ice` was updated from 3.6 to 3.7 (with [2] and [3]).
With the update, the slice file path changed to
`/usr/local/opt/ice/share/ice/slice` (where `/usr/local/opt/<keg-name>`
is the symlinked path to the currently installed keg files.

* Use `share/ice/slice` as a possible subpath for slice file inclusion
when running slice2cpp to compile Ice cpp files.
* Replace method calls that were marked obsolete in Ice 3.7.

[1] http://formulae.brew.sh/formula/ice
[2] Homebrew/homebrew-core@4707f7e#diff-217324a0837e089e3f019178b405b2b9
[3] Homebrew/homebrew-core@9e9babc#diff-217324a0837e089e3f019178b405b2b9
Replace obsolete Ice statements for Ice >= 3.7
The Exceptions method ice_name() has been replaced by the new method
ice_id().

The Communicators method stringToIdentity has been made obsolete in favor
of a static function in the Ice namespace.

https://doc.zeroc.com/display/Ice37/Ice-Communicator#Ice-Communicator-stringToIdentity
https://doc.zeroc.com/pages/viewpage.action?pageId=18255295
https://doc.zeroc.com/pages/viewpage.action?pageId=18255344

@Kissaki Kissaki force-pushed the Kissaki:fix-travis-osx branch from 979395e to 264d1ed Oct 2, 2017

@Kissaki Kissaki changed the title WIP: Fix Travis OSX build Fix Travis OSX build Oct 2, 2017

@Kissaki Kissaki requested review from mkrautz, hacst and davidebeatrici Oct 2, 2017

@Kissaki Kissaki changed the title Fix Travis OSX build Fix Travis OSX build, Support Ice 3.7 Oct 2, 2017

@Kissaki Kissaki merged commit e03989e into mumble-voip:master Oct 15, 2017

2 checks passed

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

@Kissaki Kissaki deleted the Kissaki:fix-travis-osx branch Oct 15, 2017

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