From 9401a4389efb05199c24449f112bd5626225e61a Mon Sep 17 00:00:00 2001 From: Hleb Valoshka <375gnu@gmail.com> Date: Mon, 14 Oct 2019 20:06:06 +0300 Subject: [PATCH] Move scripts to their own subdirectories --- src/CMakeLists.txt | 2 + src/celestia/CMakeLists.txt | 42 ++----------------- src/celestia/celestiacore.cpp | 4 +- src/celestia/celestiacore.h | 6 +-- src/celestia/favorites.cpp | 2 +- src/celestia/win32/winmain.cpp | 2 +- src/celscript/CMakeLists.txt | 4 ++ src/celscript/legacy/CMakeLists.txt | 10 +++++ .../legacy}/cmdparser.cpp | 4 +- .../legacy}/cmdparser.h | 0 .../legacy}/command.cpp | 6 +-- src/{celestia => celscript/legacy}/command.h | 0 .../legacy}/execution.cpp | 0 .../legacy}/execution.h | 0 src/celscript/lua/CMakeLists.txt | 29 +++++++++++++ src/{celestia => celscript/lua}/celx.cpp | 25 ++++------- src/{celestia => celscript/lua}/celx.h | 0 .../lua}/celx_category.cpp | 0 .../lua}/celx_category.h | 0 .../lua}/celx_celestia.cpp | 8 ++-- .../lua}/celx_celestia.h | 0 .../lua}/celx_frame.cpp | 2 +- src/{celestia => celscript/lua}/celx_frame.h | 0 src/{celestia => celscript/lua}/celx_gl.cpp | 0 src/{celestia => celscript/lua}/celx_gl.h | 0 .../lua}/celx_internal.h | 0 src/{celestia => celscript/lua}/celx_misc.cpp | 6 +-- src/{celestia => celscript/lua}/celx_misc.h | 0 .../lua}/celx_object.cpp | 2 +- src/{celestia => celscript/lua}/celx_object.h | 0 .../lua}/celx_observer.cpp | 2 +- .../lua}/celx_observer.h | 0 .../lua}/celx_phase.cpp | 0 src/{celestia => celscript/lua}/celx_phase.h | 0 .../lua}/celx_position.cpp | 0 .../lua}/celx_position.h | 0 .../lua}/celx_rotation.cpp | 0 .../lua}/celx_rotation.h | 0 .../lua}/celx_vector.cpp | 0 src/{celestia => celscript/lua}/celx_vector.h | 0 40 files changed, 77 insertions(+), 79 deletions(-) create mode 100644 src/celscript/CMakeLists.txt create mode 100644 src/celscript/legacy/CMakeLists.txt rename src/{celestia => celscript/legacy}/cmdparser.cpp (99%) rename src/{celestia => celscript/legacy}/cmdparser.h (100%) rename src/{celestia => celscript/legacy}/command.cpp (99%) rename src/{celestia => celscript/legacy}/command.h (100%) rename src/{celestia => celscript/legacy}/execution.cpp (100%) rename src/{celestia => celscript/legacy}/execution.h (100%) create mode 100644 src/celscript/lua/CMakeLists.txt rename src/{celestia => celscript/lua}/celx.cpp (99%) rename src/{celestia => celscript/lua}/celx.h (100%) rename src/{celestia => celscript/lua}/celx_category.cpp (100%) rename src/{celestia => celscript/lua}/celx_category.h (100%) rename src/{celestia => celscript/lua}/celx_celestia.cpp (99%) rename src/{celestia => celscript/lua}/celx_celestia.h (100%) rename src/{celestia => celscript/lua}/celx_frame.cpp (99%) rename src/{celestia => celscript/lua}/celx_frame.h (100%) rename src/{celestia => celscript/lua}/celx_gl.cpp (100%) rename src/{celestia => celscript/lua}/celx_gl.h (100%) rename src/{celestia => celscript/lua}/celx_internal.h (100%) rename src/{celestia => celscript/lua}/celx_misc.cpp (98%) rename src/{celestia => celscript/lua}/celx_misc.h (100%) rename src/{celestia => celscript/lua}/celx_object.cpp (99%) rename src/{celestia => celscript/lua}/celx_object.h (100%) rename src/{celestia => celscript/lua}/celx_observer.cpp (99%) rename src/{celestia => celscript/lua}/celx_observer.h (100%) rename src/{celestia => celscript/lua}/celx_phase.cpp (100%) rename src/{celestia => celscript/lua}/celx_phase.h (100%) rename src/{celestia => celscript/lua}/celx_position.cpp (100%) rename src/{celestia => celscript/lua}/celx_position.h (100%) rename src/{celestia => celscript/lua}/celx_rotation.cpp (100%) rename src/{celestia => celscript/lua}/celx_rotation.h (100%) rename src/{celestia => celscript/lua}/celx_vector.cpp (100%) rename src/{celestia => celscript/lua}/celx_vector.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee5689cc..2be64284 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,6 +12,8 @@ foreach(lib ${CELESTIA_LIBS}) add_subdirectory(${lib}) endforeach() +add_subdirectory(celscript) + # These compiled objects are merged with the celengine library add_subdirectory(celephem) add_subdirectory(celcompat) diff --git a/src/celestia/CMakeLists.txt b/src/celestia/CMakeLists.txt index a02b6b5c..4981dac4 100644 --- a/src/celestia/CMakeLists.txt +++ b/src/celestia/CMakeLists.txt @@ -3,16 +3,10 @@ set(CELESTIA_SOURCES celestiacore.h configfile.cpp configfile.h - cmdparser.cpp - cmdparser.h - command.cpp - command.h destination.cpp destination.h eclipsefinder.cpp eclipsefinder.h - execution.cpp - execution.h favorites.cpp favorites.h helper.cpp @@ -28,38 +22,6 @@ set(CELESTIA_SOURCES view.h ) -set(CELX_SOURCES - celx_category.cpp - celx_category.h - celx_celestia.cpp - celx_celestia.h - celx.cpp - celx_frame.cpp - celx_frame.h - celx_gl.cpp - celx_gl.h - celx.h - celx_internal.h - celx_misc.cpp - celx_misc.h - celx_object.cpp - celx_object.h - celx_observer.cpp - celx_observer.h - celx_phase.cpp - celx_phase.h - celx_position.cpp - celx_position.h - celx_rotation.cpp - celx_rotation.h - celx_vector.cpp - celx_vector.h -) - -if(ENABLE_CELX) - list(APPEND CELESTIA_SOURCES ${CELX_SOURCES}) -endif() - if(WIN32) list(APPEND CELESTIA_SOURCES avicapture.cpp @@ -72,7 +34,9 @@ elseif(_UNIX AND ENABLE_THEORA) ) endif() -add_library(celestia STATIC ${CELESTIA_SOURCES}) +add_library(celestia STATIC ${CELESTIA_SOURCES} + $ + $) #[[ add_library(celestia SHARED ${CELESTIA_SOURCES}) diff --git a/src/celestia/celestiacore.cpp b/src/celestia/celestiacore.cpp index c81bbe43..6a873cfc 100644 --- a/src/celestia/celestiacore.cpp +++ b/src/celestia/celestiacore.cpp @@ -21,8 +21,8 @@ #include #include #include -#include "execution.h" -#include "cmdparser.h" +#include +#include #include #ifdef USE_SPICE #include diff --git a/src/celestia/celestiacore.h b/src/celestia/celestiacore.h index 3e519a3a..d189a07d 100644 --- a/src/celestia/celestiacore.h +++ b/src/celestia/celestiacore.h @@ -15,8 +15,8 @@ // #include #include #include -#include "command.h" -#include "execution.h" +#include +#include #include #include #include @@ -29,7 +29,7 @@ #include "moviecapture.h" #include "view.h" #ifdef CELX -#include "celx.h" +#include #endif class Url; diff --git a/src/celestia/favorites.cpp b/src/celestia/favorites.cpp index abdabe7e..20890e8a 100644 --- a/src/celestia/favorites.cpp +++ b/src/celestia/favorites.cpp @@ -11,9 +11,9 @@ #include #include #include +#include #include #include -#include "cmdparser.h" #include "favorites.h" using namespace Eigen; diff --git a/src/celestia/win32/winmain.cpp b/src/celestia/win32/winmain.cpp index cf2150cb..c0317ef1 100644 --- a/src/celestia/win32/winmain.cpp +++ b/src/celestia/win32/winmain.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/celscript/CMakeLists.txt b/src/celscript/CMakeLists.txt new file mode 100644 index 00000000..25768f16 --- /dev/null +++ b/src/celscript/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(legacy) +if(ENABLE_CELX) + add_subdirectory(lua) +endif() diff --git a/src/celscript/legacy/CMakeLists.txt b/src/celscript/legacy/CMakeLists.txt new file mode 100644 index 00000000..95fc74d0 --- /dev/null +++ b/src/celscript/legacy/CMakeLists.txt @@ -0,0 +1,10 @@ +set(LEGACY_SOURCES + cmdparser.cpp + cmdparser.h + command.cpp + command.h + execution.cpp + execution.h +) + +add_library(cellegacyscript OBJECT ${LEGACY_SOURCES}) diff --git a/src/celestia/cmdparser.cpp b/src/celscript/legacy/cmdparser.cpp similarity index 99% rename from src/celestia/cmdparser.cpp rename to src/celscript/legacy/cmdparser.cpp index 3a6f4189..4475aec1 100644 --- a/src/celestia/cmdparser.cpp +++ b/src/celscript/legacy/cmdparser.cpp @@ -20,8 +20,8 @@ #include #include #ifdef CELX -#include "celx.h" -#include "celx_internal.h" +#include +#include #endif #include #include diff --git a/src/celestia/cmdparser.h b/src/celscript/legacy/cmdparser.h similarity index 100% rename from src/celestia/cmdparser.h rename to src/celscript/legacy/cmdparser.h diff --git a/src/celestia/command.cpp b/src/celscript/legacy/command.cpp similarity index 99% rename from src/celestia/command.cpp rename to src/celscript/legacy/command.cpp index 4b5bba86..bba18c2e 100644 --- a/src/celestia/command.cpp +++ b/src/celscript/legacy/command.cpp @@ -14,10 +14,10 @@ #ifdef USE_GLCONTEXT #include #endif -#include "celestiacore.h" -#include "imagecapture.h" +#include +#include #ifdef CELX -#include "celx_internal.h" +#include #endif #include #include diff --git a/src/celestia/command.h b/src/celscript/legacy/command.h similarity index 100% rename from src/celestia/command.h rename to src/celscript/legacy/command.h diff --git a/src/celestia/execution.cpp b/src/celscript/legacy/execution.cpp similarity index 100% rename from src/celestia/execution.cpp rename to src/celscript/legacy/execution.cpp diff --git a/src/celestia/execution.h b/src/celscript/legacy/execution.h similarity index 100% rename from src/celestia/execution.h rename to src/celscript/legacy/execution.h diff --git a/src/celscript/lua/CMakeLists.txt b/src/celscript/lua/CMakeLists.txt new file mode 100644 index 00000000..aed3e916 --- /dev/null +++ b/src/celscript/lua/CMakeLists.txt @@ -0,0 +1,29 @@ +set(CELX_SOURCES + celx_category.cpp + celx_category.h + celx_celestia.cpp + celx_celestia.h + celx.cpp + celx_frame.cpp + celx_frame.h + celx_gl.cpp + celx_gl.h + celx.h + celx_internal.h + celx_misc.cpp + celx_misc.h + celx_object.cpp + celx_object.h + celx_observer.cpp + celx_observer.h + celx_phase.cpp + celx_phase.h + celx_position.cpp + celx_position.h + celx_rotation.cpp + celx_rotation.h + celx_vector.cpp + celx_vector.h +) + +add_library(celluascript OBJECT ${CELX_SOURCES}) diff --git a/src/celestia/celx.cpp b/src/celscript/lua/celx.cpp similarity index 99% rename from src/celestia/celx.cpp rename to src/celscript/lua/celx.cpp index e597d272..713e40e1 100644 --- a/src/celestia/celx.cpp +++ b/src/celscript/lua/celx.cpp @@ -14,18 +14,20 @@ #include #include #include +#include +#include #include #include -#include "cmdparser.h" +#include #include -#include "execution.h" +#include #include #include #include -#include "imagecapture.h" -#include "url.h" +#include +#include +#include -#include "celx.h" #include "celx_internal.h" #include "celx_misc.h" #include "celx_vector.h" @@ -40,19 +42,6 @@ #include "celx_category.h" -// Older gcc versions used instead of . -// This has been corrected in GCC 3.2, but name clashing must -// be avoided -#ifdef __GNUC__ -#undef min -#undef max -#endif -#include -#include - -#include "celx.h" -#include "celestiacore.h" - using namespace Eigen; using namespace std; diff --git a/src/celestia/celx.h b/src/celscript/lua/celx.h similarity index 100% rename from src/celestia/celx.h rename to src/celscript/lua/celx.h diff --git a/src/celestia/celx_category.cpp b/src/celscript/lua/celx_category.cpp similarity index 100% rename from src/celestia/celx_category.cpp rename to src/celscript/lua/celx_category.cpp diff --git a/src/celestia/celx_category.h b/src/celscript/lua/celx_category.h similarity index 100% rename from src/celestia/celx_category.h rename to src/celscript/lua/celx_category.h diff --git a/src/celestia/celx_celestia.cpp b/src/celscript/lua/celx_celestia.cpp similarity index 99% rename from src/celestia/celx_celestia.cpp rename to src/celscript/lua/celx_celestia.cpp index 26b5f1f4..2276dca6 100644 --- a/src/celestia/celx_celestia.cpp +++ b/src/celscript/lua/celx_celestia.cpp @@ -25,10 +25,10 @@ #include "celx_rotation.h" #include "celx_vector.h" #include "celx_category.h" -#include "url.h" -#include "imagecapture.h" -#include "celestiacore.h" -#include "view.h" +#include +#include +#include +#include using namespace Eigen; diff --git a/src/celestia/celx_celestia.h b/src/celscript/lua/celx_celestia.h similarity index 100% rename from src/celestia/celx_celestia.h rename to src/celscript/lua/celx_celestia.h diff --git a/src/celestia/celx_frame.cpp b/src/celscript/lua/celx_frame.cpp similarity index 99% rename from src/celestia/celx_frame.cpp rename to src/celscript/lua/celx_frame.cpp index 62fd2760..a4ee85d2 100644 --- a/src/celestia/celx_frame.cpp +++ b/src/celscript/lua/celx_frame.cpp @@ -12,7 +12,7 @@ #include "celx.h" #include "celx_internal.h" #include "celx_frame.h" -#include "celestiacore.h" +#include #include #include diff --git a/src/celestia/celx_frame.h b/src/celscript/lua/celx_frame.h similarity index 100% rename from src/celestia/celx_frame.h rename to src/celscript/lua/celx_frame.h diff --git a/src/celestia/celx_gl.cpp b/src/celscript/lua/celx_gl.cpp similarity index 100% rename from src/celestia/celx_gl.cpp rename to src/celscript/lua/celx_gl.cpp diff --git a/src/celestia/celx_gl.h b/src/celscript/lua/celx_gl.h similarity index 100% rename from src/celestia/celx_gl.h rename to src/celscript/lua/celx_gl.h diff --git a/src/celestia/celx_internal.h b/src/celscript/lua/celx_internal.h similarity index 100% rename from src/celestia/celx_internal.h rename to src/celscript/lua/celx_internal.h diff --git a/src/celestia/celx_misc.cpp b/src/celscript/lua/celx_misc.cpp similarity index 98% rename from src/celestia/celx_misc.cpp rename to src/celscript/lua/celx_misc.cpp index f188d739..b1f9fbf4 100644 --- a/src/celestia/celx_misc.cpp +++ b/src/celscript/lua/celx_misc.cpp @@ -2,10 +2,10 @@ #include #include "celx_misc.h" #include "celx_internal.h" -#include "cmdparser.h" +#include #include -#include "execution.h" -#include "celestiacore.h" +#include +#include LuaState *getLuaStateObject(lua_State*); diff --git a/src/celestia/celx_misc.h b/src/celscript/lua/celx_misc.h similarity index 100% rename from src/celestia/celx_misc.h rename to src/celscript/lua/celx_misc.h diff --git a/src/celestia/celx_object.cpp b/src/celscript/lua/celx_object.cpp similarity index 99% rename from src/celestia/celx_object.cpp rename to src/celscript/lua/celx_object.cpp index ea73dfc8..04253a94 100644 --- a/src/celestia/celx_object.cpp +++ b/src/celscript/lua/celx_object.cpp @@ -20,7 +20,7 @@ #include #include #include -#include "celestiacore.h" +#include using namespace Eigen; using namespace std; diff --git a/src/celestia/celx_object.h b/src/celscript/lua/celx_object.h similarity index 100% rename from src/celestia/celx_object.h rename to src/celscript/lua/celx_object.h diff --git a/src/celestia/celx_observer.cpp b/src/celscript/lua/celx_observer.cpp similarity index 99% rename from src/celestia/celx_observer.cpp rename to src/celscript/lua/celx_observer.cpp index ad00e070..01c0157b 100644 --- a/src/celestia/celx_observer.cpp +++ b/src/celscript/lua/celx_observer.cpp @@ -15,7 +15,7 @@ #include "celx_observer.h" //#include //#include -#include "celestiacore.h" +#include #include using namespace std; diff --git a/src/celestia/celx_observer.h b/src/celscript/lua/celx_observer.h similarity index 100% rename from src/celestia/celx_observer.h rename to src/celscript/lua/celx_observer.h diff --git a/src/celestia/celx_phase.cpp b/src/celscript/lua/celx_phase.cpp similarity index 100% rename from src/celestia/celx_phase.cpp rename to src/celscript/lua/celx_phase.cpp diff --git a/src/celestia/celx_phase.h b/src/celscript/lua/celx_phase.h similarity index 100% rename from src/celestia/celx_phase.h rename to src/celscript/lua/celx_phase.h diff --git a/src/celestia/celx_position.cpp b/src/celscript/lua/celx_position.cpp similarity index 100% rename from src/celestia/celx_position.cpp rename to src/celscript/lua/celx_position.cpp diff --git a/src/celestia/celx_position.h b/src/celscript/lua/celx_position.h similarity index 100% rename from src/celestia/celx_position.h rename to src/celscript/lua/celx_position.h diff --git a/src/celestia/celx_rotation.cpp b/src/celscript/lua/celx_rotation.cpp similarity index 100% rename from src/celestia/celx_rotation.cpp rename to src/celscript/lua/celx_rotation.cpp diff --git a/src/celestia/celx_rotation.h b/src/celscript/lua/celx_rotation.h similarity index 100% rename from src/celestia/celx_rotation.h rename to src/celscript/lua/celx_rotation.h diff --git a/src/celestia/celx_vector.cpp b/src/celscript/lua/celx_vector.cpp similarity index 100% rename from src/celestia/celx_vector.cpp rename to src/celscript/lua/celx_vector.cpp diff --git a/src/celestia/celx_vector.h b/src/celscript/lua/celx_vector.h similarity index 100% rename from src/celestia/celx_vector.h rename to src/celscript/lua/celx_vector.h