From 87a095e3841cd60f4c61cfb3d893f3ea4259485c Mon Sep 17 00:00:00 2001 From: KjellKod Date: Fri, 3 Oct 2014 01:20:33 -0600 Subject: [PATCH] Renamed directories for a cleaner project structure --HG-- rename : g2log/Build.cmake => Build.cmake rename : g2log/CMakeLists.txt => CMakeLists.txt rename : g2log/CPackLists.txt => CPackLists.txt rename : g2log/Dynamic.cmake => Dynamic.cmake rename : g2log/example/Example.cmake => example/Example.cmake rename : g2log/example/main_contract.cpp => example/main_contract.cpp rename : g2log/example/main_sigsegv.cpp => example/main_sigsegv.cpp rename : g2log/src/active.hpp => src/active.hpp rename : g2log/src/crashhandler.hpp => src/crashhandler.hpp rename : g2log/src/crashhandler_unix.cpp => src/crashhandler_unix.cpp rename : g2log/src/crashhandler_win.cpp => src/crashhandler_win.cpp rename : g2log/src/g2filesink.cpp => src/g2filesink.cpp rename : g2log/src/g2filesink.hpp => src/g2filesink.hpp rename : g2log/src/g2filesinkhelper.ipp => src/g2filesinkhelper.ipp rename : g2log/src/g2future.hpp => src/g2future.hpp rename : g2log/src/g2log.cpp => src/g2log.cpp rename : g2log/src/g2log.hpp => src/g2log.hpp rename : g2log/src/g2loglevels.cpp => src/g2loglevels.cpp rename : g2log/src/g2loglevels.hpp => src/g2loglevels.hpp rename : g2log/src/g2logmessage.cpp => src/g2logmessage.cpp rename : g2log/src/g2logmessage.hpp => src/g2logmessage.hpp rename : g2log/src/g2logmessagecapture.cpp => src/g2logmessagecapture.cpp rename : g2log/src/g2logmessagecapture.hpp => src/g2logmessagecapture.hpp rename : g2log/src/g2logworker.cpp => src/g2logworker.cpp rename : g2log/src/g2logworker.hpp => src/g2logworker.hpp rename : g2log/src/g2moveoncopy.hpp => src/g2moveoncopy.hpp rename : g2log/src/g2sink.hpp => src/g2sink.hpp rename : g2log/src/g2sinkhandle.hpp => src/g2sinkhandle.hpp rename : g2log/src/g2sinkwrapper.hpp => src/g2sinkwrapper.hpp rename : g2log/src/g2time.cpp => src/g2time.cpp rename : g2log/src/g2time.hpp => src/g2time.hpp rename : g2log/src/shared_queue.hpp => src/shared_queue.hpp rename : g2log/src/std2_make_unique.hpp => src/std2_make_unique.hpp rename : g2log/src/stlpatch_future.hpp => src/stlpatch_future.hpp rename : g2log/test_performance/Performance.cmake => test_performance/Performance.cmake rename : g2log/test_performance/main_threaded_mean.cpp => test_performance/main_threaded_mean.cpp rename : g2log/test_performance/main_threaded_worst.cpp => test_performance/main_threaded_worst.cpp rename : g2log/test_performance/performance.h => test_performance/performance.h rename : g2log/test_unit/Test.cmake => test_unit/Test.cmake rename : g2log/test_unit/test_concept_sink.cpp => test_unit/test_concept_sink.cpp rename : g2log/test_unit/test_configuration.cpp => test_unit/test_configuration.cpp rename : g2log/test_unit/test_filechange.cpp => test_unit/test_filechange.cpp rename : g2log/test_unit/test_io.cpp => test_unit/test_io.cpp rename : g2log/test_unit/test_linux_dynamic_loaded_sharedlib.cpp => test_unit/test_linux_dynamic_loaded_sharedlib.cpp rename : g2log/test_unit/test_sink.cpp => test_unit/test_sink.cpp rename : g2log/test_unit/tester_sharedlib.cpp => test_unit/tester_sharedlib.cpp rename : g2log/test_unit/tester_sharedlib.h => test_unit/tester_sharedlib.h rename : g2log/test_unit/testing_helpers.cpp => test_unit/testing_helpers.cpp rename : g2log/test_unit/testing_helpers.h => test_unit/testing_helpers.h --- g2log/Build.cmake => Build.cmake | 0 g2log/CMakeLists.txt => CMakeLists.txt | 0 g2log/CPackLists.txt => CPackLists.txt | 0 g2log/Dynamic.cmake => Dynamic.cmake | 0 README.markdown | 10 ++++------ {g2log/example => example}/Example.cmake | 0 {g2log/example => example}/main_contract.cpp | 0 {g2log/example => example}/main_sigsegv.cpp | 0 {g2log/src => src}/active.hpp | 0 {g2log/src => src}/crashhandler.hpp | 0 {g2log/src => src}/crashhandler_unix.cpp | 0 {g2log/src => src}/crashhandler_win.cpp | 0 {g2log/src => src}/g2filesink.cpp | 0 {g2log/src => src}/g2filesink.hpp | 0 {g2log/src => src}/g2filesinkhelper.ipp | 0 {g2log/src => src}/g2future.hpp | 0 {g2log/src => src}/g2log.cpp | 0 {g2log/src => src}/g2log.hpp | 0 {g2log/src => src}/g2loglevels.cpp | 0 {g2log/src => src}/g2loglevels.hpp | 0 {g2log/src => src}/g2logmessage.cpp | 0 {g2log/src => src}/g2logmessage.hpp | 0 {g2log/src => src}/g2logmessagecapture.cpp | 0 {g2log/src => src}/g2logmessagecapture.hpp | 0 {g2log/src => src}/g2logworker.cpp | 0 {g2log/src => src}/g2logworker.hpp | 0 {g2log/src => src}/g2moveoncopy.hpp | 0 {g2log/src => src}/g2sink.hpp | 0 {g2log/src => src}/g2sinkhandle.hpp | 0 {g2log/src => src}/g2sinkwrapper.hpp | 0 {g2log/src => src}/g2time.cpp | 0 {g2log/src => src}/g2time.hpp | 0 {g2log/src => src}/shared_queue.hpp | 0 {g2log/src => src}/std2_make_unique.hpp | 0 {g2log/src => src}/stlpatch_future.hpp | 0 .../Performance.cmake | 0 .../main_threaded_mean.cpp | 0 .../main_threaded_worst.cpp | 0 .../performance.h | 0 {g2log/test_unit => test_unit}/Test.cmake | 4 ++-- {g2log/test_unit => test_unit}/test_concept_sink.cpp | 0 {g2log/test_unit => test_unit}/test_configuration.cpp | 0 {g2log/test_unit => test_unit}/test_filechange.cpp | 0 {g2log/test_unit => test_unit}/test_io.cpp | 0 .../test_linux_dynamic_loaded_sharedlib.cpp | 0 {g2log/test_unit => test_unit}/test_sink.cpp | 0 {g2log/test_unit => test_unit}/tester_sharedlib.cpp | 0 {g2log/test_unit => test_unit}/tester_sharedlib.h | 0 {g2log/test_unit => test_unit}/testing_helpers.cpp | 0 {g2log/test_unit => test_unit}/testing_helpers.h | 0 50 files changed, 6 insertions(+), 8 deletions(-) rename g2log/Build.cmake => Build.cmake (100%) rename g2log/CMakeLists.txt => CMakeLists.txt (100%) rename g2log/CPackLists.txt => CPackLists.txt (100%) rename g2log/Dynamic.cmake => Dynamic.cmake (100%) rename {g2log/example => example}/Example.cmake (100%) rename {g2log/example => example}/main_contract.cpp (100%) rename {g2log/example => example}/main_sigsegv.cpp (100%) rename {g2log/src => src}/active.hpp (100%) rename {g2log/src => src}/crashhandler.hpp (100%) rename {g2log/src => src}/crashhandler_unix.cpp (100%) rename {g2log/src => src}/crashhandler_win.cpp (100%) rename {g2log/src => src}/g2filesink.cpp (100%) rename {g2log/src => src}/g2filesink.hpp (100%) rename {g2log/src => src}/g2filesinkhelper.ipp (100%) rename {g2log/src => src}/g2future.hpp (100%) rename {g2log/src => src}/g2log.cpp (100%) rename {g2log/src => src}/g2log.hpp (100%) rename {g2log/src => src}/g2loglevels.cpp (100%) rename {g2log/src => src}/g2loglevels.hpp (100%) rename {g2log/src => src}/g2logmessage.cpp (100%) rename {g2log/src => src}/g2logmessage.hpp (100%) rename {g2log/src => src}/g2logmessagecapture.cpp (100%) rename {g2log/src => src}/g2logmessagecapture.hpp (100%) rename {g2log/src => src}/g2logworker.cpp (100%) rename {g2log/src => src}/g2logworker.hpp (100%) rename {g2log/src => src}/g2moveoncopy.hpp (100%) rename {g2log/src => src}/g2sink.hpp (100%) rename {g2log/src => src}/g2sinkhandle.hpp (100%) rename {g2log/src => src}/g2sinkwrapper.hpp (100%) rename {g2log/src => src}/g2time.cpp (100%) rename {g2log/src => src}/g2time.hpp (100%) rename {g2log/src => src}/shared_queue.hpp (100%) rename {g2log/src => src}/std2_make_unique.hpp (100%) rename {g2log/src => src}/stlpatch_future.hpp (100%) rename {g2log/test_performance => test_performance}/Performance.cmake (100%) rename {g2log/test_performance => test_performance}/main_threaded_mean.cpp (100%) rename {g2log/test_performance => test_performance}/main_threaded_worst.cpp (100%) rename {g2log/test_performance => test_performance}/performance.h (100%) rename {g2log/test_unit => test_unit}/Test.cmake (95%) rename {g2log/test_unit => test_unit}/test_concept_sink.cpp (100%) rename {g2log/test_unit => test_unit}/test_configuration.cpp (100%) rename {g2log/test_unit => test_unit}/test_filechange.cpp (100%) rename {g2log/test_unit => test_unit}/test_io.cpp (100%) rename {g2log/test_unit => test_unit}/test_linux_dynamic_loaded_sharedlib.cpp (100%) rename {g2log/test_unit => test_unit}/test_sink.cpp (100%) rename {g2log/test_unit => test_unit}/tester_sharedlib.cpp (100%) rename {g2log/test_unit => test_unit}/tester_sharedlib.h (100%) rename {g2log/test_unit => test_unit}/testing_helpers.cpp (100%) rename {g2log/test_unit => test_unit}/testing_helpers.h (100%) diff --git a/g2log/Build.cmake b/Build.cmake similarity index 100% rename from g2log/Build.cmake rename to Build.cmake diff --git a/g2log/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from g2log/CMakeLists.txt rename to CMakeLists.txt diff --git a/g2log/CPackLists.txt b/CPackLists.txt similarity index 100% rename from g2log/CPackLists.txt rename to CPackLists.txt diff --git a/g2log/Dynamic.cmake b/Dynamic.cmake similarity index 100% rename from g2log/Dynamic.cmake rename to Dynamic.cmake diff --git a/README.markdown b/README.markdown index 94e21f8..c293682 100644 --- a/README.markdown +++ b/README.markdown @@ -157,21 +157,19 @@ int main(int argc, char**argv) { # BUILDING g3log: ----------- -The default is to build an example binary 'g2log-FATAL' -I suggest you start with that, run it and view the created log also. +The default is to build an example binary 'g3log-FATAL-contract' and 'g3log-FATAL-sigsegv'. I suggest you start with that, run it and view the created log also. If you are interested in the performance or unit tests then you can -enable the creation of them in the g2log/CMakeLists.txt file. See that file for +enable the creation of them in the g3log/CMakeLists.txt file. See that file for more details ``` -cd g2log +cd g3log mkdir build cd build ``` - ** Building on Linux ** ``` cmake -DCMAKE_BUILD_TYPE=Release .. @@ -182,7 +180,7 @@ make Please use the Visual Studio 12 (2013) command prompt "Developer command prompt" ``` cmake -DCMAKE_BUILD_TYPE=Release -G "Visual Studio 12" .. -msbuild g2log_by_kjellkod.sln /p:Configuration=Release +msbuild g3log.sln /p:Configuration=Release ``` ** Building on *nix with Clang: ** diff --git a/g2log/example/Example.cmake b/example/Example.cmake similarity index 100% rename from g2log/example/Example.cmake rename to example/Example.cmake diff --git a/g2log/example/main_contract.cpp b/example/main_contract.cpp similarity index 100% rename from g2log/example/main_contract.cpp rename to example/main_contract.cpp diff --git a/g2log/example/main_sigsegv.cpp b/example/main_sigsegv.cpp similarity index 100% rename from g2log/example/main_sigsegv.cpp rename to example/main_sigsegv.cpp diff --git a/g2log/src/active.hpp b/src/active.hpp similarity index 100% rename from g2log/src/active.hpp rename to src/active.hpp diff --git a/g2log/src/crashhandler.hpp b/src/crashhandler.hpp similarity index 100% rename from g2log/src/crashhandler.hpp rename to src/crashhandler.hpp diff --git a/g2log/src/crashhandler_unix.cpp b/src/crashhandler_unix.cpp similarity index 100% rename from g2log/src/crashhandler_unix.cpp rename to src/crashhandler_unix.cpp diff --git a/g2log/src/crashhandler_win.cpp b/src/crashhandler_win.cpp similarity index 100% rename from g2log/src/crashhandler_win.cpp rename to src/crashhandler_win.cpp diff --git a/g2log/src/g2filesink.cpp b/src/g2filesink.cpp similarity index 100% rename from g2log/src/g2filesink.cpp rename to src/g2filesink.cpp diff --git a/g2log/src/g2filesink.hpp b/src/g2filesink.hpp similarity index 100% rename from g2log/src/g2filesink.hpp rename to src/g2filesink.hpp diff --git a/g2log/src/g2filesinkhelper.ipp b/src/g2filesinkhelper.ipp similarity index 100% rename from g2log/src/g2filesinkhelper.ipp rename to src/g2filesinkhelper.ipp diff --git a/g2log/src/g2future.hpp b/src/g2future.hpp similarity index 100% rename from g2log/src/g2future.hpp rename to src/g2future.hpp diff --git a/g2log/src/g2log.cpp b/src/g2log.cpp similarity index 100% rename from g2log/src/g2log.cpp rename to src/g2log.cpp diff --git a/g2log/src/g2log.hpp b/src/g2log.hpp similarity index 100% rename from g2log/src/g2log.hpp rename to src/g2log.hpp diff --git a/g2log/src/g2loglevels.cpp b/src/g2loglevels.cpp similarity index 100% rename from g2log/src/g2loglevels.cpp rename to src/g2loglevels.cpp diff --git a/g2log/src/g2loglevels.hpp b/src/g2loglevels.hpp similarity index 100% rename from g2log/src/g2loglevels.hpp rename to src/g2loglevels.hpp diff --git a/g2log/src/g2logmessage.cpp b/src/g2logmessage.cpp similarity index 100% rename from g2log/src/g2logmessage.cpp rename to src/g2logmessage.cpp diff --git a/g2log/src/g2logmessage.hpp b/src/g2logmessage.hpp similarity index 100% rename from g2log/src/g2logmessage.hpp rename to src/g2logmessage.hpp diff --git a/g2log/src/g2logmessagecapture.cpp b/src/g2logmessagecapture.cpp similarity index 100% rename from g2log/src/g2logmessagecapture.cpp rename to src/g2logmessagecapture.cpp diff --git a/g2log/src/g2logmessagecapture.hpp b/src/g2logmessagecapture.hpp similarity index 100% rename from g2log/src/g2logmessagecapture.hpp rename to src/g2logmessagecapture.hpp diff --git a/g2log/src/g2logworker.cpp b/src/g2logworker.cpp similarity index 100% rename from g2log/src/g2logworker.cpp rename to src/g2logworker.cpp diff --git a/g2log/src/g2logworker.hpp b/src/g2logworker.hpp similarity index 100% rename from g2log/src/g2logworker.hpp rename to src/g2logworker.hpp diff --git a/g2log/src/g2moveoncopy.hpp b/src/g2moveoncopy.hpp similarity index 100% rename from g2log/src/g2moveoncopy.hpp rename to src/g2moveoncopy.hpp diff --git a/g2log/src/g2sink.hpp b/src/g2sink.hpp similarity index 100% rename from g2log/src/g2sink.hpp rename to src/g2sink.hpp diff --git a/g2log/src/g2sinkhandle.hpp b/src/g2sinkhandle.hpp similarity index 100% rename from g2log/src/g2sinkhandle.hpp rename to src/g2sinkhandle.hpp diff --git a/g2log/src/g2sinkwrapper.hpp b/src/g2sinkwrapper.hpp similarity index 100% rename from g2log/src/g2sinkwrapper.hpp rename to src/g2sinkwrapper.hpp diff --git a/g2log/src/g2time.cpp b/src/g2time.cpp similarity index 100% rename from g2log/src/g2time.cpp rename to src/g2time.cpp diff --git a/g2log/src/g2time.hpp b/src/g2time.hpp similarity index 100% rename from g2log/src/g2time.hpp rename to src/g2time.hpp diff --git a/g2log/src/shared_queue.hpp b/src/shared_queue.hpp similarity index 100% rename from g2log/src/shared_queue.hpp rename to src/shared_queue.hpp diff --git a/g2log/src/std2_make_unique.hpp b/src/std2_make_unique.hpp similarity index 100% rename from g2log/src/std2_make_unique.hpp rename to src/std2_make_unique.hpp diff --git a/g2log/src/stlpatch_future.hpp b/src/stlpatch_future.hpp similarity index 100% rename from g2log/src/stlpatch_future.hpp rename to src/stlpatch_future.hpp diff --git a/g2log/test_performance/Performance.cmake b/test_performance/Performance.cmake similarity index 100% rename from g2log/test_performance/Performance.cmake rename to test_performance/Performance.cmake diff --git a/g2log/test_performance/main_threaded_mean.cpp b/test_performance/main_threaded_mean.cpp similarity index 100% rename from g2log/test_performance/main_threaded_mean.cpp rename to test_performance/main_threaded_mean.cpp diff --git a/g2log/test_performance/main_threaded_worst.cpp b/test_performance/main_threaded_worst.cpp similarity index 100% rename from g2log/test_performance/main_threaded_worst.cpp rename to test_performance/main_threaded_worst.cpp diff --git a/g2log/test_performance/performance.h b/test_performance/performance.h similarity index 100% rename from g2log/test_performance/performance.h rename to test_performance/performance.h diff --git a/g2log/test_unit/Test.cmake b/test_unit/Test.cmake similarity index 95% rename from g2log/test_unit/Test.cmake rename to test_unit/Test.cmake index 1a612fb..88fec65 100644 --- a/g2log/test_unit/Test.cmake +++ b/test_unit/Test.cmake @@ -28,7 +28,7 @@ option (USE_G2LOG_UNIT_TEST IF (USE_G2LOG_UNIT_TEST) set(DIR_UNIT_TEST ${g3log_SOURCE_DIR}/test_unit) MESSAGE("-DUSE_G2LOG_UNIT_TEST=ON") - set(GTEST_DIR ../3rdParty/gtest/gtest-1.7.0) + set(GTEST_DIR ${g3log_SOURCE_DIR}/3rdParty/gtest/gtest-1.7.0) set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src) include_directories(${GTEST_INCLUDE_DIRECTORIES}) add_library(gtest_170_lib ${GTEST_DIR}/src/gtest-all.cc) @@ -48,7 +48,7 @@ option (USE_G2LOG_UNIT_TEST IF(${test} STREQUAL "test_filechange") add_executable(${test} ${DIR_UNIT_TEST}/${test}.cpp ${helper}) ELSE() - add_executable(${test} ../test_main/test_main.cpp ${DIR_UNIT_TEST}/${test}.cpp ${helper}) + add_executable(${test} ${g3log_SOURCE_DIR}/test_main/test_main.cpp ${DIR_UNIT_TEST}/${test}.cpp ${helper}) ENDIF(${test} STREQUAL "test_filechange") set_target_properties(${test} PROPERTIES COMPILE_DEFINITIONS "GTEST_HAS_TR1_TUPLE=0") diff --git a/g2log/test_unit/test_concept_sink.cpp b/test_unit/test_concept_sink.cpp similarity index 100% rename from g2log/test_unit/test_concept_sink.cpp rename to test_unit/test_concept_sink.cpp diff --git a/g2log/test_unit/test_configuration.cpp b/test_unit/test_configuration.cpp similarity index 100% rename from g2log/test_unit/test_configuration.cpp rename to test_unit/test_configuration.cpp diff --git a/g2log/test_unit/test_filechange.cpp b/test_unit/test_filechange.cpp similarity index 100% rename from g2log/test_unit/test_filechange.cpp rename to test_unit/test_filechange.cpp diff --git a/g2log/test_unit/test_io.cpp b/test_unit/test_io.cpp similarity index 100% rename from g2log/test_unit/test_io.cpp rename to test_unit/test_io.cpp diff --git a/g2log/test_unit/test_linux_dynamic_loaded_sharedlib.cpp b/test_unit/test_linux_dynamic_loaded_sharedlib.cpp similarity index 100% rename from g2log/test_unit/test_linux_dynamic_loaded_sharedlib.cpp rename to test_unit/test_linux_dynamic_loaded_sharedlib.cpp diff --git a/g2log/test_unit/test_sink.cpp b/test_unit/test_sink.cpp similarity index 100% rename from g2log/test_unit/test_sink.cpp rename to test_unit/test_sink.cpp diff --git a/g2log/test_unit/tester_sharedlib.cpp b/test_unit/tester_sharedlib.cpp similarity index 100% rename from g2log/test_unit/tester_sharedlib.cpp rename to test_unit/tester_sharedlib.cpp diff --git a/g2log/test_unit/tester_sharedlib.h b/test_unit/tester_sharedlib.h similarity index 100% rename from g2log/test_unit/tester_sharedlib.h rename to test_unit/tester_sharedlib.h diff --git a/g2log/test_unit/testing_helpers.cpp b/test_unit/testing_helpers.cpp similarity index 100% rename from g2log/test_unit/testing_helpers.cpp rename to test_unit/testing_helpers.cpp diff --git a/g2log/test_unit/testing_helpers.h b/test_unit/testing_helpers.h similarity index 100% rename from g2log/test_unit/testing_helpers.h rename to test_unit/testing_helpers.h