Skip to content

Commit df61ca8

Browse files
riedderiedde
committed
Merge branch 'develop'
2 parents a7fa458 + 282de51 commit df61ca8

File tree

978 files changed

+159884
-78452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

978 files changed

+159884
-78452
lines changed

‎.github/workflows/build-data-package.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Build and publish data package
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
7+
permissions:
8+
contents: write
9+
packages: write
10+
11+
jobs:
12+
build-and-publish:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Setup Java
19+
uses: actions/setup-java@v4
20+
with:
21+
distribution: temurin
22+
java-version: '11'
23+
24+
- name: Install Ant, gh CLI and setup Saxon
25+
run: |
26+
sudo apt-get update
27+
sudo apt-get install -y ant gh curl
28+
mkdir -p scripts/libs
29+
curl -L https://github.com/Saxonica/Saxon-HE/releases/download/SaxonHE12-9/SaxonHE12-9J.zip -o saxon.zip
30+
unzip saxon.zip
31+
mv saxon-he-12.9.jar scripts/libs/
32+
rm saxon.zip
33+
34+
- name: Build data package
35+
run: |
36+
ant -lib scripts/libs data-package -DdataColl.type=public -Dbuild.env.ci=true
37+
38+
- name: Find artifact
39+
id: find
40+
run: |
41+
ART=$(ls dist/baudiData-*.xar 2>/dev/null | head -n1 || true)
42+
if [ -z "$ART" ]; then echo "No artifact found" && exit 1; fi
43+
echo "artifact=$ART" >> $GITHUB_OUTPUT
44+
45+
- name: Publish to this repo as Release asset
46+
env:
47+
TARGET_REPO: ${{ github.repository }} # current repo (will be private)
48+
TARGET_PAT: ${{ secrets.GITHUB_TOKEN }} # use GITHUB_TOKEN for same-repo writes
49+
ARTIFACT: ${{ steps.find.outputs.artifact }}
50+
run: |
51+
echo "$TARGET_PAT" | gh auth login --with-token
52+
VERSION=$(grep '^project.version=' build.properties | cut -d'=' -f2)
53+
if ! gh release view latest --repo "$TARGET_REPO" >/dev/null 2>&1; then
54+
gh release create latest "$ARTIFACT" --repo "$TARGET_REPO" --title "BauDi Data v$VERSION" --notes "Automated publish from CI"
55+
else
56+
gh release upload latest "$ARTIFACT" --repo "$TARGET_REPO"
57+
fi

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "submodules/crApp"]
2+
path = submodules/crApp
3+
url = git@github.com:riedde/crApp.git
4+
[submodule "submodules/baudi-odd"]
5+
path = submodules/baudi-odd
6+
url = https://github.com/Baumann-Digital/baudi-odd.git

‎baudi-data.code-workspace‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"folders": [
3+
{
4+
"path": "."
5+
},
6+
{
7+
"path": "../../JRA/jraData"
8+
}
9+
],
10+
"settings": {}
11+
}

‎build.properties‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,13 @@
55
# general
66
project.app=baudiData
77
project.name=Baumann-Digital Data
8+
project.version=1.0.1
89
project.url=https://github.com/Baumann-Digital/baudiData
910

10-
# build output dirs
11+
# output dirs
1112
build.dir=build
13+
dist.dir=dist
1214

1315
# engines
1416
bash.command=/bin/bash
1517
git.command=/usr/bin/git
16-
17-
# needed for eXist ANT tasks, e.g. the 'deploy' target
18-
exist.libs=/Users/opt/exist-distribution-6.0.1/lib
19-
20-
# Database root of eXist (where the xar package will get deployed)
21-
exist.db=xmldb:exist://localhost:8080/exist/xmlrpc/db
22-
exist.user=admin
23-
exist.pass=
24-
25-
db.user.name=baudi
26-
db.user.password=baudi
27-
db.user.group=baudi
28-
db.user.permissions=rwxrwxr-x

‎build.xml‎

Lines changed: 24 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project default="data-package" name="baudiData" basedir="." xmlns:unless="ant:unless">
2+
<project default="update-baudi-docker" name="baudiData" basedir="." xmlns:unless="ant:unless">
33
<dirname property="baudiData.basedir" file="${ant.file.baudiData}"/>
44

55
<!-- import default properties from file -->
@@ -12,16 +12,8 @@
1212
<delete file="repo.xml"/>
1313
</target>
1414

15-
<target name="clean" if="${build.dir}">
16-
<delete includeemptydirs="true">
17-
<fileset dir="${build.dir}" defaultexcludes="false">
18-
<!--<include name="*.xml"/>
19-
<include name="*.txt"/>-->
20-
<include name="**/*"/>
21-
<exclude name="*.xar"/>
22-
<exclude name="*.tar.gz"/>
23-
</fileset>
24-
</delete>
15+
<target name="clean">
16+
<delete dir="${build.dir}" includeemptydirs="true"/>
2517
</target>
2618

2719
<target name="init" depends="get-current-hash-of-HEAD">
@@ -43,73 +35,52 @@
4335
<filterset>
4436
<filter token="project.app" value="${project.app}"/>
4537
<filter token="project.name" value="${project.name}"/>
46-
<filter token="project.version" value="${local.revision}"/>
38+
<filter token="project.version" value="${project.version}-${local.revision}"/>
4739
<filter token="project.url" value="${project.url}"/>
4840
</filterset>
4941
</copy>
5042
<copy file="repo.xml.tmpl" tofile="repo.xml" filtering="true" overwrite="true">
5143
<filterset>
5244
<filter token="data.target" value="${project.app}"/>
5345
<filter token="project.name" value="${project.name}"/>
54-
<filter token="db.user.name" value="${db.user.name}"/>
55-
<filter token="db.user.password" value="${db.user.password}"/>
56-
<filter token="db.user.group" value="${db.user.group}"/>
57-
<filter token="db.user.permissions" value="${db.user.permissions}"/>
5846
</filterset>
5947
</copy>
60-
<zip destfile="${build.dir}/${project.app}-${local.revision}.xar">
48+
<zip destfile="${dist.dir}/${project.app}-${project.version}-${local.revision}.xar">
6149
<fileset dir=".">
6250
<include name="**/*.*"/>
51+
<exclude name="texts/documentation/"/>
52+
<exclude name="texts/textsAlt/"/>
53+
<exclude name="**/alt/"/>
6354
<exclude name="**/baudi-06-dummy.xml"/>
55+
<exclude name="periodicals/"/>
6456
<exclude name="build.xml"/>
6557
<exclude name=".existdb.json"/>
6658
<exclude name=".git*"/>
6759
<exclude name="*.tmpl"/>
6860
<exclude name="*.xpr"/>
6961
<exclude name="*.properties"/>
70-
<exclude name="build/**"/>
62+
<exclude name="${build.dir}/"/>
63+
<exclude name="${dist.dir}/"/>
7164
<exclude name="blob/"/>
7265
<exclude name="**/__contents__.xml"/>
66+
<exclude name="submodules/"/>
67+
<exclude name="*.xar"/>
68+
<exclude name="*.tar.gz"/>
7369
</fileset>
7470
</zip>
71+
<antcall target="clean"/>
7572
</target>
7673

77-
<!-- Deploy directly to localhost -->
78-
<target name="deploy" depends="clean, data-package">
79-
<path id="classpath.eXist">
80-
<fileset dir="${exist.libs}" erroronmissingdir="no">
81-
<include name="*.jar"/>
74+
<!-- Copy xar package to baudi-docker repo (autodeploy) -->
75+
<target name="update-baudi-docker" depends="data-package">
76+
<echo>Delete old packages</echo>
77+
<delete>
78+
<fileset dir="${baudiData.basedir}/../baudi-docker/autodeploy">
79+
<include name="${project.app}-*.xar"/>
8280
</fileset>
83-
</path>
84-
<typedef resource="org/exist/ant/antlib.xml" uri="http://exist-db.org/ant">
85-
<classpath refid="classpath.eXist"/>
86-
</typedef>
87-
88-
<!-- store xar-file in eXist-db -->
89-
<xdb:store xmlns:xdb="http://exist-db.org/ant"
90-
uri="${exist.db}/tmp"
91-
createcollection="true"
92-
createsubcollections="true"
93-
user="${exist.user}"
94-
password="${exist.pass}"
95-
failonerror="true">
96-
<fileset file="${build.dir}/${project.app}-${local.revision}.xar"/>
97-
</xdb:store>
98-
99-
<!-- Deploy the xar -->
100-
<xdb:xquery xmlns:xdb="http://exist-db.org/ant"
101-
uri="${exist.db}"
102-
user="${exist.user}"
103-
password="${exist.pass}">
104-
(
105-
if("${project.url}" = repo:list()) then (
106-
repo:undeploy("${project.url}"),
107-
repo:remove("${project.url}")
108-
)
109-
else (),
110-
repo:install-and-deploy-from-db("/db/tmp/${project.app}-${local.revision}.xar")
111-
)
112-
</xdb:xquery>
81+
</delete>
82+
<echo>Add new package</echo>
83+
<copy file="${dist.dir}/${project.app}-${project.version}-${local.revision}.xar" todir="${baudiData.basedir}/../baudi-docker/autodeploy" overwrite="yes"/>
11384
</target>
11485

11586
</project>

‎editions/baudi-14-2b84beeb/baudi-14-4e1c16e3.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
</manifestationList>
3939
</meiHead>
4040
<music>
41-
<facsimile>
41+
<facsimile>
4242
<surface xml:id="surface_7fea246c-891d-4e5e-b2c5-ac93817b9ff5" n="1" ulx="0" uly="0" lrx="1654" lry="2339">
43-
<graphic xml:id="graphic_fbb32b75-21a1-41ea-b674-598bb28690d3" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page1.png?dh=1000" type="facsimile" width="1654" height="2339"/>
43+
<graphic xml:id="graphic_fbb32b75-21a1-41ea-b674-598bb28690d3" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page1.jpg" type="facsimile" width="1654" height="2339"/>
4444
<zone xml:id="zone_49470a05-3833-45a8-9073-dfa98785e079" type="measure" ulx="182" uly="336" lrx="432" lry="718"/>
4545
<zone xml:id="zone_05874923-ef9a-40a0-8928-520ac2473a29" type="measure" ulx="404" uly="330" lrx="552" lry="710"/>
4646
<zone xml:id="zone_607295c5-1c08-4509-963c-c698defd8ba9" type="measure" ulx="526" uly="324" lrx="684" lry="718"/>
@@ -81,7 +81,7 @@
8181
<zone xml:id="zone_5d80f3a0-0b80-4d52-901e-def2225ea059" type="measure" ulx="1392" uly="1778" lrx="1532" lry="2170"/>
8282
</surface>
8383
<surface xml:id="surface_ed8a76af-3911-4b9f-bbc5-3cde64396915" n="2" ulx="0" uly="0" lrx="1654" lry="2339">
84-
<graphic xml:id="graphic_572522f8-5df1-4d4a-a9d4-b6acfbb22733" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page2.png?dh=1000" type="facsimile" width="1654" height="2339"/>
84+
<graphic xml:id="graphic_572522f8-5df1-4d4a-a9d4-b6acfbb22733" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page2.jpg" type="facsimile" width="1654" height="2339"/>
8585
<zone xml:id="zone_febb9f13-f9dd-4e1f-a836-4e23192ae04e" type="measure" ulx="106" uly="182" lrx="472" lry="628"/>
8686
<zone xml:id="zone_396045d1-93fd-4ff7-a5d2-a38b7280abd7" type="measure" ulx="446" uly="164" lrx="576" lry="638"/>
8787
<zone xml:id="zone_df2fa708-53ea-4124-a568-dd24bfec1f67" type="measure" ulx="546" uly="174" lrx="718" lry="626"/>
@@ -142,7 +142,7 @@
142142
<zone xml:id="zone_f668aec9-3020-40d1-ad22-ef59ec0d9ff2" type="measure" ulx="1300" uly="1854" lrx="1534" lry="2120"/>
143143
</surface>
144144
<surface xml:id="surface_87fc941b-7743-4367-a6ae-3f468482e919" n="3" ulx="0" uly="0" lrx="1654" lry="2339">
145-
<graphic xml:id="graphic_31eff4ef-95fb-4cd5-a113-67ce757ffdc7" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page3.png?dh=1000" type="facsimile" width="1654" height="2339"/>
145+
<graphic xml:id="graphic_31eff4ef-95fb-4cd5-a113-67ce757ffdc7" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page3.jpg" type="facsimile" width="1654" height="2339"/>
146146
<zone xml:id="zone_95df2d7c-7b5e-48bf-ad52-d576d73c2e6b" type="measure" ulx="78" uly="180" lrx="448" lry="434"/>
147147
<zone xml:id="zone_92c637f0-f78c-4813-abab-e631b3ec5357" type="measure" ulx="416" uly="182" lrx="572" lry="438"/>
148148
<zone xml:id="zone_b97b0470-9256-49b2-8056-33c410450460" type="measure" ulx="546" uly="184" lrx="676" lry="446"/>
@@ -191,7 +191,7 @@
191191
<zone xml:id="zone_acd27199-11f1-4ec3-b96c-ba604c51608c" type="measure" ulx="1330" uly="1754" lrx="1536" lry="2066"/>
192192
</surface>
193193
<surface xml:id="surface_e1b9f650-4fb5-41da-8e9e-caf5ce5eb3ce" n="4" ulx="0" uly="0" lrx="1654" lry="2339">
194-
<graphic xml:id="graphic_914d27e9-50ee-467f-8e0d-6384aaca7e9d" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page4.png?dh=1000" type="facsimile" width="1654" height="2339"/>
194+
<graphic xml:id="graphic_914d27e9-50ee-467f-8e0d-6384aaca7e9d" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page4.jpg" type="facsimile" width="1654" height="2339"/>
195195
<zone xml:id="zone_d28ea268-32e5-4e37-a637-287de37e5afd" type="measure" ulx="104" uly="142" lrx="404" lry="406"/>
196196
<zone xml:id="zone_55a3a1ad-b852-4f3f-8a0b-d7d49953a10f" type="measure" ulx="368" uly="150" lrx="554" lry="416"/>
197197
<zone xml:id="zone_5eec14f5-3fee-4f94-9d31-e625b7325ce5" type="measure" ulx="526" uly="160" lrx="712" lry="432"/>
@@ -249,7 +249,7 @@
249249
<zone xml:id="zone_38321719-35c5-4832-8709-aaef37d02ff2" type="measure" ulx="1370" uly="1908" lrx="1530" lry="2192"/>
250250
</surface>
251251
<surface xml:id="surface_e99ef733-a596-41fd-acd9-e6c3672a063d" n="5" ulx="0" uly="0" lrx="1654" lry="2339">
252-
<graphic xml:id="graphic_daac9b91-83c5-4b69-b499-a08c6ca10253" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page5.png?dh=1000" type="facsimile" width="1654" height="2339"/>
252+
<graphic xml:id="graphic_daac9b91-83c5-4b69-b499-a08c6ca10253" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page5.jpg" type="facsimile" width="1654" height="2339"/>
253253
<zone xml:id="zone_3c776a12-d6ae-460d-ac72-d374b9b88eab" type="measure" ulx="122" uly="180" lrx="506" lry="446"/>
254254
<zone xml:id="zone_9fbe4b74-b467-4186-9270-bba1f3ec3303" type="measure" ulx="490" uly="188" lrx="702" lry="452"/>
255255
<zone xml:id="zone_5a0fd1ef-f8b4-4ab6-a314-190cabf24596" type="measure" ulx="682" uly="180" lrx="802" lry="452"/>
@@ -297,7 +297,7 @@
297297
<zone xml:id="zone_42e27388-233e-4b68-8723-c4b2d9f596b1" type="measure" ulx="1394" uly="1880" lrx="1528" lry="2184"/>
298298
</surface>
299299
<surface xml:id="surface_5e1bc170-fc3d-4d5c-bedc-f985cf421a6e" n="6" ulx="0" uly="0" lrx="1654" lry="2339">
300-
<graphic xml:id="graphic_e6b0abee-e5f3-4213-aeb2-af8be4172a71" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page6.png?dh=1000" type="facsimile" width="1654" height="2339"/>
300+
<graphic xml:id="graphic_e6b0abee-e5f3-4213-aeb2-af8be4172a71" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page6.jpg" type="facsimile" width="1654" height="2339"/>
301301
<zone xml:id="zone_45ed4005-70e1-4c60-aec9-549cb8cefc4e" type="measure" ulx="100" uly="180" lrx="414" lry="486"/>
302302
<zone xml:id="zone_93456907-f297-427b-9f05-344faf7dbbf3" type="measure" ulx="392" uly="184" lrx="568" lry="484"/>
303303
<zone xml:id="zone_2e863d1c-53a0-498a-b3b6-c7a52723e82e" type="measure" ulx="534" uly="178" lrx="718" lry="476"/>
@@ -351,7 +351,7 @@
351351
<zone xml:id="zone_100fbb48-6075-4637-ae53-eb3d137bae2d" type="measure" ulx="1396" uly="1824" lrx="1524" lry="2122"/>
352352
</surface>
353353
<surface xml:id="surface_26c9b9a6-15d7-4e17-8726-d2bd5b61bfd1" n="7" ulx="0" uly="0" lrx="1654" lry="2339">
354-
<graphic xml:id="graphic_687fb32a-e055-4836-9c6f-c564a10d9a37" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page7.png?dh=1000" type="facsimile" width="1654" height="2339"/>
354+
<graphic xml:id="graphic_687fb32a-e055-4836-9c6f-c564a10d9a37" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page7.jpg" type="facsimile" width="1654" height="2339"/>
355355
<zone xml:id="zone_c65760f8-9275-4610-9fc6-875a1fa0ae0d" type="measure" ulx="176" uly="200" lrx="470" lry="492"/>
356356
<zone xml:id="zone_6b77fddc-67f6-4d06-b70a-89ffa05bc46e" type="measure" ulx="440" uly="204" lrx="604" lry="482"/>
357357
<zone xml:id="zone_212c4bed-8f5c-4dc5-b25a-a6aad83238bb" type="measure" ulx="574" uly="196" lrx="810" lry="508"/>
@@ -394,7 +394,7 @@
394394
<zone xml:id="zone_d5c36e85-edb2-44cc-a973-ca032ee1d543" type="measure" ulx="1369" uly="1805" lrx="1537" lry="2186"/>
395395
</surface>
396396
<surface xml:id="surface_c0446cab-a4cd-4f41-a169-9069b26cbcce" n="8" ulx="0" uly="0" lrx="1654" lry="2339">
397-
<graphic xml:id="graphic_b2656129-0996-48b0-9f92-9a134edf5796" target="https://digilib.baumann-digital.de/BauDi/14/baudi-14-4e1c16e3/DR-doctoral-thesis-part1-3-music-harmoniumVoice-page8.png?dh=1000" type="facsimile" width="1654" height="2339"/>
397+
<graphic xml:id="graphic_b2656129-0996-48b0-9f92-9a134edf5796" target="https://digilib.baumann-digital.de/IIIF/BauDi!14!baudi-14-4e1c16e3!DR-doctoral-thesis-part1-3-music-harmoniumVoice-page8.jpg" type="facsimile" width="1654" height="2339"/>
398398
<zone xml:id="zone_01b305cd-518b-4e5f-bab8-e204025008bb" type="measure" ulx="146" uly="192" lrx="430" lry="494"/>
399399
<zone xml:id="zone_a5236da6-58b7-450b-b197-f05fa2ba20bb" type="measure" ulx="402" uly="194" lrx="660" lry="492"/>
400400
<zone xml:id="zone_c4740b66-cd72-4073-ae28-1849b4d95bad" type="measure" ulx="634" uly="196" lrx="774" lry="490"/>
@@ -441,7 +441,7 @@
441441
</surface>
442442
</facsimile>
443443
<body>
444-
<mdiv xml:id="page_4859da81-600d-4ea3-aba6-2d6341e61a3b" n="1" label="">
444+
<mdiv xml:id="page_4859da81-600d-4ea3-aba6-2d6341e61a3b" n="1" label="Vorspiel">
445445
<score>
446446
<scoreDef/>
447447
<section>

0 commit comments

Comments
 (0)