diff --git a/bin/translations/README b/bin/translations/README deleted file mode 100644 index 13cf581b..00000000 --- a/bin/translations/README +++ /dev/null @@ -1,2 +0,0 @@ -The translations in this directory are checked in specifically for snap builds. -Other release builds will just overwrite these files as part of their build processes. \ No newline at end of file diff --git a/dev/flatpak/build_flatpak b/dev/flatpak/build_flatpak index 9424e6c4..15395a55 100755 --- a/dev/flatpak/build_flatpak +++ b/dev/flatpak/build_flatpak @@ -19,7 +19,7 @@ # 3) sudo apt install flatpak-builder # 4) Install engauge-specific github repo # cd $HOME -# git clone git@github.com:flathub/io.github.markummitchell.Engauge_Digitizer.git +# git clone git@github.com:flathub/io.github.markummitchell.Engauge_Digitizegit # 5) Running this script gives error about org.kde.Sdk/x86_64/5.11 not installed so # flatpak install flathub org.kde.Sdk # and pick the version option matching the error message @@ -45,7 +45,8 @@ # + /usr/.../xdg-desktop-portal-kde & # + /usr/.../xdg-desktop-portal & (this connects later flatpak apps to KDE) # + flatpak run io.github.markummitchell.Engauge_Digitizer - +# 9) Got error 'Note that the directories .. are not in the search path set by XDG_DATA_DIRS environment variable' +# fix: edit ~/.bashrc and do 'export XDG_DATA_DIRS=..:$XDG_DATA_DIRS' where .. are the missing directories if [[ -z $1 ]]; then echo "Usage: build_flathub " exit diff --git a/dev/snapcraft/snapcraft.yaml b/dev/snapcraft/snapcraft.yaml index 0d143c31..e7ce367c 100644 --- a/dev/snapcraft/snapcraft.yaml +++ b/dev/snapcraft/snapcraft.yaml @@ -14,42 +14,29 @@ parts: stage-packages: [qttools5-dev, libqt5gui5, libqt5sql5-sqlite, libfftw3-double3, libpoppler-dev, libpoppler-qt5-dev] project-files: [engauge.pro] after: [help] + translations: + plugin: dump + source: translations + files: + - translations/engauge_ar.qm : bin/translations + - translations/engauge_cs.qm : bin/translations + - translations/engauge_de.qm : bin/translations + - translations/engauge_es.qm : bin/translations + - translations/engauge_fa_IR.qm : bin/translations + - translations/engauge_fr.qm : bin/translations + - translations/engauge_hi.qm : bin/translations + - translations/engauge_it.qm : bin/translations + - translations/engauge_ja.qm : bin/translations + - translations/engauge_kk.qm : bin/translations + - translations/engauge_ko.qm : bin/translations + - translations/engauge_nb.qm : bin/translations + - translations/engauge_pt.qm : bin/translations + - translations/engauge_ru.qm : bin/translations + - translations/engauge_zh.qm : bin/translations help: plugin: dump - stage: [engauge, documentation/engauge.qch, documentation/engauge.qhc, - bin/translations/engauge_ar.qm, - bin/translations/engauge_cs.qm, - bin/translations/engauge_de.qm, - bin/translations/engauge_es.qm, - bin/translations/engauge_fa_IR.qm, - bin/translations/engauge_fr.qm, - bin/translations/engauge_hi.qm, - bin/translations/engauge_it.qm, - bin/translations/engauge_ja.qm, - bin/translations/engauge_kk.qm, - bin/translations/engauge_ko.qm, - bin/translations/engauge_nb.qm, - bin/translations/engauge_pt.qm, - bin/translations/engauge_ru.qm, - bin/translations/engauge_zh.qm, - ] - prime: [engauge, documentation/engauge.qch, documentation/engauge.qhc, - bin/translations/engauge_ar.qm, - bin/translations/engauge_cs.qm, - bin/translations/engauge_de.qm, - bin/translations/engauge_es.qm, - bin/translations/engauge_fa_IR.qm, - bin/translations/engauge_fr.qm, - bin/translations/engauge_hi.qm, - bin/translations/engauge_it.qm, - bin/translations/engauge_ja.qm, - bin/translations/engauge_kk.qm, - bin/translations/engauge_ko.qm, - bin/translations/engauge_nb.qm, - bin/translations/engauge_pt.qm, - bin/translations/engauge_ru.qm, - bin/translations/engauge_zh.qm, - ] + stage: [engauge, documentation/engauge.qch, documentation/engauge.qhc] + prime: [engauge, documentation/engauge.qch, documentation/engauge.qhc] after: [desktop-file] desktop-file: source: desktop-file diff --git a/translations/.gitignore b/translations/.gitignore index 8c341c61..1ad75b60 100644 --- a/translations/.gitignore +++ b/translations/.gitignore @@ -1,5 +1,7 @@ .download .local __pycache__ -*.qm for* +# DO NOT IGNORE qm FILES! THEY ARE REQUIRED FOR SNAP AND FLATPAK BUILDS IN THIS DIRECTORY SINCE bin/translations +# DIRECTORY IS EXCLUDED FROM 'Source code (tar.gz)' FILE AUTOMATICALLY BUILT BY GITHUB FOR EACH NEW RELEASE SO +# THE SNAP/FLATPAK BUILD SCRIPTS COPY THEM FROM THIS FILE diff --git a/bin/translations/engauge_ar.qm b/translations/engauge_ar.qm similarity index 100% rename from bin/translations/engauge_ar.qm rename to translations/engauge_ar.qm diff --git a/bin/translations/engauge_cs.qm b/translations/engauge_cs.qm similarity index 100% rename from bin/translations/engauge_cs.qm rename to translations/engauge_cs.qm diff --git a/bin/translations/engauge_de.qm b/translations/engauge_de.qm similarity index 100% rename from bin/translations/engauge_de.qm rename to translations/engauge_de.qm diff --git a/bin/translations/engauge_en.qm b/translations/engauge_en.qm similarity index 100% rename from bin/translations/engauge_en.qm rename to translations/engauge_en.qm diff --git a/bin/translations/engauge_es.qm b/translations/engauge_es.qm similarity index 100% rename from bin/translations/engauge_es.qm rename to translations/engauge_es.qm diff --git a/bin/translations/engauge_fa_IR.qm b/translations/engauge_fa_IR.qm similarity index 100% rename from bin/translations/engauge_fa_IR.qm rename to translations/engauge_fa_IR.qm diff --git a/bin/translations/engauge_fr.qm b/translations/engauge_fr.qm similarity index 100% rename from bin/translations/engauge_fr.qm rename to translations/engauge_fr.qm diff --git a/bin/translations/engauge_hi.qm b/translations/engauge_hi.qm similarity index 100% rename from bin/translations/engauge_hi.qm rename to translations/engauge_hi.qm diff --git a/bin/translations/engauge_it.qm b/translations/engauge_it.qm similarity index 100% rename from bin/translations/engauge_it.qm rename to translations/engauge_it.qm diff --git a/bin/translations/engauge_ja.qm b/translations/engauge_ja.qm similarity index 100% rename from bin/translations/engauge_ja.qm rename to translations/engauge_ja.qm diff --git a/bin/translations/engauge_kk.qm b/translations/engauge_kk.qm similarity index 100% rename from bin/translations/engauge_kk.qm rename to translations/engauge_kk.qm diff --git a/bin/translations/engauge_ko.qm b/translations/engauge_ko.qm similarity index 100% rename from bin/translations/engauge_ko.qm rename to translations/engauge_ko.qm diff --git a/bin/translations/engauge_nb.qm b/translations/engauge_nb.qm similarity index 100% rename from bin/translations/engauge_nb.qm rename to translations/engauge_nb.qm diff --git a/bin/translations/engauge_pt.qm b/translations/engauge_pt.qm similarity index 100% rename from bin/translations/engauge_pt.qm rename to translations/engauge_pt.qm diff --git a/bin/translations/engauge_ru.qm b/translations/engauge_ru.qm similarity index 100% rename from bin/translations/engauge_ru.qm rename to translations/engauge_ru.qm diff --git a/bin/translations/engauge_zh.qm b/translations/engauge_zh.qm similarity index 100% rename from bin/translations/engauge_zh.qm rename to translations/engauge_zh.qm diff --git a/translations/step_2_move_results_into_permanents b/translations/step_2_move_results_into_permanents index 3e6dd7c3..0e635843 100755 --- a/translations/step_2_move_results_into_permanents +++ b/translations/step_2_move_results_into_permanents @@ -9,6 +9,8 @@ function main { echo "* Remaining steps: *" echo "* 1) Run 'lrelease engauge.pro' *" echo "* 2) Copy *.qm translations into the bin/translations directory *" + echo "* NOTE we keep the local *.qm files since they are used for *" + echo "** for release building *" echo "* 3) Upload the english engauge_en.ts file to Transifex (since *" echo "* non-english uploads will be silently filtered by that file) *" echo "* 3a) Click on "Resources" *"