From 3b536044befc0c14f81600bc06b18739ae957e67 Mon Sep 17 00:00:00 2001
From: otavepto <153766569+otavepto@users.noreply.github.com>
Date: Fri, 31 May 2024 14:39:06 +0300
Subject: [PATCH] fix readme indentation + print debug messages

---
 .github/workflows/emu-build-all-linux.yml | 38 ++++++++++++++++-------
 .github/workflows/emu-build-all-win.yml   | 19 ++++++++++--
 .github/workflows/emu-deps-win.yml        |  1 -
 README.md                                 | 28 ++++++++---------
 premake5.lua                              |  4 +--
 5 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/emu-build-all-linux.yml b/.github/workflows/emu-build-all-linux.yml
index 1623795f..2604af33 100644
--- a/.github/workflows/emu-build-all-linux.yml
+++ b/.github/workflows/emu-build-all-linux.yml
@@ -78,6 +78,31 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: sudo chmod -R 777 "${{ github.workspace }}"
 
+### debug print dirs
+      - name: Debug print dirs
+        shell: bash
+        working-directory: ${{ github.workspace }}
+        run: |
+          ls -la ./build/deps/linux/*
+          ls -la ./build/deps/linux/gmake2/protobuf/install32/bin/*
+          ls -la ./build/deps/linux/gmake2/protobuf/install64/bin/*
+
+### generate from .proto file
+      - name: Generate from .proto file
+        shell: bash
+        working-directory: ${{ github.workspace }}
+        run: |
+          sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5
+          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5.lua --os=linux genproto
+
+### generate project files
+      - name: Generate project files
+        shell: bash
+        working-directory: ${{ github.workspace }}
+        run: |
+          sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5
+          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5.lua --emubuild=${{ github.sha }} --os=linux gmake2
+
 ## mandatory Linux packages
       - name: Install required packages
         shell: bash
@@ -92,17 +117,8 @@ jobs:
           sudo apt install -y libgl-dev # needed for overlay build (header files such as GL/gl.h)
           # sudo apt install -y binutils # (optional) contains the tool 'readelf' mainly, and other usefull binary stuff
 
-### generate from .proto file
-      - name: Generate from .proto file
-        shell: bash
-        working-directory: ${{ github.workspace }}
-        run: |
-          sudo chmod 777 ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5
-          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5.lua --os=linux genproto
-          ./${{env.THIRD_PARTY_BASE_DIR}}/common/linux/premake/premake5 --file=premake5.lua --emubuild=${{ github.sha }} --os=linux gmake2
-
-### build target(s)
-      - name: Build target(s)
+### build target
+      - name: Build target
         shell: bash
         working-directory: ${{ github.workspace }}/build/project/gmake2/linux
         run: |
diff --git a/.github/workflows/emu-build-all-win.yml b/.github/workflows/emu-build-all-win.yml
index d85048a1..7d919d25 100644
--- a/.github/workflows/emu-build-all-win.yml
+++ b/.github/workflows/emu-build-all-win.yml
@@ -85,16 +85,31 @@ jobs:
           ref: 'third-party/build/win'
           path: "${{env.THIRD_PARTY_BASE_DIR}}/build/win"
 
+### debug print dirs
+      - name: Debug print dirs
+        shell: cmd
+        working-directory: ${{ github.workspace }}
+        run: |
+          dir /b /a build\deps\win\vs2022\*
+          dir /b /a build\deps\win\vs2022\protobuf\install32\bin\*
+          dir /b /a build\deps\win\vs2022\protobuf\install64\bin\*
+
 ### generate from .proto file
       - name: Generate from .proto file
         shell: cmd
         working-directory: ${{ github.workspace }}
         run: |
           "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5.lua --os=windows genproto
+
+### generate project files
+      - name: Generate project files
+        shell: cmd
+        working-directory: ${{ github.workspace }}
+        run: |
           "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5.lua --emubuild=${{ github.sha }} --dosstub --winrsrc --winsign --os=windows vs2022
 
-### build target(s)
-      - name: Build target(s)
+### build target
+      - name: Build target
         shell: cmd
         working-directory: ${{ github.workspace }}/build/project/vs2022/win
         run: |
diff --git a/.github/workflows/emu-deps-win.yml b/.github/workflows/emu-deps-win.yml
index 8f7cff7a..e45b9390 100644
--- a/.github/workflows/emu-deps-win.yml
+++ b/.github/workflows/emu-deps-win.yml
@@ -78,6 +78,5 @@ jobs:
       shell: cmd
       working-directory: ${{ github.workspace }}
       run: |
-        build_win_deps.bat -verbose
         set "CMAKE_GENERATOR=Visual Studio 17 2022"
         "${{env.THIRD_PARTY_BASE_DIR}}\common\win\premake\premake5.exe" --file=premake5-deps.lua --64-build --32-build --all-ext --all-build --verbose --clean --os=windows vs2022
diff --git a/README.md b/README.md
index 3c0118d1..0b910c61 100644
--- a/README.md
+++ b/README.md
@@ -95,20 +95,20 @@ You can also find instructions here in [README.release.md](./post_build/README.r
 
 * Ubuntu 22.04 LTS: https://ubuntu.com/download/desktop
 * Ubuntu required packages:
-```shell
-sudo apt update -y
-sudo apt install -y coreutils # echo, printf, etc...
-sudo apt install -y build-essential
-sudo apt install -y gcc-multilib # needed for 32-bit builds
-sudo apt install -y g++-multilib
-sudo apt install -y libglx-dev # needed for overlay build (header files such as GL/glx.h)
-sudo apt install -y libgl-dev # needed for overlay build (header files such as GL/gl.h)
-```
-*(Optional)* Additional packages
-```shell
-sudo apt install -y clang # clang compiler
-sudo apt install -y binutils # contains the tool 'readelf' mainly, and other usefull binary stuff
-```
+  ```shell
+  sudo apt update -y
+  sudo apt install -y coreutils # echo, printf, etc...
+  sudo apt install -y build-essential
+  sudo apt install -y gcc-multilib # needed for 32-bit builds
+  sudo apt install -y g++-multilib
+  sudo apt install -y libglx-dev # needed for overlay build (header files   such as GL/glx.h)
+  sudo apt install -y libgl-dev # needed for overlay build (header files   such as GL/gl.h)
+  ```
+  *(Optional)* Additional packages
+  ```shell
+  sudo apt install -y clang # clang compiler
+  sudo apt install -y binutils # contains the tool 'readelf' mainly, and   other usefull binary stuff
+  ```
 * Python 3.10 or above
    ```shell
    sudo add-apt-repository ppa:deadsnakes/ppa -y
diff --git a/premake5.lua b/premake5.lua
index 81847baa..c54b0a67 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -85,7 +85,7 @@ newaction {
         else
             deps_install_prefix = 'install32'
         end
-        local protoc_exe = path.getabsolute(path.join(deps_dir, 'protobuf', deps_install_prefix, 'bin', 'protoc'), _MAIN_SCRIPT_DIR)
+        local protoc_exe = path.join(deps_dir, 'protobuf', deps_install_prefix, 'bin', 'protoc')
 
         local out_dir = 'dll/proto_gen/' .. os_iden
 
@@ -94,7 +94,7 @@ newaction {
         end
 
         if not os.isfile(protoc_exe) then
-            error("Error: protoc not found!")
+            error("protoc not found! " .. protoc_exe)
             return
         end