Browse Source

Update jessilib and Jupiter submodules; add FullBotBuild target to reduce mistakes during testing from IDE

release/1.1
Jessica James 3 years ago
parent
commit
2e37d134b0
  1. 10
      CMakeLists.txt
  2. 2
      src/Jupiter
  3. 2
      src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp
  4. 2
      src/jessilib

10
CMakeLists.txt

@ -15,15 +15,17 @@ include(build/CMakeLists.txt)
# Setup source files # Setup source files
add_subdirectory(src) add_subdirectory(src)
# Add PackagedBuild target to package a release build # Add PackagedBuild target to package a release build, and FullBotBuild to just build all plugins
add_custom_target(PackagedBuild) add_custom_target(FullBotBuild)
add_dependencies(PackagedBuild jupiter Bot) add_dependencies(FullBotBuild jupiter Bot)
if(NOT DEFINED PACKAGED_BUILD_PATH) if(NOT DEFINED PACKAGED_BUILD_PATH)
set(PACKAGED_BUILD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin") set(PACKAGED_BUILD_PATH "${CMAKE_CURRENT_SOURCE_DIR}/bin")
endif() endif()
message(STATUS "PackagedBuild Path: ${PACKAGED_BUILD_PATH}") message(STATUS "PackagedBuild Path: ${PACKAGED_BUILD_PATH}")
add_custom_target(PackagedBuild)
add_dependencies(PackagedBuild FullBotBuild)
add_custom_command(TARGET PackagedBuild add_custom_command(TARGET PackagedBuild
PRE_BUILD PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E rm -rf ${PACKAGED_BUILD_PATH}) COMMAND ${CMAKE_COMMAND} -E rm -rf ${PACKAGED_BUILD_PATH})
@ -38,7 +40,7 @@ add_custom_command(TARGET PackagedBuild
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/baseline ${PACKAGED_BUILD_PATH}/) COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/baseline ${PACKAGED_BUILD_PATH}/)
foreach(plugin ${JUPITER_PLUGINS}) foreach(plugin ${JUPITER_PLUGINS})
add_dependencies(PackagedBuild ${plugin}) add_dependencies(FullBotBuild ${plugin})
add_custom_command(TARGET PackagedBuild add_custom_command(TARGET PackagedBuild
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${plugin}> ${PACKAGED_BUILD_PATH}/Plugins/) COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${plugin}> ${PACKAGED_BUILD_PATH}/Plugins/)

2
src/Jupiter

@ -1 +1 @@
Subproject commit 3a11bda36d30ce285604928ece72418af7fb921d Subproject commit b010fea3929add75cf3ee63c10828d3b0526643d

2
src/Plugins/RenX/RenX.Commands/RenX_Commands.cpp

@ -19,7 +19,7 @@
#include <forward_list> #include <forward_list>
#include <functional> #include <functional>
#include "Jupiter/Functions.h" #include "Jupiter/Functions.h"
#include "duration.hpp" #include "jessilib/duration.hpp"
#include "IRC_Bot.h" #include "IRC_Bot.h"
#include "RenX_Commands.h" #include "RenX_Commands.h"
#include "RenX_Core.h" #include "RenX_Core.h"

2
src/jessilib

@ -1 +1 @@
Subproject commit 59d04d737ac4445ba96c9c117dcf8d95654719a3 Subproject commit f00e36bce2f5ee1d418e23e7749dbcf4f9d61ce9
Loading…
Cancel
Save