search

pristineio / webrtc-build-scripts

A set of build scripts useful for building WebRTC libraries for Android and iOS.
BSD 3-Clause "New" or "Revised" License
1.12k stars 448 forks source link

iOS - Subsequent pulls fail because the /src/talk/libjingle_examples.gyp file has been modified #86

Closed paynerc closed 9 years ago

paynerc commented 9 years ago

Building after a fresh checkout works fine. However, any subsequent attempts to pull the latest code or build using the dance scripts has the pull fail because we have manipulated /src/talk/libjingle_examples.gyp. The script needs to be smart enough to either force the git pull or revert the changed before pulling.

Syncing projects: 100% ( 1/ 1) src

src (ERROR)
----------------------------------------
[0:00:00] Started.
----------------------------------------
Error: 1>
1> ____ src at refs/remotes/origin/master
1>  You have unstaged changes.
1>  Please commit, stash, or reset.
puyide commented 9 years ago

I have the same problem. You solve it?

paynerc commented 9 years ago

I haven't done anything with this as I have been evaluating another WebRTC library for iOS. When I get back to working with the Google Implementation I will see what I can figure out if it hasn't been fixed yet.

paynerc commented 9 years ago

Fixed above in PR #94.