[RESOLVED] Ability to compile from other branches

For help and support with Universal Media Server in general
Forum rules
Please make sure you follow the Problem Reporting Guidelines before posting if you want a reply
User avatar
DeFlanko
Posts: 723
Joined: Thu Jun 21, 2012 3:43 am
Location: San Pedro, CA
Contact:

[RESOLVED] Ability to compile from other branches

Post by DeFlanko »

Is it even possible to point to another branch and compile it with the UMSBuilder?
User avatar
Optimus_prime
Posts: 678
Joined: Fri Jun 01, 2012 6:39 pm
Location: Sydney, Australia

Re: [Request] Ability to compile from other branches

Post by 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
How Ask For Support
Remember, Debug Log's Can/Will Help and Explain your issues, we're not mind reader's but here to help
OS's I Use And Can Assist With: Windows 7/8, Mac OS-X 10.8 & 10.9
Mac OS-X Java 7 Builds Mac OS-X Java 7 Forum
User avatar
DeFlanko
Posts: 723
Joined: Thu Jun 21, 2012 3:43 am
Location: San Pedro, CA
Contact:

Re: [Request] Ability to compile from other branches

Post by 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...
User avatar
Optimus_prime
Posts: 678
Joined: Fri Jun 01, 2012 6:39 pm
Location: Sydney, Australia

Re: [Request] Ability to compile from other branches

Post by 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)
How Ask For Support
Remember, Debug Log's Can/Will Help and Explain your issues, we're not mind reader's but here to help
OS's I Use And Can Assist With: Windows 7/8, Mac OS-X 10.8 & 10.9
Mac OS-X Java 7 Builds Mac OS-X Java 7 Forum
User avatar
DeFlanko
Posts: 723
Joined: Thu Jun 21, 2012 3:43 am
Location: San Pedro, CA
Contact:

Re: [Request] Ability to compile from other branches

Post by DeFlanko »

Should be fun. Ill hit you up when i got time and see if your down (....under xD) couldn't help myself bro..
User avatar
Optimus_prime
Posts: 678
Joined: Fri Jun 01, 2012 6:39 pm
Location: Sydney, Australia

Re: [Request] Ability to compile from other branches

Post by Optimus_prime »

Nice, always time for humor :D
How Ask For Support
Remember, Debug Log's Can/Will Help and Explain your issues, we're not mind reader's but here to help
OS's I Use And Can Assist With: Windows 7/8, Mac OS-X 10.8 & 10.9
Mac OS-X Java 7 Builds Mac OS-X Java 7 Forum
ExSport
Posts: 595
Joined: Wed Oct 10, 2012 1:57 am

Re: [Request] Ability to compile from other branches

Post by 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 8-)
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 8-)
Last edited by ExSport on Mon Oct 28, 2013 6:20 am, edited 4 times in total.
User avatar
DeFlanko
Posts: 723
Joined: Thu Jun 21, 2012 3:43 am
Location: San Pedro, CA
Contact:

Re: [Request] Ability to compile from other branches

Post by DeFlanko »

Nice......

:shock:

-=-=-=-
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
Posts: 595
Joined: Wed Oct 10, 2012 1:57 am

Re: [Request] Ability to compile from other branches

Post by ExSport »

If there will be any problem when merging you will be informed that merging failed due to some uncorrectable conflicts I suppose...
ExSport
Posts: 595
Joined: Wed Oct 10, 2012 1:57 am

Re: [Request] Ability to compile from other branches

Post by ExSport »

DeFlanko wrote: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 8-)
Locked