Merge branch 'merill-merge'

supermerill · May 22, 2021 · 4399389 · 4399389
2 parents 600bbaa + 0c7c3b1
commit 4399389
Show file tree

Hide file tree

Showing 48 changed files with 157,730 additions and 1,052 deletions.
diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml
@@ -19,7 +19,7 @@ jobs:
         ref: 'Nigthly'
     - name: update submodule profiles
       working-directory: ./resources/profiles
-      run: git submodule update
+      run: git submodule update --init
     - name: change date in version
       run: |
         sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc
@@ -52,6 +52,9 @@ jobs:
     - name: make SuperSlicer
       working-directory: ./build
       run: make Slic3r
+    - name: make .mo
+      working-directory: ./build
+      run: make gettext_po_to_mo
     - name: update Info.plist
       working-directory: ./build/src
       run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist

diff --git a/.github/workflows/ccpp_mac_debug.yml b/.github/workflows/ccpp_mac_debug.yml
@@ -16,7 +16,7 @@ jobs:
         ref: 'debug_macos'
     - name: update submodule profiles
       working-directory: ./resources/profiles
-      run: git submodule update
+      run: git submodule update --init
     - name: change date in version
       run: |
         sed "s/+UNKNOWN/_$(date '+%F')/" version.inc > version.date.inc
@@ -49,6 +49,9 @@ jobs:
     - name: make SuperSlicer
       working-directory: ./build
       run: make Slic3r
+    - name: make .mo
+      working-directory: ./build
+      run: make gettext_po_to_mo
     - name: update Info.plist
       working-directory: ./build/src
       run: sed "s/+UNKNOWN/_$(date '+%F')/" Info.plist >Info.date.plist

diff --git a/.github/workflows/ccpp_ubuntu.yml b/.github/workflows/ccpp_ubuntu.yml
@@ -19,7 +19,7 @@ jobs:
         ref: 'Nigthly'
     - name: update submodule profiles
       working-directory: ./resources/profiles
-      run: git submodule update
+      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
     - name: update clock
@@ -53,6 +53,9 @@ jobs:
     - name: make SuperSlicer
       working-directory: ./build
       run: make Slic3r
+    - name: make .mo
+      working-directory: ./build
+      run: make gettext_po_to_mo
     - name: create directory and copy into it
       working-directory: ./build
       run: |

diff --git a/.github/workflows/ccpp_ubuntu_debug.yml b/.github/workflows/ccpp_ubuntu_debug.yml
@@ -16,7 +16,7 @@ jobs:
         ref: 'debug_ubuntu'
     - name: update submodule profiles
       working-directory: ./resources/profiles
-      run: git submodule update
+      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
     - name: update clock
@@ -50,6 +50,9 @@ jobs:
     - name: make SuperSlicer
       working-directory: ./build
       run: make SuperSlicer
+    - name: make .mo
+      working-directory: ./build
+      run: make gettext_po_to_mo
     - name: create directory and copy into it
       working-directory: ./build
       run: |

diff --git a/.github/workflows/ccpp_win.yml b/.github/workflows/ccpp_win.yml
@@ -39,7 +39,7 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1
     - name: update submodule profiles
       working-directory: ./resources/profiles
-      run: git submodule update
+      run: git submodule update --init
     - name: change date in version
       shell: powershell
       run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc
@@ -62,6 +62,9 @@ jobs:
     - name: make
       working-directory: ./build
       run: msbuild /m /P:Configuration=Release INSTALL.vcxproj
+    - name: make .mo
+      working-directory: ./build
+      run: msbuild /m /P:Configuration=Release gettext_po_to_mo.vcxproj
     - name: create directory and copy into it
       working-directory: ./build
       run: ls
@@ -78,10 +81,13 @@ jobs:
       working-directory: ./build
       shell: cmd
       run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip'
-    - name: copy old release content
+    - name: copy missing dll content from old release
       working-directory: ./build
       shell: cmd
-      run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\
+      run: |
+        xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.dll package\
+        xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.bat package\
+        xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\mesa package\
     - name: copy new resources
       working-directory: ./build
       shell: cmd

diff --git a/.github/workflows/ccpp_win_debug.yml b/.github/workflows/ccpp_win_debug.yml
@@ -36,7 +36,7 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1
     - name: update submodule profiles
       working-directory: ./resources/profiles
-      run: git submodule update
+      run: git submodule update --init
     - name: change date in version
       shell: powershell
       run: (Get-Content version.inc) | Foreach-Object {$_ -replace "\+UNKNOWN", ("_" + [datetime]::Today.ToString("yyyy-MM-dd"))} | Set-Content version.inc
@@ -59,6 +59,9 @@ jobs:
     - name: make
       working-directory: ./build
       run: msbuild /m /P:Configuration=Debug INSTALL.vcxproj
+    - name: make .mo
+      working-directory: ./build
+      run: msbuild /m /P:Configuration=Debug gettext_po_to_mo.vcxproj
     - name: create directory and copy into it
       working-directory: ./build
       run: ls
@@ -75,10 +78,13 @@ jobs:
       working-directory: ./build
       shell: cmd
       run: '"C:/Program Files/7-Zip/7z.exe" x SuperSlicer_2.2.53.3_win64_20201005.zip'
-    - name: copy old release content
+    - name: copy missing dll content from old release
       working-directory: ./build
       shell: cmd
-      run: xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\* package\
+      run: |
+        xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.dll package\
+        xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\*.bat package\
+        xcopy /RCYIE SuperSlicer_2.2.53.3_win64_20201005\mesa package\
     - name: copy new resources
       working-directory: ./build
       shell: cmd

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -438,10 +438,11 @@ add_custom_target(gettext_po_to_mo
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Generate localization po files (binary) from mo files (texts)"
 )
-file(GLOB L10N_PO_FILES "${L10N_DIR}/*/Slic3r*.po")
+file(GLOB L10N_PO_FILES "${L10N_DIR}/*/*.po")
 foreach(po_file ${L10N_PO_FILES})
     GET_FILENAME_COMPONENT(po_dir "${po_file}" DIRECTORY)
-    SET(mo_file "${po_dir}/Slic3r.mo")
+    SET(mo_file "${po_dir}/${SLIC3R_APP_KEY}.mo")
+    message(STATUS "po_dir mo_file imgui : '${po_file}' and mo file is '${mo_file}'") 
     add_custom_command(
         TARGET gettext_po_to_mo PRE_BUILD
         COMMAND msgfmt ARGS -o ${mo_file} ${po_file}