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

Fix #111531 (Create marching ensemble templates) #2625

Merged
merged 1 commit into from
May 31, 2016

Conversation

duck57
Copy link
Contributor

@duck57 duck57 commented May 24, 2016

Added templates for a marching band and two sizes of marching
percussion ensemble.

The marching percussion templates were originally called “WGI”, but
they also work nicely for marching bands that follow the workflow of
having their fully-realised percussion parts written separately.

NOTE: divisional linked parts are not part of these templates,
as they may slow things down too much. If you want these templates
with the divisional parts, e-mail chris@euchre.us

@Jojo-Schmitz
Copy link
Contributor

You need to add the new files and update the changed file's name in .../share/templates/CMakeLists.txt

@IsaacWeiss
Copy link
Contributor

While at it, if you edit the commit message to include "Fix #111531", then the issue in the tracker will automatically be marked as fixed when this PR is merged.

@duck57 duck57 changed the title Create marching ensemble templates for issue #111531 Fix #111531 (Create marching ensemble templates) May 25, 2016
@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented May 25, 2016

You still need to add the new files and update the changed file's name in .../share/templates/CMakeLists.txt, to get the 'make install' step working.

@duck57
Copy link
Contributor Author

duck57 commented May 25, 2016

I thought that making CMakeLists.txt was precisely what commit 9df7b91 was for. Did my changes not actually go through, or did I make a mistake in adding the new files?

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented May 25, 2016

Oops, sorry, didn't notice that. However, Travis still fails:
file INSTALL cannot find
"/home/travis/build/musescore/MuseScore/share/templates/07-Band_and_Percussion/03-Marching_Percussion_".
Seem CMake doesn't like the (...) stuff. You'd need (...)

@@ -77,7 +77,10 @@ install(FILES

install(FILES
07-Band_and_Percussion/01-Concert_Band.mscz
07-Band_and_Percussion/02-Marching_Percussion.mscz
07-Band_and_Percussion/02-Marching_Band.mscz
07-Band_and_Percussion/03-Marching_Percussion_(battery).mscz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make it 07-Band_and_Percussion/03-Marching_Percussion_\(battery\).mscz, i.e. 'escape' the parens with a backslash

@duck57
Copy link
Contributor Author

duck57 commented May 26, 2016

Travis seems to be failing something about breath-add.mscz. No idea if this is something I broke with new templates or if it's from an unrelated change. It seems to have a much, much longer log file, so I assume it built properly and it's just a unit test that failed.

@lasconic
Copy link
Contributor

The breath add is my fault. I'm fixing it.

@lasconic
Copy link
Contributor

Can you squash your 3 commits together? See http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

Added templates for a marching band and two sizes of marching
percussion ensemble.

The marching percussion templates were originally called “WGI”, but
they also work nicely for marching bands that follow the workflow of
having their fully-realised percussion parts written separately.

NOTE: divisional linked parts are *not* part of these templates,
as they may slow things down too much. If you want these templates
with the divisional parts, e-mail chris@euchre.us
@duck57
Copy link
Contributor Author

duck57 commented May 27, 2016

I've squashed the commits.

Note for any future readers (mostly myself): the GitHub desktop application doesn't push squashed commits (it instead separates them back out and restores the ones that it has on its servers). Instead, use git push origin -f from your terminal to get things working smoothly.

@lasconic lasconic merged commit fc3f2f3 into musescore:master May 31, 2016
@lasconic
Copy link
Contributor

@duck57 I just merged it in master but forgot to make you sign the MuseScore CLA. Could you take a look to https://musescore.org/en/cla and sign it? Thanks!

@duck57
Copy link
Contributor Author

duck57 commented Jun 1, 2016

I've sent in the CLA.

@duck57 duck57 deleted the marching-templates branch June 1, 2016 05:23
@lasconic
Copy link
Contributor

lasconic commented Jun 1, 2016

Thank you !

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

4 participants