bill-auger
commented
8 years ago im not sure how you went about this but this PR is more conflicting than the last one - from what i see it looks like you used the projucer in this process yea? it can be a bit tricky configuring JUCE projects at first - most of the conflicts i see here are simply a misunderstanding of JUCE project management - i really did not expect you would have any success so quickly otherwise i could have explained a bit how JUCE project management works - i would have also asked that you read the CONTRIBUTING.md before sending any PRs
the largest source of conflict here is evident in the changes to the file 'AvCaster.jucer' - this shows that you downloaded JUCE from their website and set the av-caster project to use your local copy of JUCE which is evidently a different version - a version that travis does not have and so is the most likely reason for travis to be rejecting this PR - this av-caster repo is self-contained and includes all of the JUCE libraries that it needs in the JuceLibraryModules/ directory - more importantly tho - the most relevant bit of the CONTRIBUTING.md in this case would be that i am using a customized version of the projucer that builds more sophisticated GNU/Makefiles and so even if you had done everything else correctly the GNU/Makefile would still have been reverted to the simpler default form
generally you must not edit any existing files under the Builds directory and generally any additional files under the Builds directory created by you IDE would not be committed to the repo - any changes that need to be made to the project in order to get it to compile such as compiler flags, library locations, even support files must be specified in the projucer or else they would be clobbered on the next save - in short, almost nothing should be added to git that the projucer did not auto-generate - even most source file are originally created by the jucer
most of the remaining needlessly modified files are simply that your IDE has re-saved them with windows line endings - perhaps your IDE has an auto-save feature? - bad idea IMHO - for example there is no reason any files in the Packaging directory should have been modified or accessed at all because the JUCE project manager does not even know they exist - in the simplest case the only files that would strictly need to be in the diff here are AvCaster.jucer and the auto-generated files under the Build/ directories
i think it is quite nifty that you have taken it up to do this and i am willing to help you get this diff into something sane that could be merged - perhaps we should arrange a pair-programming seesion sometime - all i can say for now is that if you had used my customized projucer and avoided saving any files that you did not actually modify then i think the diff would more reasonably reflect what actually needed to change
06needhamt
And the project no longer builds.
This pull request allows av-caster to be compiled as an android application that will run on API22+. As far as i can tell i have set everything up correctly but it seems it has also changed a lot of files that i did not touch, so be sure to try this out before merging incase it breaks anything. I closed my previous pull request because i couldf not get it to rebase without many conflicts.