[RESOLVED] Ability to compile from other branches

[DeFlanko]

Is it even possible to point to another branch and compile it with the UMSBuilder?

[Optimus_prime]

deflanko, i'm writing you a guide for netbeans so you can do it from there. If you want to hook up a skype chat just pm me and i'll talk you through it

[DeFlanko]

i haven't used skype since '04 bro... you down for a Google Hangout?... xD


We could also use https://join.me if we need to do a collaborative screen share...

[Optimus_prime]

Wow, your making me feel old. I've lived with Skype for years, as it easy for my family while i travel for work. But i'm sure we can organize a hangout mate, and if you want the join.me is prob better so i can run you through it.

Edit: Just PM with a time you would like to get on mate, don't forget i'm in Sydney which is GMT +10 (18 Hours Behind you in California)

[DeFlanko]

Should be fun. Ill hit you up when i got time and see if your down (....under xD) couldn't help myself bro..

[Optimus_prime]

Nice, always time for humor

[ExSport]

@DeFlanco:
The easiest way is to modify "Build for Windows.bat" batch file.
Delete CODE folder if exists and run modified batch file:
Change

Code: Select all

:GIT_CLONE
CALL java -jar jgit-cli.jar clone https://github.com/UniversalMediaServer/UniversalMediaServer.git Code
GOTO MAVEN

[/size]to

Code: Select all

:GIT_CLONE 
CALL java -jar jgit-cli.jar clone https://github.com/UniversalMediaServer/UniversalMediaServer.git Code
CD Code
CALL java -jar ../jgit-cli.jar fetch origin refs/pull/141/head
CALL java -jar ../jgit-cli.jar merge FETCH_HEAD -s resolve
CD..
GOTO MAVEN

[/size]Check new lines #2 and #3:

• #2 fetches pull #141 from remote git
• #3 merges them to local repository from which UMSbuilder compiles binary file

#141 you can change to any not merged pull request you can find on git like: https://github.com/UniversalMediaServer ... r/pull/142
This example works not only for different branches like "web" = #142 but also for any unmerged pull request for which no branch/tags exist, like #141
EDIT:
If the CODE folder will exist, this part of code is ignored (it jumps directly to :GIT_UPDATE)
Also fixed missing #1+#4 commands ["CD Code" + "CD.."], sorry for mistake

[DeFlanko]

Nice......



-=-=-=-
EDIT: So i did like you Said ExSport and according to Sharkhunter it should be http://localhost:9001

it doesnt come up.

How can i tell if the code was pulled correctly?

-=-=-=-

EDIT2 : ohhhhh i see the code was removed?! whaaaa?

[ExSport]

If there will be any problem when merging you will be informed that merging failed due to some uncorrectable conflicts I suppose...

[ExSport]

EDIT: So i did like you Said ExSport and according to Sharkhunter it should be http://localhost:9001

Did you replaced "localhost" with your real IP address?
Localhost is IP 127.0.0.1 but I suppose your UMS is not listening on this IP if it is not hardcoded to listen/bind on localhost