Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

[UPnP] Code shuffle #1238

Merged
merged 7 commits into from

6 participants

@alcoheca
Collaborator

This is pretty basic stuff & should ideally go in at the same time as the Platinum upgrade.

Moves upnp files to xbmc/network/upnp, adds a UPNP namespace & makes UPnP actually optional at configure time (enabled by default).

Depends on upgrade-platinum pull request

@elupus
Collaborator
lib/libUPnP/Makefile.in
((5 lines not shown))
Neptune/Source/System/Posix/NptPosixQueue.cpp \
Neptune/Source/System/Posix/NptPosixThreads.cpp \
Neptune/Source/System/Posix/NptPosixFile.cpp \
- Neptune/Source/System/StdC/NptStdCTime.cpp \
+ Neptune/Source/System/Posix/NptPosixTime.cpp \
@elupus Collaborator
elupus added a note

this is part of the upgrade not the shuffle right?

@elupus Collaborator
elupus added a note

nevermind.. the upgrade is in this pull too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@alcoheca
Collaborator

only c640c4b & 49348d1 are relevant, rest is from platinum-upgrade pull request

@elupus
Collaborator

Looking pretty good, but needs rebase and some squashes. We don't want to have commits where xbmc is not in a compiling state.

@alcoheca
Collaborator

@elupus i squashed the first two commits of upgrade-platinum. forced pushed, then rebased onto code-shuffle. Hopefully that's it sorted?

@alcoheca
Collaborator

I don't know why the ordering is weird here, it's correct in my git logs for both branches

@jmarshallnz
Owner
@alcoheca
Collaborator

hello hello, any chance of getting this in too?

needs platform fixes for 02f566d, 9f3e4a6 & 410cda4. hopefully the last time I touch configure.in ... think @pieh is willing to do win32 so it's just the 3 osx builds which need coaxed into submission

@Memphiz
Owner

Since xcode doesn't have conditional compilation of files i would think we have to enable it in the osx configure. @Davilla what do you think?

Or we would need to remove the whole libupnp from the osx project and let xcode_depends build it - then add some HAS_UPNP guards on the filesystem and network bits of UPNP so that those get not compiled.

@ghost

move it to depends imo. it is an external library.

@davilla
Collaborator

What patches are we carrying for upnp ?
Currently libUpnp is made as a static lib (libupnp.a) that we hard link.
Also, think of darwin builds as embedded, we choose what to enable/disable and we only support building under our depends build system. If someone is doing configure outside of tool/darwin/depends/xbmc/Makefile, that's their problem, not ours.
We could also move upnp into xcode_depends but I'd rather that get less usage than more.

@alcoheca
Collaborator
@alcoheca
Collaborator

if this is a massive pain in the arse, we could forgo making UPnP optional - I just felt it was a half way done job, seeing as there was IFDEF UPnP's all over the shop..

The most important change is splitting the classes out of UPnP.cpp - it's a nightmare to spend anytime in there right now.

@Memphiz
Owner

@davilla as extract of your post - enable it in tools/darwin/depends/xbmc/Makefile and leave it in the xcode project. I'm fine with that.

@alcoheca will shuffle the stuff in xcode and then do a PR to your branch (and hope nobody commits any project changes until you hit the green button).

@Memphiz
Owner

PR sent.

@pieh
Collaborator

and windows pr sent too alcoheca#4
as we have total merge mayhem now, no sense in playing games to keep stuff building in each commit

@alcoheca alcoheca merged commit c3cfbf1 into xbmc:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 7, 2012
  1. @alcoheca
  2. @alcoheca

    [UPnP] changed: make UPnP optional (enabled by default), fix some mis…

    alcoheca authored
    …sing #ifdef HAS_UPNP guards
  3. @alcoheca

    [UPnP] split off UPnPServer to separate file. move some static class …

    alcoheca authored
    …methods to
    
    helpers via internal header
  4. @alcoheca
  5. @Memphiz @alcoheca

    [darwin/deps] - configure with --enable-upnp explicitly because xcode…

    Memphiz authored alcoheca committed
    … project needs this to be on (who knows if the default will switch over to disabled sometime haha)
  6. @Memphiz @alcoheca

    [osx/ios/atv2] - sync xcode project

    Memphiz authored alcoheca committed
  7. @pieh @alcoheca

    [win32] update vs project, force enable upnp for windows

    pieh authored alcoheca committed
Something went wrong with that request. Please try again.