[windows CI] get protobuf binaries from external source

Author: em-eight

.github/workflows/windows.yml

@@ -15,31 +15,36 @@ jobs:
 
     - name: Install LLVM
       run: choco install -y llvm
-      if: runner.os == 'Windows'
+    - name: Install Ninja
+      run: choco install -y ninja
 
-    - name: windows vcpkg shit
-      # https://vcpkg.io/en/getting-started.html
+    - name: Download protobuf
       run: |
-        git clone https://github.com/Microsoft/vcpkg.git
-        ./vcpkg/bootstrap-vcpkg.sh
-        vcpkg install protobuf protobuf:x64-windows
-        vcpkg owns protobuf
-        ls vcpkg/scripts/buildsystems/vcpkg.cmake
+        Invoke-WebRequest "https://github.com/protocolbuffers/protobuf/releases/download/v21.12/protoc-21.12-win64.zip" -OutFile protoc_x64-windows.zip
+        mkdir protoc_x64-windows
+        7z x protoc_x64-windows.zip -oprotoc_x64-windows
+        dir
+        Invoke-WebRequest "https://www.dropbox.com/scl/fi/te9p80zrzcwgswrkw21en/protobuf_x64-windows.zip?rlkey=btmzjokhh256xxns348o3re7m&dl=1" -OutFile protobuf_x64-windows.zip
+        7z x protobuf_x64-windows.zip
+        dir
+
     - name: CMake generate
+      shell: bash
       env:
         ARTIFACT_NAME: ppc2cpp-${{ runner.os }}
       run: |
-        echo $WINDOWS_FLAGS
-        cmake --version
-        cmake -B build \
+        cmake -S . -B build -GNinja \
           -DCMAKE_INSTALL_PREFIX=$ARTIFACT_NAME \
           -DCMAKE_BUILD_TYPE=Release \
           -DBUILD_TESTING=OFF \
           -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
-          -S . -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_GENERATOR_PLATFORM=x64
-      shell: bash
+          -DEXTERNAL_LIBPROTOBUF_PATH=protobuf_x64-windows \
+          -DEXTERNAL_PROTOC_PATH=protoc_x64-windows
     - name: Build
-      run: cmake --build build --target install -j
+      shell: bash
+      working-directory: ${{github.workspace}}/build
+      run: |
+        cmake --build . --target install --parallel
     
     - uses: actions/upload-artifact@v3
       if: github.ref == 'refs/heads/main' && github.repository == 'em-eight/ppc2cpp'

CMakeLists.txt

@@ -34,12 +34,37 @@ CPMAddPackage("gh:fmtlib/fmt#10.0.0")
 
 set(Protobuf_USE_STATIC_LIBS ON)
 
-find_package(protobuf CONFIG)
-if(NOT protobuf_FOUND)        # Legacy protobuf support
-  message(STATUS "Trying legacy method of finding protobuf")
+if(DEFINED EXTERNAL_LIBPROTOBUF_PATH AND DEFINED EXTERNAL_PROTOC_PATH)
+  # In case protobuf location is defined externally (Windows/CI hack)
+  find_package(Protobuf)  # fails but defines protobuf_generate_cpp lmaoooo
+  cmake_path(SET Protobuf_LIBRARIES ${EXTERNAL_LIBPROTOBUF_PATH}/lib/libprotobuf.lib)
+  cmake_path(SET PROTOBUF_INCLUDE_DIRS ${EXTERNAL_LIBPROTOBUF_PATH}/include)
+  cmake_path(SET Protobuf_PROTOC_EXECUTABLE ${EXTERNAL_PROTOC_PATH}/bin/protoc.exe)
+
+  message(STATUS "GONNA DEBUG STUFF")
+  get_filename_component(ABSOLUTE_PROTOC_EXE ${Protobuf_PROTOC_EXECUTABLE} ABSOLUTE)
+  message(STATUS ${ABSOLUTE_PROTOC_EXE})
+  set(Protobuf_PROTOC_EXECUTABLE ${ABSOLUTE_PROTOC_EXE})
+  
+  get_filename_component(ABSOLUTE_PROTOBUF_INCLUDE ${PROTOBUF_INCLUDE_DIRS} ABSOLUTE)
+  message(STATUS ${ABSOLUTE_PROTOBUF_INCLUDE})
+  set(PROTOBUF_INCLUDE_DIRS ${ABSOLUTE_PROTOBUF_INCLUDE})
+
+  get_filename_component(ABSOLUTE_PROTOBUF_LIB ${Protobuf_LIBRARIES} ABSOLUTE)
+  message(STATUS ${ABSOLUTE_PROTOBUF_LIB})
+  set(Protobuf_LIBRARIES ${ABSOLUTE_PROTOBUF_LIB})
+
+  add_executable(protobuf::protoc IMPORTED)
+  set_target_properties(protobuf::protoc PROPERTIES IMPORTED_LOCATION "${Protobuf_PROTOC_EXECUTABLE}")
   set(protobuf_MODULE_COMPATIBLE ON)
-  include(FindProtobuf)
-  find_package(Protobuf REQUIRED)
+else()
+  find_package(protobuf CONFIG)
+  if(NOT protobuf_FOUND)        # Legacy protobuf support
+    message(STATUS "Trying legacy method of finding protobuf")
+    set(protobuf_MODULE_COMPATIBLE ON)
+    include(FindProtobuf)
+    find_package(Protobuf REQUIRED)
+  endif()
 endif()
 
 # Generate Protobuf files

src/cli/ppc2cpp.cpp

@@ -54,7 +54,7 @@ void cli_create(int argc, char** argv) {
     print_create_usage(5);
   }
   if (options.projectName.size() == 0) {
-    options.projectName = options.projectFile.stem();
+    options.projectName = options.projectFile.stem().string();
   }
   if (options.inputFiles.size() == 0) {
     print_create_usage(6);

src/program_loader/Binary.cpp

@@ -7,7 +7,7 @@
 namespace ppc2cpp {
 Binary::Binary(std::filesystem::path binaryPath) {
   this->filepath = binaryPath;
-  this->name = binaryPath.filename();
+  this->name = binaryPath.filename().string();
 
   std::ifstream fstream(binaryPath, std::ios::binary | std::ios::in);
   if (!fstream.is_open()) throw std::runtime_error("Input file " + binaryPath.string() + " was not found");
@@ -27,7 +27,7 @@ std::optional<BinaryLocation> Binary::resolveVMA(uint32_t vma) {
 }
 
 void Binary::toProto(persistence::ProgramLoaderBinary* binaryProto) const {
-  binaryProto->set_filepath(this->filepath);
+  binaryProto->set_filepath(this->filepath.string());
   binaryProto->set_data(this->data);
 }
 }

src/program_loader/NinProgramLoader.cpp

@@ -13,7 +13,7 @@
 namespace ppc2cpp {
 NinProgramLoader::NinProgramLoader(const std::vector<std::filesystem::path>& binaryPaths) {
   for (const auto& binaryPath : binaryPaths) {
-    std::string filename = binaryPath.filename();
+    std::string filename = binaryPath.filename().string();
     std::ifstream fstream(binaryPath, std::ios::binary | std::ios::in);
     if (!fstream.is_open()) throw std::runtime_error("Input file " + binaryPath.string() + " was not found");
     std::stringstream sstream;