From 179c35dd766292639326a4954b489d13d3de43a8 Mon Sep 17 00:00:00 2001
From: Ulrich Huber <ulrich@huberulrich.de>
Date: Sun, 20 Oct 2019 20:21:38 +0100
Subject: [PATCH] Update pipelines to build translations for build consistency

---
 azure-pipelines/steps/build_linux.yml      |  4 ++++
 azure-pipelines/steps/build_mac_native.yml | 10 +++++++---
 azure-pipelines/steps/build_windows.yml    |  4 ++++
 po/xournalpp.pot                           |  2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines/steps/build_linux.yml b/azure-pipelines/steps/build_linux.yml
index b1658b56..0dbb0057 100644
--- a/azure-pipelines/steps/build_linux.yml
+++ b/azure-pipelines/steps/build_linux.yml
@@ -14,6 +14,10 @@ steps:
       export CXX=g++-8
       export CC=gcc-8
       cmake -GNinja .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type}} ${{ parameters.cmake_flags }}
+      # Make sure pot is up to date with sources (maybe translation pipeline is currently running)
+      cmake --build . --target pot
+      cmake --build . --target translations
+      # Build Xournal++
       cmake --build . ${{ parameters.cmake_commands}}
     workingDirectory: ./build
     displayName: 'Build Xournal++'
diff --git a/azure-pipelines/steps/build_mac_native.yml b/azure-pipelines/steps/build_mac_native.yml
index ec65cf05..14104019 100644
--- a/azure-pipelines/steps/build_mac_native.yml
+++ b/azure-pipelines/steps/build_mac_native.yml
@@ -25,8 +25,12 @@ steps:
     displayName: 'Create Build Directory'
   - bash: |
       export PATH="$HOME/.local/bin:/Users/git-bin/gtk/inst/bin:$PATH"
-      cmake -DCMAKE_INSTALL_PREFIX:PATH=/Users/git-bin/gtk/inst .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type}} ${{ parameters.cmake_flags }}
-      make -j 4
-      make install
+      cmake -DCMAKE_INSTALL_PREFIX:PATH=/Users/git-bin/gtk/inst .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type }} ${{ parameters.cmake_flags }}
+      # Make sure pot is up to date with sources (maybe translation pipeline is currently running)
+      cmake --build . --target pot
+      cmake --build . --target translations
+      # Build Xournal++
+      cmake --build .
+      cmake --build . --target install
     workingDirectory: ./build
     displayName: 'Build Xournal++'
diff --git a/azure-pipelines/steps/build_windows.yml b/azure-pipelines/steps/build_windows.yml
index 60a5b3fe..b3c8b04e 100644
--- a/azure-pipelines/steps/build_windows.yml
+++ b/azure-pipelines/steps/build_windows.yml
@@ -50,6 +50,10 @@ steps:
   - script: |
       set PATH=%PATH%;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\mingw64\bin"
       %CD:~0,2%\msys64\usr\bin\bash -lc "cmake .. -DCMAKE_BUILD_TYPE=${{ parameters.build_type}} ${{ parameters.cmake_flags }}"
+      # Make sure pot is up to date with sources (maybe translation pipeline is currently running)
+      %CD:~0,2%\msys64\usr\bin\bash -lc "cmake --build . --target pot"
+      %CD:~0,2%\msys64\usr\bin\bash -lc "cmake --build . --target translations"
+      # Build Xournal++
       %CD:~0,2%\msys64\usr\bin\bash -lc "cmake --build ."
     workingDirectory: ./build
     env:
diff --git a/po/xournalpp.pot b/po/xournalpp.pot
index 5bbb9c64..8eb12ad5 100644
--- a/po/xournalpp.pot
+++ b/po/xournalpp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xournalpp 1.0.15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-18 01:43+0000\n"
+"POT-Creation-Date: 2019-10-18 03:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"