change makefiles extension

cceh · Sep 8, 2024 · 524c6df · 524c6df
1 parent aa8cd4d
commit 524c6df
Show file tree

Hide file tree

Showing 41 changed files with 894 additions and 977 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-include Variables.mak
+include variables.mak
 
 THEMES  = themes/Capitularia
 PLUGINS = $(wildcard plugins/cap-*)
@@ -11,7 +11,7 @@ clean:
 
 deploy: clean geodata-client deploy_php
 
-deploy_php: lint mo js
+deploy_php: mo js
 	$(RSYNC) themes  $(WPCONTENT)
 	$(RSYNC) plugins $(WPCONTENT)
 	$(RSYNC) --delete --exclude "api.conf.js" dist $(WPCONTENT)
@@ -38,7 +38,7 @@ deploy_schemas:
 
 deploy_server:
 	cd $(SERVER) && $(MAKE) deploy
-	$(RSYNC) Makefile* Variables.mak $(HOST_PRJ_DIR)/
+	$(RSYNC) Makefile* variables.mak $(HOST_PRJ_DIR)/
 	$(RSYNC) solr $(HOST_PRJ_DIR)/
 
 import_xml: import_mss import_capits
@@ -126,7 +126,7 @@ solr-logs:
 	less $(SOLR_INST)/server/logs/solr.log
 
 solr-prereq:
-	cp $(SOLR_PRJ)/lib/build/libs/lib.jar $(SOLR_INST)/lib/capitularia.jar
+	cp $(SOLR_PRJ)/lib/build/libs/capitularia-lucene-tools.jar $(SOLR_INST)/lib/
 
 # needs VPN
 psql-remote:

diff --git a/gis/Makefile b/gis/Makefile
@@ -1,4 +1,4 @@
-include ../Variables.mak
+include ../variables.mak
 
 IMPORT := cd ../server; python3 -m scripts.import_data -vv -c ./server.conf
 

diff --git a/Makefile.inc → include.mak b/Makefile.inc → include.mak
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
     "dependencies": {
         "@babel/runtime": "^7.25.6",
         "@popperjs/core": "^2.11.8",
-        "@wordpress/i18n": "^5.6.0",
+        "@wordpress/i18n": "^5.7.0",
         "axios": "^1.7.7",
         "bootstrap": "^5.3.3",
         "d3": "^7.9.0",
@@ -32,7 +32,7 @@
         "panzoom": "^9.4.3",
         "papaparse": "^5.4.1",
         "url": "^0.11.4",
-        "vue": "^3.4.38",
+        "vue": "^3.5.3",
         "vue-cookies": "^1.8.4",
         "vue-router": "^4.4.3",
         "vuex": "^4.1.0"
@@ -42,22 +42,22 @@
         "@babel/plugin-transform-runtime": "^7.25.4",
         "@babel/preset-env": "^7.25.4",
         "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "^9.9.1",
-        "@fontsource/open-sans": "^5.0.29",
+        "@eslint/js": "^9.10.0",
+        "@fontsource/open-sans": "^5.0.30",
         "@fortawesome/fontawesome-free": "^6.6.0",
         "@types/bootstrap": "^5.2.10",
         "@types/lodash-es": "^4.17.12",
-        "@vue/compiler-sfc": "^3.4.38",
+        "@vue/compiler-sfc": "^3.5.3",
         "autoprefixer": "^10.4.20",
         "babel-loader": "^9.1.3",
         "cheerio": "1.0.0-rc.12",
         "chokidar": "^3.6.0",
         "css-loader": "^7.1.2",
         "easygettext": "^2.17.0",
-        "eslint": "^9.9.1",
-        "eslint-config-airbnb-base": "*",
+        "eslint": "^9.10.0",
+        "eslint-config-airbnb-base": "^15.0.0",
         "eslint-formatter-unix": "^8.40.0",
-        "eslint-plugin-vue": "^9.27.0",
+        "eslint-plugin-vue": "^9.28.0",
         "eslint-webpack-plugin": "^4.2.0",
         "file-loader": "^6.2.0",
         "glob": "^11.0.0",
@@ -69,13 +69,13 @@
         "jsdoc-vuejs": "^4.0.0",
         "jshint": "^2.13.6",
         "mini-css-extract-plugin": "^2.9.1",
-        "postcss": "^8.4.42",
+        "postcss": "^8.4.45",
         "postcss-loader": "^8.1.1",
         "postcss-nested": "^6.2.0",
         "postcss-preset-env": "^10.0.2",
         "prettier": "^3.3.3",
-        "puppeteer-core": "^23.2.1",
-        "sass": "^1.77.8",
+        "puppeteer-core": "^23.3.0",
+        "sass": "^1.78.0",
         "sass-loader": "^16.0.1",
         "stream-browserify": "^3.0.0",
         "style-loader": "^4.0.0",
@@ -86,12 +86,12 @@
         "vue-loader": "^17.4.2",
         "webpack": "^5.94.0",
         "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^5.0.4",
+        "webpack-dev-server": "^5.1.0",
         "webpack-manifest-plugin": "^5.0.0",
         "webpack-merge": "^6.0.1"
     },
     "optionalDependencies": {
-        "sass-embedded": "^1.77.8"
+        "sass-embedded": "^1.78.0"
     },
     "devDependenciesMore": {
         "eslint-config-airbnb": "*",

diff --git a/plugins/cap-collation/Makefile b/plugins/cap-collation/Makefile
@@ -1 +1 @@
-include ../Makefile.inc
+include ../include.mak
diff --git a/plugins/cap-collation/src/languages/capitularia.pot b/plugins/cap-collation/src/languages/capitularia.pot
@@ -10,7 +10,7 @@ msgstr ""
 "#-#-#-#-#  php.pot (Capitularia 2.0)  #-#-#-#-#\n"
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-07-10 15:12+0200\n"
+"POT-Creation-Date: 2024-09-08 15:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -29,30 +29,30 @@ msgstr ""
 "Generated-By: easygettext\n"
 "Project-Id-Version: \n"
 
-#: cap-collation.php:54
+#: cap-collation.php:53
 msgid "Capitularia Collation Tool"
 msgstr ""
 
-#: cap-collation.php:55
+#: cap-collation.php:54
 msgid "Collates TEI files."
 msgstr ""
 
-#: src/js/tools.js:128
+#: src/js/tools.js:138
 msgctxt "2., 3., etc. copy of capitularies"
 msgid " ($1. copy)"
 msgstr ""
 
-#: src/js/tools.js:129
+#: src/js/tools.js:137
 msgctxt "corrected version of capitularies"
 msgid " (corrected)"
 msgstr ""
 
-#: src/js/tools.js:132
+#: src/js/tools.js:146 src/js/tools.js:150
 msgctxt "title of the edition"
 msgid "Edition by Boretius/Krause"
 msgstr ""
 
-#: src/js/front.js:21
+#: src/js/front.js:26
 msgid "el"
 msgstr ""
 
@@ -61,19 +61,19 @@ msgctxt "context"
 msgid "msg"
 msgstr ""
 
-#: src/js/front.js:10
+#: src/js/front.js:15
 msgid "text"
 msgstr ""
 
-#: src/js/main.vue:42
+#: src/js/main.vue:33
 msgid "Add Section"
 msgstr ""
 
 #: src/js/selector.vue:4
 msgid "Capitulary"
 msgstr ""
 
-#: src/js/main.vue:72
+#: src/js/main.vue:69
 msgid "Collate"
 msgstr ""
 
@@ -93,15 +93,15 @@ msgstr ""
 msgid "Include this textual witness in the collation."
 msgstr ""
 
-#: src/js/main.vue:46
+#: src/js/main.vue:39
 msgid "Load Configuration"
 msgstr ""
 
 #: src/js/selector.vue:92
 msgid "No textual witnesses found."
 msgstr ""
 
-#: src/js/main.vue:58
+#: src/js/main.vue:51
 msgid "Save Configuration"
 msgstr ""
 

diff --git a/plugins/cap-collation/src/languages/de_DE.po b/plugins/cap-collation/src/languages/de_DE.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: @cceh/capitularia 0.1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-07-10 15:12+0200\n"
+"POT-Creation-Date: 2024-09-08 15:12+0200\n"
 "PO-Revision-Date: 2020-11-05 18:41+0100\n"
 "Last-Translator: Marcello Perathoner <[email protected]>\n"
 "Language-Team: German <>\n"
@@ -13,30 +13,30 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
-#: cap-collation.php:54
+#: cap-collation.php:53
 msgid "Capitularia Collation Tool"
 msgstr "Capitularia Kollationstool"
 
-#: cap-collation.php:55
+#: cap-collation.php:54
 msgid "Collates TEI files."
 msgstr "Kollationiert TEI-Dateien."
 
-#: src/js/tools.js:128
+#: src/js/tools.js:138
 msgctxt "2., 3., etc. copy of capitularies"
 msgid " ($1. copy)"
 msgstr " ($1. Kopie)"
 
-#: src/js/tools.js:129
+#: src/js/tools.js:137
 msgctxt "corrected version of capitularies"
 msgid " (corrected)"
 msgstr " (korrigiert)"
 
-#: src/js/tools.js:132
+#: src/js/tools.js:146 src/js/tools.js:150
 msgctxt "title of the edition"
 msgid "Edition by Boretius/Krause"
 msgstr "Boretius/Krause Edition"
 
-#: src/js/front.js:21
+#: src/js/front.js:26
 msgid "el"
 msgstr ""
 
@@ -45,19 +45,19 @@ msgctxt "context"
 msgid "msg"
 msgstr ""
 
-#: src/js/front.js:10
+#: src/js/front.js:15
 msgid "text"
 msgstr ""
 
-#: src/js/main.vue:42
+#: src/js/main.vue:33
 msgid "Add Section"
 msgstr "Abschnitt hinzufügen"
 
 #: src/js/selector.vue:4
 msgid "Capitulary"
 msgstr "Kapitular"
 
-#: src/js/main.vue:72
+#: src/js/main.vue:69
 msgid "Collate"
 msgstr "Kollationieren"
 
@@ -77,15 +77,15 @@ msgstr "Korrekturen von anderer Hand einschließen"
 msgid "Include this textual witness in the collation."
 msgstr "Diesen Textzeugen in die Kollation einbeziehen."
 
-#: src/js/main.vue:46
+#: src/js/main.vue:39
 msgid "Load Configuration"
 msgstr "Konfiguration laden"
 
 #: src/js/selector.vue:92
 msgid "No textual witnesses found."
 msgstr "Keine Textzeugen gefunden."
 
-#: src/js/main.vue:58
+#: src/js/main.vue:51
 msgid "Save Configuration"
 msgstr "Konfiguration speichern"
 

diff --git a/plugins/cap-collation/src/languages/js.pot b/plugins/cap-collation/src/languages/js.pot
@@ -5,22 +5,23 @@ msgstr ""
 "Generated-By: easygettext\n"
 "Project-Id-Version: \n"
 
-#: src/js/tools.js:128
+#: src/js/tools.js:138
 msgctxt "2., 3., etc. copy of capitularies"
 msgid " ($1. copy)"
 msgstr ""
 
-#: src/js/tools.js:129
+#: src/js/tools.js:137
 msgctxt "corrected version of capitularies"
 msgid " (corrected)"
 msgstr ""
 
-#: src/js/tools.js:132
+#: src/js/tools.js:146
+#: src/js/tools.js:150
 msgctxt "title of the edition"
 msgid "Edition by Boretius/Krause"
 msgstr ""
 
-#: src/js/front.js:21
+#: src/js/front.js:26
 msgid "el"
 msgstr ""
 
@@ -29,6 +30,6 @@ msgctxt "context"
 msgid "msg"
 msgstr ""
 
-#: src/js/front.js:10
+#: src/js/front.js:15
 msgid "text"
 msgstr ""
diff --git a/plugins/cap-collation/src/languages/php.pot b/plugins/cap-collation/src/languages/php.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Capitularia 2.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-07-10 15:12+0200\n"
+"POT-Creation-Date: 2024-09-08 15:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -17,10 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cap-collation.php:54
+#: cap-collation.php:53
 msgid "Capitularia Collation Tool"
 msgstr ""
 
-#: cap-collation.php:55
+#: cap-collation.php:54
 msgid "Collates TEI files."
 msgstr ""
diff --git a/plugins/cap-collation/src/languages/vue.pot b/plugins/cap-collation/src/languages/vue.pot
@@ -5,15 +5,15 @@ msgstr ""
 "Generated-By: easygettext\n"
 "Project-Id-Version: \n"
 
-#: src/js/main.vue:42
+#: src/js/main.vue:33
 msgid "Add Section"
 msgstr ""
 
 #: src/js/selector.vue:4
 msgid "Capitulary"
 msgstr ""
 
-#: src/js/main.vue:72
+#: src/js/main.vue:69
 msgid "Collate"
 msgstr ""
 
@@ -33,15 +33,15 @@ msgstr ""
 msgid "Include this textual witness in the collation."
 msgstr ""
 
-#: src/js/main.vue:46
+#: src/js/main.vue:39
 msgid "Load Configuration"
 msgstr ""
 
 #: src/js/selector.vue:92
 msgid "No textual witnesses found."
 msgstr ""
 
-#: src/js/main.vue:58
+#: src/js/main.vue:51
 msgid "Save Configuration"
 msgstr ""
 

diff --git a/plugins/cap-dynamic-menu/Makefile b/plugins/cap-dynamic-menu/Makefile
@@ -1 +1 @@
-include ../Makefile.inc
+include ../include.mak