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

OSX Java 6/7/8 Build Update #552

Merged
merged 3 commits into from May 30, 2015

Conversation

Optimusprimeums
Copy link
Collaborator

Updates pom.xml with a Java 6 and Java7/8 profiles, Adds appbundler (custom for UMS) to build/launch Java 7/8 UMS and adds a assembly.xml file for Java 7/8.
Tested (extensively) and working correct

@SubJunk
Copy link
Member

SubJunk commented May 6, 2015

@Optimusprimeums looking good mate! But can we separate 7 and 8 too? With this as it is now, the Java 8 build compiles in Java 7 mode...?

@Optimusprimeums
Copy link
Collaborator Author

sure @SubJunk , just means a bigger pom.xml if your happy i'll close this one and re-pull. I also just to add, i have to manually change to the java version i'm building. So if it's 7 I change to it and 8 the same, the java 7/8 profile can build either, as long as you set the source/target to the value you want.
I think i've found a solution, leave it with me

@SubJunk
Copy link
Member

SubJunk commented May 7, 2015

@Optimusprimeums what do you mean manually change? Can't you set the JAVA_HOME variable to reference the JDK you need? For example:

SET JAVA_HOME=%CD%\JDK-1.7.67

@Optimusprimeums
Copy link
Collaborator Author

@SubJunk I'll try that but i usually just change it to the JDK in the build settings then build the branch, 6/7/8, that i've checked out. Maybe i've been doing it the hard way all this time. Can you do that in the pom.xml though

@SubJunk
Copy link
Member

SubJunk commented May 7, 2015

This is my build folder:

build folder

and my process is to checkout the "Code" folder to the tag I want, then double-click the appropriate .bat file.

It could be much more streamlined if I created a new file "release.bat" which runs all 6 build files with git commands to switch branches in between each one. I should probably do that, but anyway this process already only takes 5-10 minutes.
The time-consuming part is making the tags in the first place because of merge conflicts.

@Optimusprimeums
Copy link
Collaborator Author

Well @SubJunk i use netbeans on OSX to do everything. One reason is the the JDK for Java 6 is built in to apple. The others are straight from oracle. I'm using multiple build profiles with Netbeans to control what i'm building. I'm currently looking at the pom.xml now to solve those issues but i have two JDK's to manage which means switching between both Java 6 and Java 8. I build with Java 8 for 7 as it's excellent backwards compatible

@SubJunk
Copy link
Member

SubJunk commented May 7, 2015

@Optimusprimeums I just made the release.bat file like I described and it's working great now, so building only requires a double-click. I'd be happy to help you set up a similar script, it's definitely possible since OS X has a much better command prompt than Windows

@Optimusprimeums
Copy link
Collaborator Author

Sure @SubJunk it would help, how do you want to get it to me?

@Optimusprimeums
Copy link
Collaborator Author

Ok @SubJunk i'm going to submit this pull request (with changes) that i think should go into the build of UMS. Now i've added a plugin that will require the correct Java version to be used for the correct build. That should prevent anyone using the incorrect JDK. Now i think its complete and ready to merge, if not no one else can build the OSX releases that wants too. What do you think?
I still would like to develop that release.bat though just think the pom changes need to happen too

@SubJunk
Copy link
Member

SubJunk commented May 7, 2015

@Optimusprimeums this looks great :)

@UniversalMediaServer/developers does it look ready to merge?

SubJunk added a commit that referenced this pull request May 30, 2015
@SubJunk SubJunk merged commit 90b1914 into UniversalMediaServer:master May 30, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants