Skip to content

Commit

Permalink
Readd some files
Browse files Browse the repository at this point in the history
  • Loading branch information
Slackadays committed Dec 10, 2022
1 parent d25c144 commit 300da10
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 9 deletions.
Binary file added HJ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added MacStadium-developerlogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 21 additions & 9 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,27 @@ endif()
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED True)

#set(CMAKE_BUILD_TYPE Debug)
set(CMAKE_BUILD_TYPE Release)
if(TEST)
message(STATUS "Building in test mode")
set(CMAKE_BUILD_TYPE Debug)
if(NOT MSVC)
add_compile_options(-fsanitize=address)
add_link_options(-fsanitize=address)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g -pg")
else()
add_compile_options(/fsanitize=address)
add_link_options(/fsanitize=address)
endif()
else()
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") # strip the binary for reduced size
endif()
endif()
endif()

add_compile_options("$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall>")

set(CMAKE_THREAD_PREFER_PTHREAD True)
set(THREADS_PREFER_PTHREAD_FLAG True)
Expand Down Expand Up @@ -109,13 +128,6 @@ endif()

set_property(TARGET hajime PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Release>:Release>")

if(CMAKE_BUILD_TYPE STREQUAL "Release")
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") # strip the binary for reduced size
endif()
add_compile_options("$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall>")
endif()

if(MSVC)
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/W4>")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
Expand Down
35 changes: 35 additions & 0 deletions todo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
~~Finish transition to installer.h~~ DONE

~~Add an interactive installation option~~ DONE

~~Add multiple langage support~~ DONE

~~Add compatibility to install.sh for non-apt repos~~ DONE

~~Add checkers to install.sh for a friendlier experience~~ DONE

Make it a true daemon (to not depend on systemd) by using std::thread

~~Try to move away from system() to compensate for non-Bash shells~~ DONE

Add a start.sh compatibility option (offer to be middleware for existing scripts or programs that depend on start.sh)

Add "intelligent configuration" which detects for existing server .jar files and automagically configures the files

~~Add colors to the output messages~~ DONE

Add more file logging features (log rotation, auto-zip)

~~Add compatibility for sysVinit~~ DONE

~~Add one-step installation from command line (curl, wget?)~~ DONE: see command in readme

~~Add multi-server support with multithreading (tricky, requires dynamic allocation of objects)~~ DONE

Add bStats support (create a dummy Java file just for bStats and run it upon startup)

~~Change the default server.conf to server.server for more descriptive filenames~~ WON'T ADD

Add a feature that explains each flag when prefixed with -h or --help

Add a feature to install server .jar files with one step

0 comments on commit 300da10

Please sign in to comment.