From bb52a1084e3ef0ab5b4b696a776991b4b62f1568 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 26 Oct 2023 00:13:33 +0200 Subject: [PATCH] Move public headers out of the src folder --- CMakeLists.txt | 15 +++++++++------ {src => include/oink}/bitset.hpp | 2 +- {src => include/oink}/error.hpp | 0 {src => include/oink}/game.hpp | 2 +- {src => include/oink}/libpopcnt.h | 0 {src => include/oink}/oink.hpp | 6 +++--- {src => include/oink}/solvers.hpp | 0 {src => include/oink}/uintqueue.hpp | 0 src/dtl.hpp | 1 - src/fpi.cpp | 1 - src/fpj.cpp | 1 - src/game.cpp | 2 +- src/mspm.hpp | 1 - src/npp.hpp | 2 -- src/oink.cpp | 4 ++-- src/pp.hpp | 1 - src/ptl.hpp | 1 - src/qpt.hpp | 1 - src/rtl.hpp | 2 -- src/scc.cpp | 2 +- src/solver.hpp | 6 +++--- src/solvers.cpp | 2 +- src/spm.hpp | 1 - src/sspm.hpp | 2 -- src/tl.hpp | 1 - src/tools/counter_core.cpp | 2 +- src/tools/counter_dp.cpp | 2 +- src/tools/counter_m.cpp | 2 +- src/tools/counter_ortl.cpp | 2 +- src/tools/counter_rob.cpp | 2 +- src/tools/counter_rr.cpp | 2 +- src/tools/counter_symsi.cpp | 2 +- src/tools/dotty.cpp | 2 +- src/tools/nudge.cpp | 2 +- src/tools/simple.cpp | 2 +- src/tools/solve.cpp | 5 ++--- src/tools/stgame.cpp | 2 +- src/tools/tc+.cpp | 2 +- src/tools/tc.cpp | 2 +- src/tools/verify.cpp | 2 +- src/tspm.hpp | 1 - src/verifier.cpp | 1 - src/verifier.hpp | 2 +- src/zlk.hpp | 2 -- src/zlkpp.hpp | 1 - src/zlkq.hpp | 1 - test/test_solvers.cpp | 5 ++--- 47 files changed, 41 insertions(+), 61 deletions(-) rename {src => include/oink}/bitset.hpp (99%) rename {src => include/oink}/error.hpp (100%) rename {src => include/oink}/game.hpp (99%) rename {src => include/oink}/libpopcnt.h (100%) rename {src => include/oink}/oink.hpp (98%) rename {src => include/oink}/solvers.hpp (100%) rename {src => include/oink}/uintqueue.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b935698..870a53b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,13 @@ add_library(oink::oink ALIAS oink) set_target_properties(oink PROPERTIES VERSION ${oink_VERSION} SOVERSION ${oink_VERSION_MAJOR}) set(OINK_HDRS - src/oink.hpp - src/error.hpp - src/game.hpp - src/bitset.hpp - src/uintqueue.hpp + include/oink/oink.hpp + include/oink/error.hpp + include/oink/game.hpp + include/oink/solvers.hpp + include/oink/bitset.hpp + include/oink/uintqueue.hpp + include/oink/libpopcnt.h ) target_compile_features(oink PUBLIC c_std_11 cxx_std_11) @@ -47,8 +49,9 @@ target_include_directories(oink ${CMAKE_CURRENT_LIST_DIR}/src PUBLIC $ + $ $ - $ + $ ) target_link_libraries(oink pthread lace::lace) diff --git a/src/bitset.hpp b/include/oink/bitset.hpp similarity index 99% rename from src/bitset.hpp rename to include/oink/bitset.hpp index c4430c6..2229ab3 100644 --- a/src/bitset.hpp +++ b/include/oink/bitset.hpp @@ -17,7 +17,7 @@ #ifndef BITSET_HPP #define BITSET_HPP -#include +#include namespace pg { diff --git a/src/error.hpp b/include/oink/error.hpp similarity index 100% rename from src/error.hpp rename to include/oink/error.hpp diff --git a/src/game.hpp b/include/oink/game.hpp similarity index 99% rename from src/game.hpp rename to include/oink/game.hpp index da8eb9b..8873001 100644 --- a/src/game.hpp +++ b/include/oink/game.hpp @@ -24,7 +24,7 @@ #include #include -#include +#include namespace pg { diff --git a/src/libpopcnt.h b/include/oink/libpopcnt.h similarity index 100% rename from src/libpopcnt.h rename to include/oink/libpopcnt.h diff --git a/src/oink.hpp b/include/oink/oink.hpp similarity index 98% rename from src/oink.hpp rename to include/oink/oink.hpp index 7c88d7e..625ebbb 100644 --- a/src/oink.hpp +++ b/include/oink/oink.hpp @@ -20,9 +20,9 @@ #include #include -#include "error.hpp" -#include "game.hpp" -#include "uintqueue.hpp" +#include "oink/error.hpp" +#include "oink/game.hpp" +#include "oink/uintqueue.hpp" namespace pg { diff --git a/src/solvers.hpp b/include/oink/solvers.hpp similarity index 100% rename from src/solvers.hpp rename to include/oink/solvers.hpp diff --git a/src/uintqueue.hpp b/include/oink/uintqueue.hpp similarity index 100% rename from src/uintqueue.hpp rename to include/oink/uintqueue.hpp diff --git a/src/dtl.hpp b/src/dtl.hpp index 159e82b..a9aee85 100644 --- a/src/dtl.hpp +++ b/src/dtl.hpp @@ -17,7 +17,6 @@ #ifndef DTL_HPP #define DTL_HPP -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/fpi.cpp b/src/fpi.cpp index c4db079..095d75a 100644 --- a/src/fpi.cpp +++ b/src/fpi.cpp @@ -19,7 +19,6 @@ #include #include "fpi.hpp" -#include "uintqueue.hpp" namespace pg { diff --git a/src/fpj.cpp b/src/fpj.cpp index 7877afe..a1854f8 100644 --- a/src/fpj.cpp +++ b/src/fpj.cpp @@ -20,7 +20,6 @@ #include #include "fpj.hpp" -#include "uintqueue.hpp" namespace pg { diff --git a/src/game.cpp b/src/game.cpp index 6107a82..30c6452 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -20,7 +20,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" #define USE_MMAP 1 diff --git a/src/mspm.hpp b/src/mspm.hpp index 6a281b5..b4190d3 100644 --- a/src/mspm.hpp +++ b/src/mspm.hpp @@ -19,7 +19,6 @@ #include -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/npp.hpp b/src/npp.hpp index 31545ab..43ab120 100644 --- a/src/npp.hpp +++ b/src/npp.hpp @@ -21,9 +21,7 @@ #include #include -#include "oink.hpp" #include "solver.hpp" -#include "uintqueue.hpp" namespace pg { diff --git a/src/oink.cpp b/src/oink.cpp index 6e22479..e858d5f 100644 --- a/src/oink.cpp +++ b/src/oink.cpp @@ -22,8 +22,8 @@ #include #include -#include "oink.hpp" -#include "solvers.hpp" +#include "oink/oink.hpp" +#include "oink/solvers.hpp" #include "solver.hpp" #include "lace.h" diff --git a/src/pp.hpp b/src/pp.hpp index 393cf2d..02ef8a6 100644 --- a/src/pp.hpp +++ b/src/pp.hpp @@ -19,7 +19,6 @@ #include -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/ptl.hpp b/src/ptl.hpp index ac96717..7d7a29e 100644 --- a/src/ptl.hpp +++ b/src/ptl.hpp @@ -17,7 +17,6 @@ #ifndef PTL_HPP #define PTL_HPP -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/qpt.hpp b/src/qpt.hpp index 8ed889f..4d585ea 100644 --- a/src/qpt.hpp +++ b/src/qpt.hpp @@ -18,7 +18,6 @@ #define QPT_HPP #include "solver.hpp" -#include "uintqueue.hpp" namespace pg { diff --git a/src/rtl.hpp b/src/rtl.hpp index 34cfa6b..01bb38f 100644 --- a/src/rtl.hpp +++ b/src/rtl.hpp @@ -22,9 +22,7 @@ #include #include -#include "oink.hpp" #include "solver.hpp" -#include "npp.hpp" namespace pg { diff --git a/src/scc.cpp b/src/scc.cpp index 24e2564..968927f 100644 --- a/src/scc.cpp +++ b/src/scc.cpp @@ -19,7 +19,7 @@ #include #include #include // for memset -#include "oink.hpp" +#include "oink/oink.hpp" namespace pg { diff --git a/src/solver.hpp b/src/solver.hpp index ba4c155..02ca23f 100644 --- a/src/solver.hpp +++ b/src/solver.hpp @@ -17,9 +17,9 @@ #ifndef SOLVER_HPP #define SOLVER_HPP -#include "game.hpp" -#include "oink.hpp" -#include "error.hpp" +#include "oink/game.hpp" +#include "oink/oink.hpp" +#include "oink/error.hpp" namespace pg { diff --git a/src/solvers.cpp b/src/solvers.cpp index 35791a9..9472016 100644 --- a/src/solvers.cpp +++ b/src/solvers.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "solvers.hpp" +#include "oink/solvers.hpp" #include "zlk.hpp" #include "pp.hpp" diff --git a/src/spm.hpp b/src/spm.hpp index 132c3f6..7578e54 100644 --- a/src/spm.hpp +++ b/src/spm.hpp @@ -19,7 +19,6 @@ #include -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/sspm.hpp b/src/sspm.hpp index 39951cc..2bf87de 100644 --- a/src/sspm.hpp +++ b/src/sspm.hpp @@ -17,9 +17,7 @@ #ifndef SSPM_HPP #define SSPM_HPP -#include "oink.hpp" #include "solver.hpp" -#include "uintqueue.hpp" namespace pg { diff --git a/src/tl.hpp b/src/tl.hpp index 19ba295..488181e 100644 --- a/src/tl.hpp +++ b/src/tl.hpp @@ -17,7 +17,6 @@ #ifndef TL_HPP #define TL_HPP -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/tools/counter_core.cpp b/src/tools/counter_core.cpp index 5de34ce..8ce742f 100644 --- a/src/tools/counter_core.cpp +++ b/src/tools/counter_core.cpp @@ -16,7 +16,7 @@ #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/counter_dp.cpp b/src/tools/counter_dp.cpp index f825998..84eb630 100644 --- a/src/tools/counter_dp.cpp +++ b/src/tools/counter_dp.cpp @@ -16,7 +16,7 @@ #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/counter_m.cpp b/src/tools/counter_m.cpp index 15cd6c7..4ea8e83 100644 --- a/src/tools/counter_m.cpp +++ b/src/tools/counter_m.cpp @@ -16,7 +16,7 @@ #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/counter_ortl.cpp b/src/tools/counter_ortl.cpp index ce61100..f6a49c2 100644 --- a/src/tools/counter_ortl.cpp +++ b/src/tools/counter_ortl.cpp @@ -16,7 +16,7 @@ #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/counter_rob.cpp b/src/tools/counter_rob.cpp index a29c48b..cbdca65 100644 --- a/src/tools/counter_rob.cpp +++ b/src/tools/counter_rob.cpp @@ -16,7 +16,7 @@ #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/counter_rr.cpp b/src/tools/counter_rr.cpp index 61bbb5d..d7cac46 100644 --- a/src/tools/counter_rr.cpp +++ b/src/tools/counter_rr.cpp @@ -16,7 +16,7 @@ #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/counter_symsi.cpp b/src/tools/counter_symsi.cpp index c4bf602..dd1c516 100644 --- a/src/tools/counter_symsi.cpp +++ b/src/tools/counter_symsi.cpp @@ -17,7 +17,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/dotty.cpp b/src/tools/dotty.cpp index b7a028e..baff7b6 100644 --- a/src/tools/dotty.cpp +++ b/src/tools/dotty.cpp @@ -17,7 +17,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" using namespace pg; diff --git a/src/tools/nudge.cpp b/src/tools/nudge.cpp index 76750d7..da655a4 100644 --- a/src/tools/nudge.cpp +++ b/src/tools/nudge.cpp @@ -20,7 +20,7 @@ #include #include "cxxopts.hpp" -#include "game.hpp" +#include "oink/game.hpp" using namespace std; using namespace pg; diff --git a/src/tools/simple.cpp b/src/tools/simple.cpp index 5225025..0cd0950 100644 --- a/src/tools/simple.cpp +++ b/src/tools/simple.cpp @@ -16,7 +16,7 @@ #include -#include "oink.hpp" +#include "oink/oink.hpp" int main(int argc, char** argv) diff --git a/src/tools/solve.cpp b/src/tools/solve.cpp index f7219c5..d2469b0 100644 --- a/src/tools/solve.cpp +++ b/src/tools/solve.cpp @@ -27,9 +27,8 @@ #include #include "cxxopts.hpp" -#include "game.hpp" -#include "oink.hpp" -#include "solvers.hpp" +#include "oink/oink.hpp" +#include "oink/solvers.hpp" #include "verifier.hpp" #include "tools/getrss.h" diff --git a/src/tools/stgame.cpp b/src/tools/stgame.cpp index a8fc323..b0c77f3 100644 --- a/src/tools/stgame.cpp +++ b/src/tools/stgame.cpp @@ -19,7 +19,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" using namespace std; diff --git a/src/tools/tc+.cpp b/src/tools/tc+.cpp index 8f708fa..d791384 100644 --- a/src/tools/tc+.cpp +++ b/src/tools/tc+.cpp @@ -17,7 +17,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" using namespace std; using namespace pg; diff --git a/src/tools/tc.cpp b/src/tools/tc.cpp index 33d6d32..6f5a36b 100644 --- a/src/tools/tc.cpp +++ b/src/tools/tc.cpp @@ -17,7 +17,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" #define DOUBLEDISTRACTION 0 diff --git a/src/tools/verify.cpp b/src/tools/verify.cpp index 88e9464..ba393e9 100644 --- a/src/tools/verify.cpp +++ b/src/tools/verify.cpp @@ -18,7 +18,7 @@ #include #include -#include "game.hpp" +#include "oink/game.hpp" #include "verifier.hpp" using namespace std; diff --git a/src/tspm.hpp b/src/tspm.hpp index fd710d8..ac5a4a7 100644 --- a/src/tspm.hpp +++ b/src/tspm.hpp @@ -19,7 +19,6 @@ #include -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/verifier.cpp b/src/verifier.cpp index fb4bf9a..4bf5372 100644 --- a/src/verifier.cpp +++ b/src/verifier.cpp @@ -24,7 +24,6 @@ #include #include -#include "game.hpp" #include "verifier.hpp" using namespace std; diff --git a/src/verifier.hpp b/src/verifier.hpp index 0422ca4..a9456ff 100644 --- a/src/verifier.hpp +++ b/src/verifier.hpp @@ -18,7 +18,7 @@ #define VERIFIER_HPP #include -#include "game.hpp" +#include "oink/game.hpp" namespace pg { diff --git a/src/zlk.hpp b/src/zlk.hpp index 20030a6..e2a820c 100644 --- a/src/zlk.hpp +++ b/src/zlk.hpp @@ -20,8 +20,6 @@ #include #include "solver.hpp" -#include "lace.h" -#include "uintqueue.hpp" namespace pg { diff --git a/src/zlkpp.hpp b/src/zlkpp.hpp index ca89d24..1f69db2 100644 --- a/src/zlkpp.hpp +++ b/src/zlkpp.hpp @@ -7,7 +7,6 @@ #include -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/src/zlkq.hpp b/src/zlkq.hpp index af6fd1f..4813267 100644 --- a/src/zlkq.hpp +++ b/src/zlkq.hpp @@ -19,7 +19,6 @@ #include -#include "oink.hpp" #include "solver.hpp" namespace pg { diff --git a/test/test_solvers.cpp b/test/test_solvers.cpp index 123d7d1..8d627d3 100644 --- a/test/test_solvers.cpp +++ b/test/test_solvers.cpp @@ -29,9 +29,8 @@ #include #include "tools/cxxopts.hpp" -#include "game.hpp" -#include "oink.hpp" -#include "solvers.hpp" +#include "oink/oink.hpp" +#include "oink/solvers.hpp" #include "verifier.hpp" #include "lace.h"