Skip to content

Commit 2854649

Browse files
sea5kgsea5kg
committed
Prepare building package release/debug
1 parent 4292336 commit 2854649

5 files changed

Lines changed: 91 additions & 50 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
UnigineEditorPlugin_Python3Scripting/python-bin
2-
2+
linux_UnigineEditorPlugin_Python3Scripting*
33

44
# Prerequisites
55
*.d

‎UnigineEditorPlugin_Python3Scripting/CMakeLists.txt‎

Lines changed: 54 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
1-
# Copyright (C), UNIGINE. All rights reserved.
2-
31
cmake_minimum_required(VERSION 3.14)
4-
project(UnigineEditorPlugin CXX)
2+
set(proj_name UnigineEditorPlugin_Python3Scripting_x64)
3+
if (CMAKE_BUILD_TYPE MATCHES "Debug")
4+
set(proj_name UnigineEditorPlugin_Python3Scripting_x64d)
5+
endif()
6+
project(${proj_name} CXX)
57

68
set(PYTHON3SCRIPTING_VERSION "0.0.1")
79
add_definitions(-DPYTHON3SCRIPTING_VERSION="${PYTHON3SCRIPTING_VERSION}")
810
add_subdirectory(QCodeEditor)
911

10-
# set(CMAKE_INSTALL_RPATH "./")
12+
1113

1214
include(${PROJECT_SOURCE_DIR}/cmake/Unigine.cmake)
1315

14-
if (EXISTS ${PROJECT_SOURCE_DIR}/UnigineEditorPlugin_Python3Scripting.json.in)
16+
if (EXISTS ${PROJECT_SOURCE_DIR}/${proj_name}.json.in)
1517
set(PLUGIN_VERSION ${UNIGINE_VERSION})
1618
set(PLUGIN_COMPAT_VERSION ${PYTHON3SCRIPTING_VERSION})
1719
configure_file(
18-
${PROJECT_SOURCE_DIR}/UnigineEditorPlugin_Python3Scripting.json.in
20+
${PROJECT_SOURCE_DIR}/${proj_name}.json.in
1921
${CMAKE_CURRENT_BINARY_DIR}/Plugin.json
2022
)
2123
endif()
2224

25+
# message(FATAL_ERROR ${CMAKE_CURRENT_BINARY_DIR})
26+
27+
# Create code for QObjects
28+
set(CMAKE_AUTOMOC ON)
29+
30+
# set(CMAKE_AUTOUIC ON)
31+
32+
# Create code from resource files
33+
set(CMAKE_AUTORCC ON)
34+
35+
find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED)
36+
2337
set(RESOURCES_FILE
2438
resources/UnigineEditorPlugin_Python3Scripting_resources.qrc
2539
)
2640

27-
set(CMAKE_AUTOMOC TRUE)
28-
set(CMAKE_AUTOUIC TRUE)
29-
set(CMAKE_AUTORCC TRUE)
30-
31-
find_package(Qt5 COMPONENTS Widgets REQUIRED)
32-
33-
add_library(UnigineEditorPlugin_Python3Scripting SHARED
41+
add_library(${proj_name} SHARED
3442
${RESOURCES_FILE}
3543
${PROJECT_SOURCE_DIR}/src/UnigineEditorPlugin_Python3Scripting.cpp
3644
${PROJECT_SOURCE_DIR}/src/PythonExecutor.cpp
@@ -49,7 +57,7 @@ add_library(UnigineEditorPlugin_Python3Scripting SHARED
4957
${PROJECT_SOURCE_DIR}/src/python3_wrapper/pytypesobjects/python3_unigine_node.cpp
5058
)
5159

52-
target_include_directories(UnigineEditorPlugin_Python3Scripting SYSTEM
60+
target_include_directories(${proj_name} SYSTEM
5361
PRIVATE
5462
${PROJECT_SOURCE_DIR}/QCodeEditor/include
5563
${PROJECT_SOURCE_DIR}/include
@@ -60,36 +68,48 @@ target_include_directories(UnigineEditorPlugin_Python3Scripting SYSTEM
6068
${CMAKE_CURRENT_BINARY_DIR}
6169
)
6270

63-
target_link_libraries(UnigineEditorPlugin_Python3Scripting
71+
if (CMAKE_BUILD_TYPE MATCHES "Debug")
72+
target_compile_definitions(${proj_name}
73+
PRIVATE
74+
DEBUG
75+
QT_DEBUG
76+
)
77+
78+
set_target_properties(${proj_name}
79+
PROPERTIES
80+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../bin/editor_debug/
81+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../bin/editor_debug/
82+
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../lib/editor_debug/
83+
CXX_VISIBILITY_PRESET hidden
84+
)
85+
else()
86+
target_compile_definitions(${proj_name}
87+
PRIVATE
88+
NDEBUG
89+
QT_NO_DEBUG
90+
)
91+
92+
set_target_properties(${proj_name}
93+
PROPERTIES
94+
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../bin/editor/
95+
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../bin/editor/
96+
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../lib/editor/
97+
CXX_VISIBILITY_PRESET hidden
98+
)
99+
endif()
100+
101+
target_link_libraries(${proj_name}
64102
PRIVATE
65103
Unigine::CompilerFlags
66104
Unigine::Engine
67105
Unigine::Editor
68106
Qt5::Core
107+
Qt5::Gui
69108
Qt5::Widgets
70109
QCodeEditor
71110
${CMAKE_SOURCE_DIR}/python-bin/lib/libpython3.10.a
72111
)
73112

74-
set_target_properties(UnigineEditorPlugin_Python3Scripting
75-
PROPERTIES
76-
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../bin/editor/
77-
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../bin/editor/
78-
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/../lib/editor/
79-
CXX_VISIBILITY_PRESET hidden
80-
)
81-
82-
if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
83-
target_compile_definitions(UnigineEditorPlugin_Python3Scripting
84-
PRIVATE
85-
QT_DEBUG
86-
)
87-
else()
88-
target_compile_definitions(UnigineEditorPlugin_Python3Scripting
89-
PRIVATE
90-
QT_NO_DEBUG
91-
)
92-
endif()
93113

94114

95115

‎UnigineEditorPlugin_Python3Scripting/QCodeEditor/CMakeLists.txt‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
cmake_minimum_required(VERSION 3.6)
2-
project(QCodeEditor)
1+
cmake_minimum_required(VERSION 3.14)
2+
3+
set(proj_name QCodeEditor)
4+
project(${proj_name})
35

46
set(CMAKE_CXX_STANDARD 11)
57

@@ -79,18 +81,18 @@ find_package(Qt5Core CONFIG REQUIRED)
7981
find_package(Qt5Widgets CONFIG REQUIRED)
8082
find_package(Qt5Gui CONFIG REQUIRED)
8183

82-
add_library(QCodeEditor STATIC
84+
add_library(${proj_name} STATIC
8385
${RESOURCES_FILE}
8486
${SOURCE_FILES}
8587
${INCLUDE_FILES}
8688
)
8789

88-
target_include_directories(QCodeEditor PUBLIC
90+
target_include_directories(${proj_name} PUBLIC
8991
include
9092
)
9193

9294
if(CMAKE_COMPILER_IS_GNUCXX)
93-
target_compile_options(QCodeEditor
95+
target_compile_options(${proj_name}
9496
PRIVATE
9597
-ansi
9698
-pedantic
@@ -103,7 +105,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
103105
)
104106
endif(CMAKE_COMPILER_IS_GNUCXX)
105107

106-
target_link_libraries(QCodeEditor
108+
target_link_libraries(${proj_name}
107109
Qt5::Core
108110
Qt5::Widgets
109111
Qt5::Gui

‎UnigineEditorPlugin_Python3Scripting/src/python3_wrapper/pytypesobjects/python3_unigine_node.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ unigine_Node_rotate_by_angels(unigine_Node* self, PyObject *args)
132132
{
133133
PyErr_Clear();
134134
PyObject *ret = NULL;
135-
assert(arg);
135+
// assert(arg);
136136

137137
//
138138
float angle_x;

‎build_plugin.sh‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ check_ret() {
1717

1818
cd UnigineEditorPlugin_Python3Scripting
1919

20+
# rm -rf junk/debug
21+
2022
cmake -H. -Bjunk/release -DCMAKE_BUILD_TYPE=Release \
2123
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
2224
-DCMAKE_INSTALL_PREFIX=../bin
@@ -25,19 +27,36 @@ check_ret $? "cmake configure release"
2527
cmake --build junk/release --parallel 8 --config Release
2628
check_ret $? "cmake build release"
2729

30+
cmake -H. -Bjunk/debug -DCMAKE_BUILD_TYPE=Debug \
31+
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
32+
-DCMAKE_INSTALL_PREFIX=../bin
33+
check_ret $? "cmake configure debug"
2834

35+
cmake --build junk/debug --parallel 8 --config Debug
36+
check_ret $? "cmake build debug"
2937

3038
cd ../bin/editor/
3139
export LD_LIBRARY_PATH=`pwd`/../../bin/:$LD_LIBRARY_PATH
3240
echo $LD_LIBRARY_PATH
33-
ldd -d libUnigineEditorPlugin_Python3Scripting.so
41+
ldd -d libUnigineEditorPlugin_Python3Scripting_x64.so
42+
43+
cd ../../bin/editor_debug/
44+
export LD_LIBRARY_PATH=`pwd`/../../bin/:$LD_LIBRARY_PATH
45+
echo $LD_LIBRARY_PATH
46+
ldd -d libUnigineEditorPlugin_Python3Scripting_x64d.so
47+
48+
cd ../../
49+
50+
pkgname="linux_UnigineEditorPlugin_Python3Scripting_v0.0.1"
51+
if [ -d "$pkgname" ]; then
52+
rm -rf "$pkgname"
53+
fi
3454

35-
# cmake -H. -Bjunk/debug -DCMAKE_BUILD_TYPE=Debug \
36-
# -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
37-
# -DCMAKE_INSTALL_PREFIX=../bin
38-
# check_ret $? "cmake configure debug"
39-
#
40-
# cmake --build junk/debug --parallel 8 --config Release
41-
# check_ret $? "cmake build debug"
55+
mkdir -p $pkgname/bin/editor
56+
mkdir -p $pkgname/bin/editor_debug
4257

58+
cp -rf bin/editor/libUnigineEditorPlugin_Python3Scripting_x64.so $pkgname/bin/editor
59+
cp -rf bin/editor_debug/libUnigineEditorPlugin_Python3Scripting_x64d.so $pkgname/bin/editor_debug
4360

61+
zip -r "$pkgname.zip" $pkgname
62+
rm -rf "$pkgname"

0 commit comments

Comments
 (0)