From f6c128fbf66b4ce55cf1ebee7c51e8fd1d5f849f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 23 Jan 2023 23:11:05 +0100 Subject: [PATCH] Create localization lproj directories on OS X + pkg dir structure cleanup --- .appveyor.yml | 6 ++--- gpxsee.pro | 26 +++++++++++-------- pkg/{ => common}/csv/ellipsoids.csv | 0 pkg/{ => common}/csv/gcs.csv | 0 pkg/{ => common}/csv/pcs.csv | 0 pkg/{ => common}/maps/4UMaps.xml | 0 pkg/{ => common}/maps/Antarctica.xml | 0 pkg/{ => common}/maps/OpenStreetMap.xml | 0 pkg/{ => common}/maps/OpenTopoMap.xml | 0 pkg/{ => common}/maps/USGS-imagery.xml | 0 pkg/{ => common}/maps/USGS-topo.xml | 0 pkg/{appdata.xml => linux/gpxsee.appdata.xml} | 0 pkg/{ => linux}/gpxsee.desktop | 0 pkg/{ => linux}/gpxsee.xml | 0 pkg/{ => mac}/Info.plist | 0 pkg/mac/lproj/ca.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/cs.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/da.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/de.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/en.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/eo.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/es.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/fi.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/fr.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/hu.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/it.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/nb.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/pl.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/pt.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/ru.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/sv.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/tr.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/uk.lproj/locversion.plist | 14 ++++++++++ pkg/mac/lproj/zh.lproj/locversion.plist | 14 ++++++++++ pkg/mac/scripts/lproj.sh | 21 +++++++++++++++ pkg/{ => windows}/gpxsee64.nsi | 0 36 files changed, 305 insertions(+), 14 deletions(-) rename pkg/{ => common}/csv/ellipsoids.csv (100%) rename pkg/{ => common}/csv/gcs.csv (100%) rename pkg/{ => common}/csv/pcs.csv (100%) rename pkg/{ => common}/maps/4UMaps.xml (100%) rename pkg/{ => common}/maps/Antarctica.xml (100%) rename pkg/{ => common}/maps/OpenStreetMap.xml (100%) rename pkg/{ => common}/maps/OpenTopoMap.xml (100%) rename pkg/{ => common}/maps/USGS-imagery.xml (100%) rename pkg/{ => common}/maps/USGS-topo.xml (100%) rename pkg/{appdata.xml => linux/gpxsee.appdata.xml} (100%) rename pkg/{ => linux}/gpxsee.desktop (100%) rename pkg/{ => linux}/gpxsee.xml (100%) rename pkg/{ => mac}/Info.plist (100%) create mode 100644 pkg/mac/lproj/ca.lproj/locversion.plist create mode 100644 pkg/mac/lproj/cs.lproj/locversion.plist create mode 100644 pkg/mac/lproj/da.lproj/locversion.plist create mode 100644 pkg/mac/lproj/de.lproj/locversion.plist create mode 100644 pkg/mac/lproj/en.lproj/locversion.plist create mode 100644 pkg/mac/lproj/eo.lproj/locversion.plist create mode 100644 pkg/mac/lproj/es.lproj/locversion.plist create mode 100644 pkg/mac/lproj/fi.lproj/locversion.plist create mode 100644 pkg/mac/lproj/fr.lproj/locversion.plist create mode 100644 pkg/mac/lproj/hu.lproj/locversion.plist create mode 100644 pkg/mac/lproj/it.lproj/locversion.plist create mode 100644 pkg/mac/lproj/nb.lproj/locversion.plist create mode 100644 pkg/mac/lproj/pl.lproj/locversion.plist create mode 100644 pkg/mac/lproj/pt.lproj/locversion.plist create mode 100644 pkg/mac/lproj/ru.lproj/locversion.plist create mode 100644 pkg/mac/lproj/sv.lproj/locversion.plist create mode 100644 pkg/mac/lproj/tr.lproj/locversion.plist create mode 100644 pkg/mac/lproj/uk.lproj/locversion.plist create mode 100644 pkg/mac/lproj/zh.lproj/locversion.plist create mode 100755 pkg/mac/scripts/lproj.sh rename pkg/{ => windows}/gpxsee64.nsi (100%) diff --git a/.appveyor.yml b/.appveyor.yml index db51f45d..05423011 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -28,9 +28,9 @@ build_script: md installer copy release\GPXSee.exe installer windeployqt --release installer\GPXSee.exe - copy pkg\gpxsee64.nsi installer - xcopy pkg\csv installer\csv /i - xcopy pkg\maps installer\maps /i + copy pkg\windows\gpxsee64.nsi installer + xcopy pkg\common\csv installer\csv /i + xcopy pkg\common\maps installer\maps /i xcopy lang\*.qm installer\translations\ /sy xcopy icons\symbols installer\symbols /i copy licence.txt installer diff --git a/gpxsee.pro b/gpxsee.pro index 20f77a07..b8e8c9d7 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -476,19 +476,21 @@ TRANSLATIONS = lang/gpxsee_en.ts \ macx { ICON = icons/app/gpxsee.icns - QMAKE_INFO_PLIST = pkg/Info.plist + QMAKE_INFO_PLIST = pkg/mac/Info.plist locale.path = Contents/Resources/translations locale.files = $$files(lang/*.qm) csv.path = Contents/Resources - csv.files = pkg/csv + csv.files = pkg/common/csv maps.path = Contents/Resources - maps.files = pkg/maps + maps.files = pkg/common/maps symbols.path = Contents/Resources/symbols symbols.files = $$files(icons/symbols/*.png) icons.path = Contents/Resources/icons icons.files = $$files(icons/formats/*.icns) + lproj.path = Contents/Resources + lproj.files = $$files(pkg/mac/lproj/*) - QMAKE_BUNDLE_DATA += locale maps symbols icons csv + QMAKE_BUNDLE_DATA += locale maps symbols icons csv lproj } win32 { @@ -533,9 +535,9 @@ win32 { unix:!macx:!android { isEmpty(PREFIX):PREFIX = /usr/local - maps.files = $$files(pkg/maps/*) + maps.files = $$files(pkg/common/maps/*) maps.path = $$PREFIX/share/gpxsee/maps - csv.files = $$files(pkg/csv/*) + csv.files = $$files(pkg/common/csv/*) csv.path = $$PREFIX/share/gpxsee/csv symbols.files = $$files(icons/symbols/*.png) symbols.path = $$PREFIX/share/gpxsee/symbols @@ -543,12 +545,14 @@ unix:!macx:!android { locale.path = $$PREFIX/share/gpxsee/translations icon.files = $$files(icons/app/hicolor/*) icon.path = $$PREFIX/share/icons/hicolor - desktop.files = pkg/gpxsee.desktop + desktop.files = pkg/linux/gpxsee.desktop desktop.path = $$PREFIX/share/applications - mime.files = pkg/gpxsee.xml + mime.files = pkg/linux/gpxsee.xml mime.path = $$PREFIX/share/mime/packages + appdata.files = pkg/linux/gpxsee.appdata.xml + appdata.path = $$PREFIX/share/metainfo target.path = $$PREFIX/bin - INSTALLS += target maps csv symbols locale icon desktop mime + INSTALLS += target maps csv symbols locale icon desktop mime appdata } android { @@ -581,9 +585,9 @@ android { pkg/android/build.gradle \ pkg/android/res/values/libs.xml - maps.files = $$files(pkg/maps/*) + maps.files = $$files(pkg/common/maps/*) maps.path = /assets/maps - csv.files = $$files(pkg/csv/*) + csv.files = $$files(pkg/common/csv/*) csv.path = /assets/csv symbols.files = $$files(icons/symbols/*.png) symbols.path = /assets/symbols diff --git a/pkg/csv/ellipsoids.csv b/pkg/common/csv/ellipsoids.csv similarity index 100% rename from pkg/csv/ellipsoids.csv rename to pkg/common/csv/ellipsoids.csv diff --git a/pkg/csv/gcs.csv b/pkg/common/csv/gcs.csv similarity index 100% rename from pkg/csv/gcs.csv rename to pkg/common/csv/gcs.csv diff --git a/pkg/csv/pcs.csv b/pkg/common/csv/pcs.csv similarity index 100% rename from pkg/csv/pcs.csv rename to pkg/common/csv/pcs.csv diff --git a/pkg/maps/4UMaps.xml b/pkg/common/maps/4UMaps.xml similarity index 100% rename from pkg/maps/4UMaps.xml rename to pkg/common/maps/4UMaps.xml diff --git a/pkg/maps/Antarctica.xml b/pkg/common/maps/Antarctica.xml similarity index 100% rename from pkg/maps/Antarctica.xml rename to pkg/common/maps/Antarctica.xml diff --git a/pkg/maps/OpenStreetMap.xml b/pkg/common/maps/OpenStreetMap.xml similarity index 100% rename from pkg/maps/OpenStreetMap.xml rename to pkg/common/maps/OpenStreetMap.xml diff --git a/pkg/maps/OpenTopoMap.xml b/pkg/common/maps/OpenTopoMap.xml similarity index 100% rename from pkg/maps/OpenTopoMap.xml rename to pkg/common/maps/OpenTopoMap.xml diff --git a/pkg/maps/USGS-imagery.xml b/pkg/common/maps/USGS-imagery.xml similarity index 100% rename from pkg/maps/USGS-imagery.xml rename to pkg/common/maps/USGS-imagery.xml diff --git a/pkg/maps/USGS-topo.xml b/pkg/common/maps/USGS-topo.xml similarity index 100% rename from pkg/maps/USGS-topo.xml rename to pkg/common/maps/USGS-topo.xml diff --git a/pkg/appdata.xml b/pkg/linux/gpxsee.appdata.xml similarity index 100% rename from pkg/appdata.xml rename to pkg/linux/gpxsee.appdata.xml diff --git a/pkg/gpxsee.desktop b/pkg/linux/gpxsee.desktop similarity index 100% rename from pkg/gpxsee.desktop rename to pkg/linux/gpxsee.desktop diff --git a/pkg/gpxsee.xml b/pkg/linux/gpxsee.xml similarity index 100% rename from pkg/gpxsee.xml rename to pkg/linux/gpxsee.xml diff --git a/pkg/Info.plist b/pkg/mac/Info.plist similarity index 100% rename from pkg/Info.plist rename to pkg/mac/Info.plist diff --git a/pkg/mac/lproj/ca.lproj/locversion.plist b/pkg/mac/lproj/ca.lproj/locversion.plist new file mode 100644 index 00000000..80c9dc8b --- /dev/null +++ b/pkg/mac/lproj/ca.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + ca + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/cs.lproj/locversion.plist b/pkg/mac/lproj/cs.lproj/locversion.plist new file mode 100644 index 00000000..db36b4cd --- /dev/null +++ b/pkg/mac/lproj/cs.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + cs + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/da.lproj/locversion.plist b/pkg/mac/lproj/da.lproj/locversion.plist new file mode 100644 index 00000000..172d9422 --- /dev/null +++ b/pkg/mac/lproj/da.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + da + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/de.lproj/locversion.plist b/pkg/mac/lproj/de.lproj/locversion.plist new file mode 100644 index 00000000..98a1b652 --- /dev/null +++ b/pkg/mac/lproj/de.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + de + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/en.lproj/locversion.plist b/pkg/mac/lproj/en.lproj/locversion.plist new file mode 100644 index 00000000..8a38d290 --- /dev/null +++ b/pkg/mac/lproj/en.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + en + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/eo.lproj/locversion.plist b/pkg/mac/lproj/eo.lproj/locversion.plist new file mode 100644 index 00000000..08ab0196 --- /dev/null +++ b/pkg/mac/lproj/eo.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + eo + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/es.lproj/locversion.plist b/pkg/mac/lproj/es.lproj/locversion.plist new file mode 100644 index 00000000..5498418a --- /dev/null +++ b/pkg/mac/lproj/es.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + es + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/fi.lproj/locversion.plist b/pkg/mac/lproj/fi.lproj/locversion.plist new file mode 100644 index 00000000..9094b011 --- /dev/null +++ b/pkg/mac/lproj/fi.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + fi + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/fr.lproj/locversion.plist b/pkg/mac/lproj/fr.lproj/locversion.plist new file mode 100644 index 00000000..84dd7454 --- /dev/null +++ b/pkg/mac/lproj/fr.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + fr + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/hu.lproj/locversion.plist b/pkg/mac/lproj/hu.lproj/locversion.plist new file mode 100644 index 00000000..95b0cc0c --- /dev/null +++ b/pkg/mac/lproj/hu.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + hu + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/it.lproj/locversion.plist b/pkg/mac/lproj/it.lproj/locversion.plist new file mode 100644 index 00000000..646af641 --- /dev/null +++ b/pkg/mac/lproj/it.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + it + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/nb.lproj/locversion.plist b/pkg/mac/lproj/nb.lproj/locversion.plist new file mode 100644 index 00000000..61cfa9ff --- /dev/null +++ b/pkg/mac/lproj/nb.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + nb + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/pl.lproj/locversion.plist b/pkg/mac/lproj/pl.lproj/locversion.plist new file mode 100644 index 00000000..05aad251 --- /dev/null +++ b/pkg/mac/lproj/pl.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + pl + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/pt.lproj/locversion.plist b/pkg/mac/lproj/pt.lproj/locversion.plist new file mode 100644 index 00000000..156511eb --- /dev/null +++ b/pkg/mac/lproj/pt.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + pt + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/ru.lproj/locversion.plist b/pkg/mac/lproj/ru.lproj/locversion.plist new file mode 100644 index 00000000..fc16b5df --- /dev/null +++ b/pkg/mac/lproj/ru.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + ru + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/sv.lproj/locversion.plist b/pkg/mac/lproj/sv.lproj/locversion.plist new file mode 100644 index 00000000..9a538e31 --- /dev/null +++ b/pkg/mac/lproj/sv.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + sv + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/tr.lproj/locversion.plist b/pkg/mac/lproj/tr.lproj/locversion.plist new file mode 100644 index 00000000..dfdb3641 --- /dev/null +++ b/pkg/mac/lproj/tr.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + tr + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/uk.lproj/locversion.plist b/pkg/mac/lproj/uk.lproj/locversion.plist new file mode 100644 index 00000000..cce8de5f --- /dev/null +++ b/pkg/mac/lproj/uk.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + uk + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/lproj/zh.lproj/locversion.plist b/pkg/mac/lproj/zh.lproj/locversion.plist new file mode 100644 index 00000000..9b5af6b4 --- /dev/null +++ b/pkg/mac/lproj/zh.lproj/locversion.plist @@ -0,0 +1,14 @@ + + + + + LprojCompatibleVersion + 123 + LprojLocale + zh + LprojRevisionLevel + 1 + LprojVersion + 123 + + diff --git a/pkg/mac/scripts/lproj.sh b/pkg/mac/scripts/lproj.sh new file mode 100755 index 00000000..7a707d0e --- /dev/null +++ b/pkg/mac/scripts/lproj.sh @@ -0,0 +1,21 @@ +#/bin/bash + +for QM in ../../../lang/*.qm; do + LANG=`echo $QM | cut -d'_' -f2 | cut -d. -f1` + DIR=../lproj/$LANG.lproj + mkdir -p $DIR + echo " + + + + LprojCompatibleVersion + 123 + LprojLocale + $LANG + LprojRevisionLevel + 1 + LprojVersion + 123 + +" > $DIR/locversion.plist +done diff --git a/pkg/gpxsee64.nsi b/pkg/windows/gpxsee64.nsi similarity index 100% rename from pkg/gpxsee64.nsi rename to pkg/windows/gpxsee64.nsi