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.

Sign up for GitHub

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

Feature/mei dev version profiler #4

Merged
merged 8 commits into from
May 4, 2022
Merged

Feature/mei dev version profiler #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2b50ed
started adding dev mei version to profiler
anneferger Dec 9, 2021
b9bce97
dev version mei for profiler will be new version
anneferger Dec 13, 2021
95dc702
merging main into feature branch
anneferger Feb 17, 2022
e726054
merge main into feature/mei-dev-version-profiler
anneferger May 4, 2022
15d881f
finalized dev version in customization
anneferger May 4, 2022
cbed95f
typo in required.sh
anneferger May 4, 2022
241fee8
another typo in required.sh
anneferger May 4, 2022
bbb6f35
typo nr 3, time for coffee
anneferger May 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@

<groupId>de.edirom.meigarage</groupId>
<artifactId>mei-customization</artifactId>
<version>0.6.1</version>

<version>0.6.2-SNAPSHOT</version>
<properties>

<project.build.sourceEncoding>
Expand All @@ -22,8 +21,8 @@
<project.reporting.outputEncoding>
UTF-8
</project.reporting.outputEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<url>/multiprojects/mei-customization</url>
Expand Down
3 changes: 3 additions & 0 deletions required.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,6 @@ mkdir -p ${MEI_SOURCES_HOME}/music-encoding/mei401
cp -r /tmp/mei401/*/* ${MEI_SOURCES_HOME}/music-encoding/mei401
rm -r /tmp/mei401
xmllint -xinclude ${MEI_SOURCES_HOME}/music-encoding/mei401/source/mei-source.xml -o ${MEI_SOURCES_HOME}/music-encoding/mei401/source/mei-source_canonicalized.xml
mkdir -p ${MEI_SOURCES_HOME}/music-stylesheets/meidev
git clone -b develop https://github.com/music-encoding/music-encoding ${MEI_SOURCES_HOME}/music-encoding/meidev
xmllint -xinclude ${MEI_SOURCES_HOME}/music-encoding/meidev/source/mei-source.xml -o ${MEI_SOURCES_HOME}/music-encoding/meidev/source/mei-source_canonicalized.xml
1 change: 1 addition & 0 deletions src/main/java/de/edirom/meigarage/mei/MEICustomization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class MEICustomization implements Customization, ErrorHandler {
List<CustomizationSourceInputType> customizations = new ArrayList<CustomizationSourceInputType>();
List<String> outputFormats = new ArrayList<String>();

sources.add(new CustomizationSourceInputType("meidev", "MEI dev", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
sources.add(new CustomizationSourceInputType("mei401", "MEI v4.0.1", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
sources.add(new CustomizationSourceInputType("mei300", "MEI v3.0.0", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
sources.add(new CustomizationSourceInputType("mei211", "MEI v2.1.1", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canonicalized.xml"));
Expand Down
7 changes: 4 additions & 3 deletions src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@ public void tearDown() throws Exception {
public void customize() throws IOException, EGEException {
OutputStream os = new FileOutputStream("src/test/resources/test-output.odd");
String outputFormat = "Compiled ODD";
CustomizationSourceInputType sourceInputType = new CustomizationSourceInputType("mei401","MEI v4.0.1", "type_server-file", "source/mei-source_canonicalized.xml");
//String outputFormat = "RelaxNG";
CustomizationSourceInputType customizationInputType = new CustomizationSourceInputType("mei401","MEI v4.0.1", "type_server-file", "source/mei-source_canonicalized.xml");
CustomizationSourceInputType sourceInputType = new CustomizationSourceInputType("mei401","MEI v4.0.1", "type_server-file", "source/mei-source_canonicalized.xml");
//CustomizationSourceInputType sourceInputType = new CustomizationSourceInputType("meidev","MEI dev", "type_server-file", "source/mei-source_canonicalized.xml");
//CustomizationSourceInputType customizationInputType = new CustomizationSourceInputType("meidev","MEI dev", "type_server-file", "source/mei-source_canonicalized.xml");
List<CustomizationSourceInputType> sources = new ArrayList<>();
sources.add(sourceInputType);
List<CustomizationSourceInputType> customizations = new ArrayList<>();
customizations.add(customizationInputType);
List<String> outputFormats = new ArrayList<>();
outputFormats.add(outputFormat);
String tempDir = "src/test/temp";
customization.customize(null, sourceInputType, customizationInputType, outputFormat, os, null, null, tempDir);
assertNotNull(new File("src/test/resources/test-output.odd"));
Expand Down