Rename src directory to annotate

kiwi-zh · Oct 2, 2021 · 0f95cdf · 0f95cdf
1 parent f72967b
commit 0f95cdf
Show file tree

Hide file tree

Showing 19 changed files with 32 additions and 29 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,5 +1,6 @@
-.dockerignore
-/.git/
-Dockerfile
-/prerequisites/
-/.local/
+/.git
+/.local
+/kanachan.egg-info
+/.dockerignore
+/prerequisites
+/annotate/Dockerfile
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.20.5)
-project(IsMajsoulFair)
+project(kanachan)
 
 enable_testing()
 
@@ -8,7 +8,7 @@ message("CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
 
 set(CMAKE_CXX_STANDARD 20)
 
-include_directories(src)
+include_directories(annotate)
 
 if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
   add_compile_options(-Werror)
@@ -17,57 +17,57 @@ endif()
 message("CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(IS_MAJSOUL_FAIR_ENABLE_ASSERT ON CACHE BOOL "Enable assertions.")
+  set(KANACHAN_ENABLE_ASSERT ON CACHE BOOL "Enable assertions.")
 endif()
-if (IS_MAJSOUL_FAIR_ENABLE_ASSERT)
-  add_compile_definitions(IS_MAJSOUL_FAIR_ENABLE_ASSERT)
+if (KANACHAN_ENABLE_ASSERT)
+  add_compile_definitions(KANACHAN_ENABLE_ASSERT)
 endif()
-message("IS_MAJSOUL_FAIR_ENABLE_ASSERT=${IS_MAJSOUL_FAIR_ENABLE_ASSERT}")
+message("KANACHAN_ENABLE_ASSERT=${KANACHAN_ENABLE_ASSERT}")
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
     add_compile_definitions(_GLIBCXX_DEBUG _GLIBCXX_DEBUG_PEDANTIC)
   endif()
 endif()
 
-if (IS_MAJSOUL_FAIR_WITH_COVERAGE)
-  add_compile_definitions(IS_MAJSOUL_FAIR_WITH_COVERAGE)
+if (KANACHAN_WITH_COVERAGE)
+  add_compile_definitions(KANACHAN_WITH_COVERAGE)
   add_compile_options("-coverage")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -coverage")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -coverage")
 endif()
-message("IS_MAJSOUL_FAIR_WITH_COVERAGE=${IS_MAJSOUL_FAIR_WITH_COVERAGE}")
+message("KANACHAN_WITH_COVERAGE=${KANACHAN_WITH_COVERAGE}")
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
-    set(IS_MAJSOUL_FAIR_WITH_ASAN ON CACHE BOOL "With AddressSanitizer.")
+    set(KANACHAN_WITH_ASAN ON CACHE BOOL "With AddressSanitizer.")
   endif()
 endif()
-if (IS_MAJSOUL_FAIR_WITH_ASAN)
+if (KANACHAN_WITH_ASAN)
   add_compile_options(-fsanitize=address)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
 endif()
-message("IS_MAJSOUL_FAIR_WITH_ASAN=${IS_MAJSOUL_FAIR_WITH_ASAN}")
+message("KANACHAN_WITH_ASAN=${KANACHAN_WITH_ASAN}")
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   if (("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
-    set(IS_MAJSOUL_FAIR_WITH_UBSAN ON CACHE BOOL "With UndefinedBehaviorSanitizer.")
+    set(KANACHAN_WITH_UBSAN ON CACHE BOOL "With UndefinedBehaviorSanitizer.")
   endif()
 endif()
-if (IS_MAJSOUL_FAIR_WITH_UBSAN)
+if (KANACHAN_WITH_UBSAN)
   add_compile_options(-fsanitize=undefined)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=undefined")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
 endif()
-message("IS_MAJSOUL_FAIR_WITH_UBSAN=${IS_MAJSOUL_FAIR_WITH_UBSAN}")
+message("KANACHAN_WITH_UBSAN=${KANACHAN_WITH_UBSAN}")
 
-if (IS_MAJSOUL_FAIR_WITH_TSAN)
+if (KANACHAN_WITH_TSAN)
   add_compile_options(-fsanitize=thread)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=thread")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread")
 endif()
-message("IS_MAJSOUL_FAIR_WITH_TSAN=${IS_MAJSOUL_FAIR_WITH_TSAN}")
+message("KANACHAN_WITH_TSAN=${KANACHAN_WITH_TSAN}")
 
 add_compile_options(-pthread)
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
@@ -89,4 +89,4 @@ find_package(Boost
   REQUIRED
   COMPONENTS stacktrace_backtrace)
 
-add_subdirectory(src)
+add_subdirectory(annotate)
diff --git a/src/CMakeLists.txt → annotate/CMakeLists.txt b/src/CMakeLists.txt → annotate/CMakeLists.txt
@@ -11,7 +11,7 @@ target_link_libraries(kanachan
   Boost::stacktrace_backtrace
   Boost::headers)
 
-add_executable(convert
-  convert.cpp)
-target_link_libraries(convert
+add_executable(annotate
+  main.cpp)
+target_link_libraries(annotate
   PRIVATE kanachan)
diff --git a/Dockerfile → annotate/Dockerfile b/Dockerfile → annotate/Dockerfile
@@ -1,18 +1,20 @@
-FROM kanachan-prerequisites
+FROM cryolite/kanachan.prerequisites
 
-ARG CMAKE_BUILD_TYPE=Debug
+ARG CMAKE_BUILD_TYPE=Release
 
 COPY --chown=ubuntu . /opt/kanachan
 
 USER ubuntu
 
 WORKDIR /opt/kanachan
 
-RUN (cd src && protoc -I. --cpp_out=. mahjongsoul.proto) && \
+RUN (cd annotate && protoc -I. --cpp_out=. mahjongsoul.proto) && \
     mkdir build && \
     cd build && \
     cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
           -DCMAKE_C_COMPILER=/usr/local/bin/gcc \
           -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ \
           .. && \
     VERBOSE=1 make
+
+ENTRYPOINT ["build/annotate/annotate", "/data"]
diff --git a/src/annotation.cpp → annotate/annotation.cpp b/src/annotation.cpp → annotate/annotation.cpp
diff --git a/src/annotation.hpp → annotate/annotation.hpp b/src/annotation.hpp → annotate/annotation.hpp
diff --git a/src/mahjongsoul.proto → annotate/mahjongsoul.proto b/src/mahjongsoul.proto → annotate/mahjongsoul.proto
diff --git a/src/convert.cpp → annotate/main.cpp b/src/convert.cpp → annotate/main.cpp
diff --git a/src/player_state.cpp → annotate/player_state.cpp b/src/player_state.cpp → annotate/player_state.cpp
diff --git a/src/player_state.hpp → annotate/player_state.hpp b/src/player_state.hpp → annotate/player_state.hpp
diff --git a/src/round_progress.cpp → annotate/round_progress.cpp b/src/round_progress.cpp → annotate/round_progress.cpp
diff --git a/src/round_progress.hpp → annotate/round_progress.hpp b/src/round_progress.hpp → annotate/round_progress.hpp
diff --git a/src/throw.cpp → annotate/throw.cpp b/src/throw.cpp → annotate/throw.cpp
diff --git a/src/throw.hpp → annotate/throw.hpp b/src/throw.hpp → annotate/throw.hpp
diff --git a/src/type_name.cpp → annotate/type_name.cpp b/src/type_name.cpp → annotate/type_name.cpp
diff --git a/src/type_name.hpp → annotate/type_name.hpp b/src/type_name.hpp → annotate/type_name.hpp
diff --git a/src/utility.cpp → annotate/utility.cpp b/src/utility.cpp → annotate/utility.cpp
diff --git a/src/utility.hpp → annotate/utility.hpp b/src/utility.hpp → annotate/utility.hpp
diff --git a/prerequisites/Dockerfile b/prerequisites/Dockerfile