Author: craig
Date: Sat Nov  9 14:51:14 2019
New Revision: 23352

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23352
Log:
Re-add legacy Python 2.x scriptplugin prior to r23278 and switches to choose 
it, use -DWANT_PYTHON_2X=1. Default remains 3.x.

Added:
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/CMakeLists.txt   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/README.BOOST
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcell.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcell.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdcolor.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddialog.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddoc.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmddoc.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetprop.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetsetprop.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdgetsetprop.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmani.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdmisc.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdobj.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdpage.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdsetprop.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtable.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtable.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdtext.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdutil.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdvar.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/guiapp.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/install.targets
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/objimageexport.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/objimageexport.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/objpdffile.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/objprinter.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.h   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/pconsole.ui
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripter.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/prefs_scripterbase.ui
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/runscriptdialog.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/runscriptdialog.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/runscriptdialog.ui
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/3columnA4.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/3columnUSLTR.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/CMakeLists.txt   
(with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/Calender.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/ExtractText.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/ReadMe
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/Sample1.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/boilerplate.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/golden-mean.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/legende.py
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/moins_10_pourcent_group.py
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/plus_10_pourcent_group.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/pochette_cd.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/quote.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/sample_db_usage.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/trait_de_coupe.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/samples/wordcount.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_base.cpp   
(with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qtclass_qapplication.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qtclass_qframe.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qtclass_qmainwindow.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qtclass_qobject.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qtclass_qscrollview.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qtclass_qwidget.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_qttype_qstring.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribus_pageitem.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribus_scribusdoc.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribus_scribusmainwin.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribus_scribusqapp.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribus_scribusview.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribus_scribuswin.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_scribusstructs.cpp
   (with props)
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripter2/scripter2_styles.cpp  
 (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptercore.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.cpp   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scriptplugin.h   (with 
props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/
    
trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/Align_image_in_frame.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/Autoquote.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/Autoquote2.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/CMakeLists.txt   
(with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/CalendarWizard.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/Caption.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/ColorChart.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/DirectImageImport.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/FontSample.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/InfoBox.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/Ligatursatz.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/ReadMe
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/color2csv.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/csv2color.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/importcsv2table.py
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/svgimport.cpp   (with props)
    trunk/Scribus/scribus/plugins/scriptplugin_py2x/svgimport.h   (with props)
Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/plugins/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23352&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake (original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake Sat Nov  9 14:51:14 2019
@@ -135,24 +135,30 @@
 #<< JPEG, TIFF
 
 #<< PYTHON
-#
-#find_package(PythonInterp 2)
-#find_package(PythonLibs 2 REQUIRED)
-#if (PYTHON_LIBRARY)
-#      message("Python Library Found OK")
-#      set(HAVE_PYTHON ON)
-#      set(COMPILE_PYTHON ON)
-#endif()
-#
-find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
-if (Python3_Development_FOUND)
-       message("Python 3.x Library Found OK (Version ${Python3_VERSION})")
-       message("Interpreter: ${Python3_EXECUTABLE}")
-       message("Include directories: ${Python3_INCLUDE_DIRS}")
-       message("Library directories: ${Python3_LIBRARY_DIRS}")
-       message("Runtime library directories: ${Python3_RUNTIME_LIBRARY_DIRS}")
-       set(HAVE_PYTHON ON)
-       set(COMPILE_PYTHON ON)
+if (NOT WANT_PYTHON_2X)
+       message("Python 3.x Selected")
+       find_package (Python3 REQUIRED COMPONENTS Interpreter Development)
+       if (Python3_Development_FOUND)
+               message("Python 3.x Library Found OK (Version 
${Python3_VERSION})")
+               message("Interpreter: ${Python3_EXECUTABLE}")
+               message("Include directories: ${Python3_INCLUDE_DIRS}")
+               message("Library directories: ${Python3_LIBRARY_DIRS}")
+               message("Runtime library directories: 
${Python3_RUNTIME_LIBRARY_DIRS}")
+               set(HAVE_PYTHON ON)
+               set(COMPILE_PYTHON ON)
+       endif()
+else()
+       message("Python 2.x Requested")
+       find_package (Python2 REQUIRED COMPONENTS Interpreter Development)
+       if (Python2_Development_FOUND)
+               message("Python 2.x Library Found OK (Version 
${Python2_VERSION})")
+               message("Interpreter: ${Python2_EXECUTABLE}")
+               message("Include directories: ${Python2_INCLUDE_DIRS}")
+               message("Library directories: ${Python2_LIBRARY_DIRS}")
+               message("Runtime library directories: 
${Python2_RUNTIME_LIBRARY_DIRS}")
+               set(HAVE_PYTHON ON)
+               set(COMPILE_PYTHON ON)
+       endif()
 endif()
 #>> PYTHON
 

Modified: trunk/Scribus/scribus/plugins/CMakeLists.txt
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23352&path=/trunk/Scribus/scribus/plugins/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/CMakeLists.txt        (original)
+++ trunk/Scribus/scribus/plugins/CMakeLists.txt        Sat Nov  9 14:51:14 2019
@@ -11,7 +11,11 @@
   #scripter1
   if(NOT WIN32)
     message(STATUS "Building with Scripter 1")
-    add_subdirectory(scriptplugin)
+    if(NOT WANT_PYTHON_2X)
+      add_subdirectory(scriptplugin)
+    else()
+      add_subdirectory(scriptplugin_py2x)
+    endif()
   endif()
 else()
   #scripter2

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23352&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp Sat Nov  9 
14:51:14 2019
@@ -144,7 +144,7 @@
                        "Petr Van\xc4\x9bk <p...@scribus.info>, "
                        "Franz Schmid <fr...@scribus.info>, "
                        "Craig Ringer <cr...@scribus.info>");
-       about->shortDescription = tr("Embedded Python scripting support.");
+       about->shortDescription = tr("Embedded Python scripting support for 
Python 3.x.");
        // about->description = tr("Write me!")
        // about->version
        // about->releaseDate


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to