From eef19dd5357a1f254f9c4e2db01c75c23e4157e5 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 16 Nov 2022 19:41:16 +0900 Subject: [PATCH] superkaramba: added cmake rules for example files and create xcursor.so at build time. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michele Calgaro Signed-off-by: Slávek Banko --- ConfigureChecks.cmake | 6 +-- superkaramba/CMakeLists.txt | 1 + superkaramba/examples/CMakeLists.txt | 7 +++ .../examples/{taskBar => }/cleanbar/README | 0 .../{taskBar => }/cleanbar/cleanbar.py | 0 .../{taskBar => }/cleanbar/cleanbar.theme | 0 .../{taskBar => }/cleanbar/pics/bar2.png | Bin .../{taskBar => }/cleanbar/pics/rightend.png | Bin .../cleanbar/pics/rightend_new.png | Bin .../{taskBar => }/cleanbar/pics/slickbar.png | Bin .../{taskBar => }/cleanbar/pics/startup.png | Bin .../{taskBar => }/cleanbar/pics/task.png | Bin .../{taskBar => }/cleanbar/pics/task_new.png | Bin .../examples/globalMouse/CMakeLists.txt | 11 ++++ superkaramba/examples/globalMouse/README | 2 +- .../examples/globalMouse/extension/setup.py | 8 +-- superkaramba/examples/globalMouse/xcursor.so | Bin 27408 -> 0 bytes .../mouseDrag/{karmix => }/images/bar.png | Bin .../mouseDrag/{karmix => }/images/bg.png | Bin .../examples/mouseDrag/{karmix => }/karmix.py | 0 .../mouseDrag/{karmix => }/karmix.theme | 0 superkaramba/examples/test_all.sh | 51 ++++++++++-------- 22 files changed, 57 insertions(+), 29 deletions(-) create mode 100644 superkaramba/examples/CMakeLists.txt rename superkaramba/examples/{taskBar => }/cleanbar/README (100%) rename superkaramba/examples/{taskBar => }/cleanbar/cleanbar.py (100%) rename superkaramba/examples/{taskBar => }/cleanbar/cleanbar.theme (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/bar2.png (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/rightend.png (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/rightend_new.png (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/slickbar.png (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/startup.png (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/task.png (100%) rename superkaramba/examples/{taskBar => }/cleanbar/pics/task_new.png (100%) create mode 100644 superkaramba/examples/globalMouse/CMakeLists.txt delete mode 100755 superkaramba/examples/globalMouse/xcursor.so rename superkaramba/examples/mouseDrag/{karmix => }/images/bar.png (100%) rename superkaramba/examples/mouseDrag/{karmix => }/images/bg.png (100%) rename superkaramba/examples/mouseDrag/{karmix => }/karmix.py (100%) rename superkaramba/examples/mouseDrag/{karmix => }/karmix.theme (100%) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 148884c..01e91ae 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -206,9 +206,9 @@ if ( BUILD_SUPERKARAMBA ) check_include_file( "sys/types.h" HAVE_SYS_TYPES_H ) find_package( PythonLibs ) - if( NOT PYTHONLIBS_FOUND ) - tde_message_fatal( "python is required, but was not found on your system" ) - endif( NOT PYTHONLIBS_FOUND ) + if( NOT PYTHONLIBS_FOUND OR "${PYTHONLIBS_VERSION_STRING}" LESS "3" ) + tde_message_fatal( "Python3 is required, but was not found on your system" ) + endif( ) if( WITH_TDENEWSTUFF ) set( HAVE_TDENEWSTUFF 1 ) diff --git a/superkaramba/CMakeLists.txt b/superkaramba/CMakeLists.txt index 21dbc7e..7aaf596 100644 --- a/superkaramba/CMakeLists.txt +++ b/superkaramba/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( src ) +add_subdirectory( examples ) add_subdirectory( icons ) add_subdirectory( mimetypes ) diff --git a/superkaramba/examples/CMakeLists.txt b/superkaramba/examples/CMakeLists.txt new file mode 100644 index 0000000..0eefb51 --- /dev/null +++ b/superkaramba/examples/CMakeLists.txt @@ -0,0 +1,7 @@ +add_subdirectory( globalMouse ) + +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION ${DATA_INSTALL_DIR}/superkaramba/examples + PATTERN CMakeLists.txt EXCLUDE +) diff --git a/superkaramba/examples/taskBar/cleanbar/README b/superkaramba/examples/cleanbar/README similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/README rename to superkaramba/examples/cleanbar/README diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.py b/superkaramba/examples/cleanbar/cleanbar.py similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/cleanbar.py rename to superkaramba/examples/cleanbar/cleanbar.py diff --git a/superkaramba/examples/taskBar/cleanbar/cleanbar.theme b/superkaramba/examples/cleanbar/cleanbar.theme similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/cleanbar.theme rename to superkaramba/examples/cleanbar/cleanbar.theme diff --git a/superkaramba/examples/taskBar/cleanbar/pics/bar2.png b/superkaramba/examples/cleanbar/pics/bar2.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/bar2.png rename to superkaramba/examples/cleanbar/pics/bar2.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/rightend.png b/superkaramba/examples/cleanbar/pics/rightend.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/rightend.png rename to superkaramba/examples/cleanbar/pics/rightend.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/rightend_new.png b/superkaramba/examples/cleanbar/pics/rightend_new.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/rightend_new.png rename to superkaramba/examples/cleanbar/pics/rightend_new.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/slickbar.png b/superkaramba/examples/cleanbar/pics/slickbar.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/slickbar.png rename to superkaramba/examples/cleanbar/pics/slickbar.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/startup.png b/superkaramba/examples/cleanbar/pics/startup.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/startup.png rename to superkaramba/examples/cleanbar/pics/startup.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/task.png b/superkaramba/examples/cleanbar/pics/task.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/task.png rename to superkaramba/examples/cleanbar/pics/task.png diff --git a/superkaramba/examples/taskBar/cleanbar/pics/task_new.png b/superkaramba/examples/cleanbar/pics/task_new.png similarity index 100% rename from superkaramba/examples/taskBar/cleanbar/pics/task_new.png rename to superkaramba/examples/cleanbar/pics/task_new.png diff --git a/superkaramba/examples/globalMouse/CMakeLists.txt b/superkaramba/examples/globalMouse/CMakeLists.txt new file mode 100644 index 0000000..9df1a76 --- /dev/null +++ b/superkaramba/examples/globalMouse/CMakeLists.txt @@ -0,0 +1,11 @@ +##### xcursor.so ####################### + +include_directories( + ${PYTHON_INCLUDE_DIR} +) + +tde_add_library( xcursor MODULE NO_LIBTOOL_FILE + SOURCES extension/xcursor.c + LINK ${PYTHON_LIBRARIES} X11 + DESTINATION ${DATA_INSTALL_DIR}/superkaramba/examples/globalMouse +) diff --git a/superkaramba/examples/globalMouse/README b/superkaramba/examples/globalMouse/README index 758ce4b..7d2abc3 100644 --- a/superkaramba/examples/globalMouse/README +++ b/superkaramba/examples/globalMouse/README @@ -19,7 +19,7 @@ INSTALLATION: named build. This file needs to be copied in the same directory as the eyes.theme and eyes.py file. - A precompiled xcursor.so file is included (Compiled on Mandrake 9.1). + A precompiled xcursor.so file is included. CHANGES: * Moving the theme now works as it should. diff --git a/superkaramba/examples/globalMouse/extension/setup.py b/superkaramba/examples/globalMouse/extension/setup.py index 49bd87b..2003334 100644 --- a/superkaramba/examples/globalMouse/extension/setup.py +++ b/superkaramba/examples/globalMouse/extension/setup.py @@ -5,10 +5,10 @@ def main(): version = '1.0', description = 'Determines the position of the X mouse cursor', ext_modules = [Extension('xcursor', - include_dirs = ['/usr/X11R6/include'], - libraries = ['X11'], - library_dirs = ['/usr/X11R6/lib'], - sources = ['xcursor.c'])]) + include_dirs = ['/usr/X11R6/include'], + libraries = ['X11'], + library_dirs = ['/usr/X11R6/lib'], + sources = ['xcursor.c'])]) if __name__ == "__main__": main() diff --git a/superkaramba/examples/globalMouse/xcursor.so b/superkaramba/examples/globalMouse/xcursor.so deleted file mode 100755 index 167bb290e9eff65006a143c1684fa1ba4a116666..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27408 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 RN0EPLqn5v