From c2b50edd607f6de6c53061eaf61c0360cc68a783 Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Thu, 9 Dec 2021 16:37:05 +0100 Subject: [PATCH 1/6] started adding dev mei version to profiler --- src/main/java/de/edirom/meigarage/mei/MEICustomization.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/de/edirom/meigarage/mei/MEICustomization.java b/src/main/java/de/edirom/meigarage/mei/MEICustomization.java index 9136d49..00ba639 100644 --- a/src/main/java/de/edirom/meigarage/mei/MEICustomization.java +++ b/src/main/java/de/edirom/meigarage/mei/MEICustomization.java @@ -41,6 +41,7 @@ public class MEICustomization implements Customization, ErrorHandler { List customizations = new ArrayList(); List outputFormats = new ArrayList(); + sources.add(new CustomizationSourceInputType("meidev", "MEI dev", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canon.xml")); sources.add(new CustomizationSourceInputType("mei401", "MEI v4.0.1", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canon.xml")); sources.add(new CustomizationSourceInputType("mei300", "MEI v3.0.0", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canon.xml")); sources.add(new CustomizationSourceInputType("mei211", "MEI v2.1.1", CustomizationSourceInputType.TYPE_SERVER_FILE, "source/mei-source_canon.xml")); From b9bce97610bf1e4625d17c1f450f4afa62b77570 Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Mon, 13 Dec 2021 11:31:57 +0100 Subject: [PATCH 2/6] dev version mei for profiler will be new version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68f0d79..f2a2c8c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ de.edirom.meigarage mei-customization - 0.5.0 + 0.6.0-SNAPSHOT From 15d881f6f8611c64008de9edb81856c74a91710b Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Wed, 4 May 2022 14:07:11 +0200 Subject: [PATCH 3/6] finalized dev version in customization --- required.sh | 5 +++++ .../java/de/edirom/meigarage/mei/MEICustomizationTest.java | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/required.sh b/required.sh index c940703..bd88548 100644 --- a/required.sh +++ b/required.sh @@ -55,3 +55,8 @@ 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 +git clone -b develop https://github.com/music-encoding/music-encoding /tmp/dev +mkdir -p ${MEI_SOURCES_HOME}/music-stylesheets/meidev +cp -r /tmp/meidev/*/* ${MEI_SOURCES_HOME}/music-stylesheets/meidev +rm -r /tmp/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 diff --git a/src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java b/src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java index 262de0a..b79dc97 100644 --- a/src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java +++ b/src/test/java/de/edirom/meigarage/mei/MEICustomizationTest.java @@ -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 sources = new ArrayList<>(); sources.add(sourceInputType); List customizations = new ArrayList<>(); customizations.add(customizationInputType); - List 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")); From cbed95f2b5dd10fddd1153475d9c3da9e0984772 Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Wed, 4 May 2022 14:13:50 +0200 Subject: [PATCH 4/6] typo in required.sh --- required.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/required.sh b/required.sh index bd88548..d02fd7e 100644 --- a/required.sh +++ b/required.sh @@ -55,7 +55,7 @@ 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 -git clone -b develop https://github.com/music-encoding/music-encoding /tmp/dev +git clone -b develop https://github.com/music-encoding/music-encoding /tmp/meidev mkdir -p ${MEI_SOURCES_HOME}/music-stylesheets/meidev cp -r /tmp/meidev/*/* ${MEI_SOURCES_HOME}/music-stylesheets/meidev rm -r /tmp/meidev From 241fee8854bce212ac8b95156f5fa991469bbfce Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Wed, 4 May 2022 14:19:07 +0200 Subject: [PATCH 5/6] another typo in required.sh --- required.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/required.sh b/required.sh index d02fd7e..271fd0c 100644 --- a/required.sh +++ b/required.sh @@ -57,6 +57,6 @@ 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 git clone -b develop https://github.com/music-encoding/music-encoding /tmp/meidev mkdir -p ${MEI_SOURCES_HOME}/music-stylesheets/meidev -cp -r /tmp/meidev/*/* ${MEI_SOURCES_HOME}/music-stylesheets/meidev +cp -r /tmp/meidev/* ${MEI_SOURCES_HOME}/music-stylesheets/meidev rm -r /tmp/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 From bbb6f3523f43e83fed9cbe8710b748d38977d88b Mon Sep 17 00:00:00 2001 From: Anne Ferger Date: Wed, 4 May 2022 14:24:15 +0200 Subject: [PATCH 6/6] typo nr 3, time for coffee --- required.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/required.sh b/required.sh index 271fd0c..8011f0a 100644 --- a/required.sh +++ b/required.sh @@ -55,8 +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 -git clone -b develop https://github.com/music-encoding/music-encoding /tmp/meidev -mkdir -p ${MEI_SOURCES_HOME}/music-stylesheets/meidev -cp -r /tmp/meidev/* ${MEI_SOURCES_HOME}/music-stylesheets/meidev -rm -r /tmp/meidev +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