CMakeLists.txt

@@ -47,7 +47,7 @@ kst_option(bool   OFF win 3rdparty_download "Download precompiled 3rd party libr
 kst_option(bool   OFF win console           "Open console on Windows")
 kst_option(bool   OFF win edit_cont         "Enable \"Edit and Continue\" for Visual Studio")
 kst_option(bool   OFF all python            "Install Python support")
-kst_option(bool   OFF all python_build      "Download and build NumPy/SciPy then install Python support")
+kst_option(bool   OFF all python_depend     "Download and build NumPy/SciPy then install Python support")
 kst_option(string ""  all python_prefix     "Path for installing python bindings")
 kst_option(string OFF all cross             "Cross-compile on Linux for Windows")
 kst_option(string ""  all qt4               "Use cross compiled Qt4 at given path")

cmake/pyKst/CMakeLists.txt

@@ -24,7 +24,7 @@ else()
     message(STATUS "Installing python support into ${pydist_dir}. Overwrite using -Dkst_python_prefix=")
 endif()
 
-if(NOT kst_python_build)
+if(NOT kst_python_depend)
     macro(checkversion _name _required)
         string(TOUPPER ${_name} _n)
         if(${${_n}_VERSION} VERSION_LESS ${_required})
@@ -39,7 +39,7 @@ if(NOT kst_python_build)
 endif()
 
 
-if(kst_python_build)
+if(kst_python_depend)
     if(WIN32)
         # Python 2.6(7?)    : http://www.python.org/getit/windows
         # NumPy/Scipy (bin) : http://www.lfd.uci.edu/~gohlke/pythonlibs
@@ -81,11 +81,4 @@ if(kst_python_build)
     message(STATUS)
 endif()
 
-
-set(pykstpp_header ${CMAKE_CURRENT_BINARY_DIR}/pykstpp_h.py)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pykstpp_h.py.cmake ${pykstpp_header})
-
-install(FILES ${kstpydir}/pyKst/pykst.py ${kstpydir}/pyKst/pykstpp.py ${pykstpp_header} 
-        DESTINATION ${pydist_dir})
-
-
+install(FILES ${kstpydir}/pyKst/pykst.py DESTINATION ${pydist_dir})

pyKst/INSTALL

@@ -1,21 +1,17 @@
 To manually install pyKst:
+i) install requirements
+     -the latest kst2
+     -python2 (not python3), because of the following requirement
+     -numpy >= 1.6 (1.6.1 is known to work) 
+     -scipy >= 0.9 (0.9.0 is known to work)
+     -pyside or PyQT4
 
-i) edit pykstpp_h.py to match your local invironment
-You probably only have to edit INCLUDES
+ii) copy pykstpp.py to your system's python script directory
+eg (ubuntu), 
+  [host]$ sudo cp pykstpp.py /usr/lib/python2.7
 
-ii) install requirements
--python2 (not python3), because of the following requirement
--numpy >= 1.6 (1.6.1 is known to work) 
--scipy >= 0.9 (0.9.0 is known to work)
-   These packages have requirements.
--QtPy
-
-iii) copy pykstpp.py, pykstpp_h.py, and pykst.py to your system's python script directory
-eg, 
-  [host]$ sudo cp pykstpp.py pykstpp_h.py pykst.py /usr/lib/python2.7
-
-iv) To test it, go into the demo directory, and try one.
-  [host]$ python2 vectors.py
+iii) To test it, go into the demo directory, and try one.
+  [host demo]$ python2 ./dataobjects.py
 
 I have no idea if this works on anything other than linux.
 
@@ -25,28 +21,14 @@ Example for ubuntu:
 0) make sure you have the absolute latest kst2 from steve.  See kst.kde.org
 
 1) install dependencies for numpy and scipy
-sudo apt-get install python python-dev python-qt4 libatlas-base-dev gcc gfortran g++
-
-2) Install numpy 1.6.1 (ubuntu's default is not new enough)
-[host]$ tar xvfz numpy-1.6.1.tar.gz
-[host]$ cd numpy-1.6.1/
-[host]$ python setup.py build --fcompiler=gnu95
-[host]$ sudo python setup.py install
-
-3) Install scipy-0.9.0 (ubuntu's default is not new enough)
-[host]$ tar xvfz scipy-0.9.0.tar.gz
-[host]$ cd scipy-0.9.0
-[host]$ sudo python setup.py install
-
-4) edit pykstpp_h.py
-Change INCLUDES as suggested by comments in pykstpp_h.py
+sudo apt-get install python-numpy python-scipy python python-dev python-qt4 libatlas-base-dev gcc gfortran g++
 
-5) copy files
-  [host]$ sudo cp pykstpp.py pykstpp_h.py pykst.py /usr/lib/python2.7
+2) copy files
+  [host]$ sudo cp pykstpp.py /usr/lib/python2.7
 
 6) test it
 [host]$ cd demo
-[host]$ python2.7 vectors.py
+[host]$ python2.7 dataobjects.py
 
 
 ========