Remove no grpc builds (#205)

CMakeLists.txt

@@ -3,7 +3,6 @@ project(RadialGM)
 
 include(CMakeDependentOption)
 
-option(RGM_ENABLE_GRPC_SERVER "Enable the GRPC client plugin for compilation and code analysis." ON)
 option(RGM_BUILD_EMAKE "Build Emake and the compiler." ON)
 
 # FIXME: MSVC dynamic linking requires US TO DLLEXPORT our funcs
@@ -186,11 +185,8 @@ else()
     set(EDITOR_SOURCES Widgets/CodeWidgetScintilla.cpp)
 endif()
 
-if (RGM_ENABLE_GRPC_SERVER)
-  add_definitions(-DRGM_SERVER_ENABLED)
-  set(RGM_SOURCES ${RGM_SOURCES} Plugins/ServerPlugin.cpp)
-  set(RGM_HEADERS ${RGM_HEADERS} Plugins/ServerPlugin.h)
-endif()
+ set(RGM_SOURCES ${RGM_SOURCES} Plugins/ServerPlugin.cpp)
+ set(RGM_HEADERS ${RGM_HEADERS} Plugins/ServerPlugin.h)
 
 # Tell CMake to create the RadialGM executable
 add_executable(${EXE} WIN32 ${RGM_UI} ${RGM_HEADERS} ${RGM_SOURCES} ${EDITOR_SOURCES} ${RGM_RC})
@@ -237,19 +233,17 @@ include_directories(${EXE} PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
 find_package(yaml-cpp CONFIG REQUIRED)
 target_link_libraries(${EXE} PRIVATE yaml-cpp)
 
-if (RGM_ENABLE_GRPC_SERVER)
-  #Find gRPC
-  if (MSVC) # Windows actually does something right for once
-    find_package(gRPC CONFIG REQUIRED)
-    target_link_libraries(${EXE} PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++)
-  else() # https://tinyurl.com/arch-grpc-bug
-    find_library(LIB_GRPC_UNSECURE NAMES grpc++_unsecure)
-    find_library(LIB_GPR NAMES gpr)
-    find_library(LIB_CARES NAMES cares)
-    find_library(LIB_ADDRESS_SORTING NAMES address_sorting)
-    target_link_libraries(${EXE} PRIVATE ${LIB_CARES} ${LIB_ADDRESS_SORTING} ${LIB_GPR} ${LIB_GRPC_UNSECURE})
-  endif()
-endif()
+ #Find gRPC
+ if (MSVC) # Windows actually does something right for once
+   find_package(gRPC CONFIG REQUIRED)
+   target_link_libraries(${EXE} PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++)
+ else() # https://tinyurl.com/arch-grpc-bug
+   find_library(LIB_GRPC_UNSECURE NAMES grpc++_unsecure)
+   find_library(LIB_GPR NAMES gpr)
+   find_library(LIB_CARES NAMES cares)
+   find_library(LIB_ADDRESS_SORTING NAMES address_sorting)
+   target_link_libraries(${EXE} PRIVATE ${LIB_CARES} ${LIB_ADDRESS_SORTING} ${LIB_GPR} ${LIB_GRPC_UNSECURE})
+ endif()
 
 # Find Protobuf
 include(FindProtobuf)

MainWindow.cpp

@@ -20,10 +20,7 @@
 #include "Components/Logger.h"
 
 #include "Plugins/RGMPlugin.h"
-
-#ifdef RGM_SERVER_ENABLED
 #include "Plugins/ServerPlugin.h"
-#endif
 
 #include "gmk.h"
 #include "gmx.h"
@@ -169,7 +166,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), _ui(new Ui::MainW
   settingsButton->setToolButtonStyle(Qt::ToolButtonStyle::ToolButtonTextBesideIcon);
   _ui->actionSettings->setMenu(_ui->menuChangeGameSettings);
 
-#ifdef RGM_SERVER_ENABLED
   RGMPlugin *pluginServer = new ServerPlugin(*this);
   auto outputTextBrowser = this->_ui->outputTextBrowser;
   connect(pluginServer, &RGMPlugin::LogOutput, outputTextBrowser, &QTextBrowser::append);
@@ -183,7 +179,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), _ui(new Ui::MainW
   connect(_ui->actionRun, &QAction::triggered, pluginServer, &RGMPlugin::Run);
   connect(_ui->actionDebug, &QAction::triggered, pluginServer, &RGMPlugin::Debug);
   connect(_ui->actionCreateExecutable, &QAction::triggered, pluginServer, &RGMPlugin::CreateExecutable);
-#endif
 
   openNewProject();
 }

RadialGM.pro

@@ -30,15 +30,6 @@ rgm_enable_syntaxhighlight {
   SOURCES += Widgets/CodeWidgetPlain.cpp
 }
 
-# Uncomment if you want compilation & code analysis
-#CONFIG += rgm_enable_grpc_server
-
-rgm_enable_grpc_server {
-  DEFINES += RGM_SERVER_ENABLED
-  SOURCES += Plugins/ServerPlugin.cpp
-  HEADERS += Plugins/ServerPlugin.h
-}
-
 # we do this even in release mode for "Editor Diagnostics"
 DEFINES += QT_MESSAGELOGCONTEXT
 
@@ -108,6 +99,7 @@ SOURCES += \
     Models/ImmediateMapper.cpp \
     Components/Utility.cpp \
     Plugins/RGMPlugin.cpp \
+    Plugins/ServerPlugin.cpp \
     Components/RecentFiles.cpp \
     Editors/CodeEditor.cpp \
     Editors/ScriptEditor.cpp \
@@ -157,6 +149,7 @@ HEADERS += \
     Models/ImmediateMapper.h \
     Components/Utility.h \
     Plugins/RGMPlugin.h \
+    Plugins/ServerPlugin.h \
     Components/RecentFiles.h \
     Widgets/SpriteSubimageListView.h \
     Widgets/SpriteView.h \

azure-jobs.yml

@@ -240,48 +240,9 @@ jobs:
         echo 'Server = https://mirrors.kernel.org/archlinux/\$repo/os/\$arch' >> /etc/pacman.d/mirrorlist
         pacman-key --init 
         pacman-key --populate archlinux
-        pacman -Syu --noconfirm base base-devel git gcc cmake protobuf yaml-cpp pugixml rapidjson boost qt5 qscintilla-qt5
+        pacman -Syu --noconfirm base base-devel git gcc cmake protobuf grpc yaml-cpp pugixml rapidjson boost qt5 qscintilla-qt5
         EOF
       displayName: 'Bootstrap Archlinux'
-    - bash: |
-        set -e
-        cd $(Build.BinariesDirectory)
-        cat << EOF | sudo ./root.x86_64/bin/arch-chroot ./root.x86_64/
-        set -e
-        cd RadialGM
-        mkdir build
-        cd build
-        cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=MinSizeRel -DRGM_ENABLE_GRPC_SERVER=OFF ..
-        make
-        make install
-        cd ..
-        rm -rf build/
-        EOF
-      displayName: 'Release Build (No gRPC)'
-    
-    - bash: |
-        set -e
-        cd $(Build.BinariesDirectory)
-        cat << EOF | sudo ./root.x86_64/bin/arch-chroot ./root.x86_64/
-        set -e
-        cd RadialGM
-        mkdir build
-        cd build
-        cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DRGM_ENABLE_GRPC_SERVER=OFF ..
-        make
-        make install
-        cd ..
-        rm -rf build/
-        EOF
-      displayName: 'Debug Build (No gRPC)'
-    - bash: |
-        set -e
-        cd $(Build.BinariesDirectory)
-        cat << EOF | sudo ./root.x86_64/bin/arch-chroot ./root.x86_64/
-        set -e
-        pacman -S --noconfirm grpc
-        EOF
-      displayName: 'Install gRPC'
     
     - bash: |
         set -e