[arch-commits] CVS update of extra/science/qtiplot (PKGBUILD qtiplot-archlinux.pro)
Damir Perisa
damir at archlinux.org
Tue Nov 13 13:53:37 UTC 2007
Date: Tuesday, November 13, 2007 @ 08:53:37
Author: damir
Path: /home/cvs-extra/extra/science/qtiplot
Modified: PKGBUILD (1.16 -> 1.17) qtiplot-archlinux.pro (1.1 -> 1.2)
qtiplot: WORK IN PROGRESS! update, rebuild against qt>=4 and move to /usr (not yet built - needs pyqt>=4.x)
-----------------------+
PKGBUILD | 12
qtiplot-archlinux.pro | 756 ++++++++++++++++++++++++++----------------------
2 files changed, 430 insertions(+), 338 deletions(-)
Index: extra/science/qtiplot/PKGBUILD
diff -u extra/science/qtiplot/PKGBUILD:1.16 extra/science/qtiplot/PKGBUILD:1.17
--- extra/science/qtiplot/PKGBUILD:1.16 Tue Mar 6 22:28:49 2007
+++ extra/science/qtiplot/PKGBUILD Tue Nov 13 08:53:37 2007
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD,v 1.16 2007/03/07 03:28:49 damir Exp $
+# $Id: PKGBUILD,v 1.17 2007/11/13 13:53:37 damir Exp $
# Maintainer: damir <damir at archlinux.org>
# Contributor: damir <damir at archlinux.org>
pkgname=qtiplot
-pkgver=0.8.9
-origver=0.8.9
+pkgver=0.9
+origver=0.9
pkgrel=1
pkgdesc="Data analysis and scientific plotting - free clone of Origin"
arch=("i686" "x86_64")
-depends=('qwt>=5.0.1' 'qwtplot3d>=0.2.6' 'gsl' 'liborigin>=20070115' 'python' 'pyqt' 'sip')
+depends=('qwt>=5.0.2' 'qwtplot3d>=0.2.7' 'qt>=4.2' 'gsl' 'liborigin>=20070115' 'python>=2.5.1' 'pyqt' 'sip')
license=("GPL2")
source=("http://soft.proindependent.com/src/qtiplot-$origver.tar.bz2" \
"$pkgname.desktop" \
@@ -23,8 +23,8 @@
export QMAKESPEC=linux-g++
qmake qtiplot.pro || return 1
- make QTDIR=/opt/qt/ QMAKESPEC=linux-g++ || return 1
- install -D $startdir/src/$pkgname-$origver/$pkgname/$pkgname $startdir/pkg/opt/qt/bin/$pkgname || return 1
+ make QTDIR=/usr/ QMAKESPEC=linux-g++ || return 1
+ install -D $startdir/src/$pkgname-$origver/$pkgname/$pkgname $startdir/pkg/usr/bin/$pkgname || return 1
# make it nice:
install -D -m644 $startdir/src/$pkgname.png \
Index: extra/science/qtiplot/qtiplot-archlinux.pro
diff -u extra/science/qtiplot/qtiplot-archlinux.pro:1.1 extra/science/qtiplot/qtiplot-archlinux.pro:1.2
--- extra/science/qtiplot/qtiplot-archlinux.pro:1.1 Tue Mar 6 22:28:49 2007
+++ extra/science/qtiplot/qtiplot-archlinux.pro Tue Nov 13 08:53:37 2007
@@ -1,77 +1,93 @@
-QMAKE_PROJECT_DEPTH = 0
-linux-g++-64: libsuff=64
-
-TARGET = qtiplot
-TEMPLATE = app
-CONFIG += qt warn_on exceptions opengl
-CONFIG += thread
-CONFIG += release
-#CONFIG += debug
-
-MOC_DIR = ../tmp/qtiplot
-OBJECTS_DIR = ../tmp/qtiplot
-DESTDIR = ./
-DEFINES += QT_PLUGIN
-
#############################################################################
-##################### QAssistant ############################################
-#!!! Warning: You must modify these paths according to your computer settings
+###################### USER-SERVICEABLE PART ################################
#############################################################################
-unix:LIBS += /opt/qt/lib/libqassistantclient.a
-unix:INCLUDEPATH += /usr/include/gsl/
+# building without muParser doesn't work yet
+SCRIPTING_LANGS += muParser
+SCRIPTING_LANGS += Python
+
+# a console displaying output of scripts; particularly useful on Windows
+# where running QtiPlot from a terminal is inconvenient
+DEFINES += SCRIPTING_CONSOLE
+# a dialog for selecting the scripting language on a per-project basis
+DEFINES += SCRIPTING_DIALOG
+
+CONFIG += release
+#CONFIG += debug
+
+# what to install and where
+INSTALLS += target
+INSTALLS += documentation
+unix: INSTALLBASE = /usr
+win32: INSTALLBASE = c:/QtiPlot
+
+unix: target.path = $$INSTALLBASE/bin
+unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
+win32: target.path = $$INSTALLBASE
+win32: documentation.path = $$INSTALLBASE/doc
-#############################################################################
##################### 3rd PARTY HEADER FILES SECTION ########################
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
-unix:INCLUDEPATH += /opt/qt/include/qwt/
-unix:INCLUDEPATH += /opt/qt/include/qwtplot3d/
-
-# liborigin
-unix:INCLUDEPATH += /usr/include/
+INCLUDEPATH += ../3rdparty/muparser/include
+INCLUDEPATH += ../3rdparty/qwtplot3d/include
+INCLUDEPATH += ../3rdparty/qwt/src
+INCLUDEPATH += ../3rdparty/liborigin
+INCLUDEPATH += ../3rdparty/gsl/include
+INCLUDEPATH += ../3rdparty/zlib123/include
-#INCLUDEPATH += ../3rdparty/qwt/src
-#INCLUDEPATH += ../3rdparty/qwtplot3d/include
-#INCLUDEPATH += ../3rdparty/liborigin
-#unix:INCLUDEPATH += ../3rdparty/gsl/include
-#win32:INCLUDEPATH += ../3rdparty/WinGSL
-#INCLUDEPATH += ../3rdparty/zlib123/include
-
-#############################################################################
##################### 3rd PARTY LIBRARIES SECTION ###########################
#!!! Warning: You must modify these paths according to your computer settings
#############################################################################
##################### Linux (Mac OS X) ######################################
-unix:LIBS += /usr/lib/libgsl.a
-unix:LIBS += /usr/lib/libgslcblas.a
-unix:LIBS += /usr/lib/liborigin.so.0.0.1
-unix:LIBS += /opt/qt/lib/libqwt.so
-unix:LIBS += /opt/qt/lib/libqwtplot3d.so
-
+# statically link against libraries in 3rdparty
+#unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
#unix:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
-#unix:LIBS +=
-#unix:LIBS += ../3rdparty/liborigin/liborigin.a
+#unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
#unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
#unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
-unix:target.path=/usr/bin
-unix:INSTALLS += target
-
-unix:documentation.path = /usr/share/doc/qtiplot
-unix:documentation.files = doc/*
-unix:INSTALLS += documentation
+# dynamically link against dependencies if they are installed system-wide
+unix:LIBS += -lmuparser
+unix:LIBS += -lqwtplot3d
+unix:LIBS += -lqwt
+unix:LIBS += -lgsl -lgslcblas
##################### Windows ###############################################
-win32:DEFINES += QT_DLL QT_THREAD_SUPPORT GSL_DLL
-win32:LIBS += ../3rdparty/qwtplot3d/lib/qwtplot3d.lib
-win32:LIBS += ../3rdparty/qwt/lib/qwt.lib
-win32:LIBS += ../3rdparty/WinGSL/Lib/WinGsl.lib
-win32:LIBS += ../3rdparty/liborigin/liborigin.lib
-win32:LIBS += ../3rdparty/zlib123/lib/zdll.lib
+
+win32:LIBS += ../3rdparty/muparser/lib/libmuparser.a
+win32:LIBS += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+win32:LIBS += ../3rdparty/qwt/lib/libqwt.a
+win32:LIBS += ../3rdparty/gsl/lib/libgsl.a
+win32:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
+win32:LIBS += ../3rdparty/zlib123/lib/zdll.lib
+
+#############################################################################
+###################### END OF USER-SERVICEABLE PART #########################
+#############################################################################
+
+#############################################################################
+###################### BASIC PROJECT PROPERTIES #############################
+#############################################################################
+
+QMAKE_PROJECT_DEPTH = 0
+
+TARGET = qtiplot
+TEMPLATE = app
+CONFIG += qt warn_on exceptions opengl thread
+CONFIG += assistant
+
+DEFINES += QT_PLUGIN
+win32:DEFINES += QT_DLL QT_THREAD_SUPPORT
+QT += opengl qt3support network svg
+
+MOC_DIR = ../tmp/qtiplot
+OBJECTS_DIR = ../tmp/qtiplot
+SIP_DIR = ../tmp/qtiplot
+DESTDIR = ./
#############################################################################
###################### PROJECT FILES SECTION ################################
@@ -79,313 +95,389 @@
###################### ICONS ################################################
-win32:RC_FILE = icons/qtiplot.rc
-mac:RC_FILE = icons/qtiplot.icns
+win32:RC_FILE = icons/qtiplot.rc
+mac:RC_FILE = icons/qtiplot.icns
###################### TRANSLATIONS #########################################
-TRANSLATIONS = translations/qtiplot_de.ts \
- translations/qtiplot_es.ts \
- translations/qtiplot_fr.ts \
- translations/qtiplot_ru.ts \
- translations/qtiplot_sv.ts
+TRANSLATIONS = translations/qtiplot_de.ts \
+ translations/qtiplot_es.ts \
+ translations/qtiplot_fr.ts \
+ translations/qtiplot_ru.ts \
+ translations/qtiplot_ja.ts \
+ translations/qtiplot_sv.ts
#system(lupdate -verbose qtiplot.pro)
#system(lrelease -verbose qtiplot.pro)
+###################### DOCUMENTATION ########################################
+
+documentation.files += ../manual/html \
+ ../README.html \
+ ../gpl_licence.txt \
+
###################### HEADERS ##############################################
-HEADERS += src/application.h \
- src/graph.h \
- src/graph3D.h \
- src/worksheet.h \
- src/curvesDialog.h \
- src/valuesDialog.h \
- src/plotDialog.h \
- src/plot3DDialog.h \
- src/plotWizard.h \
- src/exportDialog.h \
- src/importDialog.h \
- src/axesDialog.h \
- src/pieDialog.h \
- src/polynomFitDialog.h \
- src/expDecayDialog.h \
- src/functionDialog.h \
- src/fitDialog.h \
- src/surfaceDialog.h \
- src/tableDialog.h \
- src/textDialog.h \
- src/lineDlg.h \
- src/scalePicker.h \
- src/canvaspicker.h \
- src/ErrorBar.h \
- src/pie.h \
- src/errDlg.h \
- src/LegendMarker.h \
- src/LineMarker.h\
- src/ImageMarker.h\
- src/imageDialog.h \
- src/fit.h \
- src/nrutil.h\
- src/pixmaps.h\
- src/multilayer.h\
- src/layerDialog.h \
- src/intDialog.h \
- src/sortDialog.h\
- src/bars.h \
- src/cones.h \
- src/configDialog.h \
- src/BarCurve.h \
- src/BoxCurve.h \
- src/Histogram.h \
- src/VectorCurve.h \
- src/scales.h \
- src/imageExportDialog.h \
- src/matrix.h \
- src/matrixDialog.h \
- src/matrixSizeDialog.h \
- src/matrixValuesDialog.h \
- src/analysisDialog.h \
- src/parser.h \
- src/colorBox.h \
- src/symbolBox.h \
- src/patternBox.h \
- src/importOPJ.h\
- src/symbolDialog.h \
- src/plot.h \
- src/colorButton.h \
- src/associationsDialog.h \
- src/renameWindowDialog.h \
- src/widget.h \
- src/interpolationDialog.h\
- src/fileDialogs.h\
- src/epsExportDialog.h\
- src/smoothCurveDialog.h\
- src/filterDialog.h\
- src/fftDialog.h\
- src/note.h\
- src/folder.h\
- src/findDialog.h\
- src/Scripting.h\
- src/scriptedit.h\
- src/FunctionCurve.h\
- src/Fitter.h\
- src/customEvents.h\
- src/ScriptingLangDialog.h\
- src/ScriptWindow.h\
- src/TableStatistics.h\
- src/Spectrogram.h\
- src/ColorMapEditor.h
-
-###################### SOURCES ##############################################
-
-SOURCES += src/application.cpp \
- src/graph.cpp \
- src/analysis.cpp \
- src/graph3D.cpp \
- src/worksheet.cpp \
- src/valuesDialog.cpp \
- src/curvesDialog.cpp \
- src/plotDialog.cpp \
- src/plot3DDialog.cpp \
- src/plotWizard.cpp \
- src/exportDialog.cpp \
- src/importDialog.cpp \
- src/axesDialog.cpp \
- src/pieDialog.cpp \
- src/polynomFitDialog.cpp \
- src/tableDialog.cpp \
- src/textDialog.cpp \
- src/scalePicker.cpp \
- src/canvaspicker.cpp \
- src/expDecayDialog.cpp \
- src/functionDialog.cpp \
- src/fitDialog.cpp \
- src/surfaceDialog.cpp \
- src/lineDlg.cpp \
- src/ErrorBar.cpp \
- src/pie.cpp \
- src/errDlg.cpp \
- src/LegendMarker.cpp \
- src/LineMarker.cpp \
- src/ImageMarker.cpp\
- src/imageDialog.cpp \
- src/multilayer.cpp\
- src/layerDialog.cpp \
- src/intDialog.cpp \
- src/sortDialog.cpp\
- src/bars.cpp \
- src/cones.cpp \
- src/analysisDialog.cpp \
- src/configDialog.cpp \
- src/BarCurve.cpp \
- src/BoxCurve.cpp \
- src/Histogram.cpp \
- src/VectorCurve.cpp \
- src/imageExportDialog.cpp \
- src/matrix.cpp \
- src/matrixDialog.cpp \
- src/matrixSizeDialog.cpp \
- src/matrixValuesDialog.cpp \
- src/parser.cpp\
- src/colorBox.cpp \
- src/symbolBox.cpp \
- src/patternBox.cpp \
- src/importOPJ.cpp\
- src/main.cpp \
- src/symbolDialog.cpp \
- src/plot.cpp \
- src/colorButton.cpp \
- src/associationsDialog.cpp \
- src/renameWindowDialog.cpp \
- src/widget.cpp\
- src/interpolationDialog.cpp\
- src/epsExportDialog.cpp\
- src/nrutil.cpp\
- src/fit.cpp\
- src/smoothCurveDialog.cpp\
- src/filterDialog.cpp\
- src/fftDialog.cpp\
- src/note.cpp\
- src/folder.cpp\
- src/findDialog.cpp\
- src/scriptedit.cpp\
- src/fileDialogs.cpp\
- src/scales.cpp\
- src/FunctionCurve.cpp\
- src/Fitter.cpp\
- src/Scripting.cpp\
- src/ScriptingLangDialog.cpp\
- src/ScriptWindow.cpp\
- src/TableStatistics.cpp\
- src/Spectrogram.cpp\
- src/ColorMapEditor.cpp
+HEADERS += src/ApplicationWindow.h \
+ src/globals.h\
+ src/Graph.h \
+ src/Graph3D.h \
+ src/Table.h \
+ src/CurvesDialog.h \
+ src/SetColValuesDialog.h \
+ src/PlotDialog.h \
+ src/Plot3DDialog.h \
+ src/PlotWizard.h \
+ src/ExportDialog.h \
+ src/AxesDialog.h \
+ src/PolynomFitDialog.h \
+ src/ExpDecayDialog.h \
+ src/FunctionDialog.h \
+ src/FitDialog.h \
+ src/SurfaceDialog.h \
+ src/TableDialog.h \
+ src/TextDialog.h \
+ src/LineDialog.h \
+ src/ScalePicker.h \
+ src/TitlePicker.h \
+ src/CanvasPicker.h \
+ src/PlotCurve.h \
+ src/QwtErrorPlotCurve.h \
+ src/QwtPieCurve.h \
+ src/ErrDialog.h \
+ src/Legend.h \
+ src/ArrowMarker.h \
+ src/ImageMarker.h \
+ src/ImageDialog.h \
+ src/fit_gsl.h \
+ src/nrutil.h\
+ src/pixmaps.h\
+ src/MultiLayer.h\
+ src/LayerDialog.h \
+ src/IntDialog.h \
+ src/SortDialog.h\
+ src/Bar.h \
+ src/Cone3D.h \
+ src/ConfigDialog.h \
+ src/QwtBarCurve.h \
+ src/BoxCurve.h \
+ src/QwtHistogram.h \
+ src/VectorCurve.h \
+ src/ScaleDraw.h \
+ src/Matrix.h \
+ src/MatrixDialog.h \
+ src/MatrixSizeDialog.h \
+ src/MatrixValuesDialog.h \
+ src/DataSetDialog.h \
+ src/MyParser.h \
+ src/ColorBox.h \
+ src/SymbolBox.h \
+ src/PatternBox.h \
+ src/importOPJ.h\
+ src/SymbolDialog.h \
+ src/Plot.h \
+ src/ColorButton.h \
+ src/AssociationsDialog.h \
+ src/RenameWindowDialog.h \
+ src/MyWidget.h \
+ src/InterpolationDialog.h\
+ src/ImportASCIIDialog.h \
+ src/ImageExportDialog.h\
+ src/SmoothCurveDialog.h\
+ src/FilterDialog.h\
+ src/FFTDialog.h\
+ src/Note.h\
+ src/Folder.h\
+ src/FindDialog.h\
+ src/ScriptingEnv.h\
+ src/Script.h\
+ src/ScriptEdit.h\
+ src/FunctionCurve.h\
+ src/Fit.h\
+ src/MultiPeakFit.h\
+ src/ExponentialFit.h\
+ src/PolynomialFit.h\
+ src/NonLinearFit.h\
+ src/PluginFit.h\
+ src/SigmoidalFit.h\
+ src/LogisticFit.h\
+ src/customevents.h\
+ src/ScriptingLangDialog.h\
+ src/ScriptWindow.h\
+ src/TextFormatButtons.h\
+ src/TableStatistics.h\
+ src/Spectrogram.h\
+ src/ColorMapEditor.h\
+ src/SelectionMoveResizer.h\
+ src/Filter.h\
+ src/Differentiation.h\
+ src/Integration.h\
+ src/Interpolation.h\
+ src/SmoothFilter.h\
+ src/FFTFilter.h\
+ src/FFT.h\
+ src/Convolution.h\
+ src/Correlation.h\
+ src/PlotToolInterface.h\
+ src/ScreenPickerTool.h\
+ src/DataPickerTool.h\
+ src/RangeSelectorTool.h\
+ src/TranslateCurveTool.h\
+ src/MultiPeakFitTool.h\
+ src/CurveRangeDialog.h\
+ src/LineProfileTool.h\
+ src/PlotEnrichement.h\
+ src/ExtensibleFileDialog.h\
+ src/OpenProjectDialog.h\
+ src/Grid.h
+
+###################### SOURCES ##############################################
+
+SOURCES += src/ApplicationWindow.cpp \
+ src/Graph.cpp \
+ src/Graph3D.cpp \
+ src/Table.cpp \
+ src/SetColValuesDialog.cpp \
+ src/CurvesDialog.cpp \
+ src/PlotDialog.cpp \
+ src/Plot3DDialog.cpp \
+ src/PlotWizard.cpp \
+ src/ExportDialog.cpp \
+ src/AxesDialog.cpp \
+ src/PolynomFitDialog.cpp \
+ src/TableDialog.cpp \
+ src/TextDialog.cpp \
+ src/ScalePicker.cpp\
+ src/TitlePicker.cpp \
+ src/CanvasPicker.cpp \
+ src/ExpDecayDialog.cpp \
+ src/FunctionDialog.cpp \
+ src/FitDialog.cpp \
+ src/SurfaceDialog.cpp \
+ src/LineDialog.cpp \
+ src/PlotCurve.cpp \
+ src/QwtErrorPlotCurve.cpp \
+ src/QwtPieCurve.cpp \
+ src/ErrDialog.cpp \
+ src/Legend.cpp \
+ src/ArrowMarker.cpp \
+ src/ImageMarker.cpp \
+ src/ImageDialog.cpp \
+ src/MultiLayer.cpp\
+ src/LayerDialog.cpp \
+ src/IntDialog.cpp \
+ src/SortDialog.cpp\
+ src/Bar.cpp \
+ src/Cone3D.cpp \
+ src/DataSetDialog.cpp \
+ src/ConfigDialog.cpp \
+ src/QwtBarCurve.cpp \
+ src/BoxCurve.cpp \
+ src/QwtHistogram.cpp \
+ src/VectorCurve.cpp \
+ src/Matrix.cpp \
+ src/MatrixDialog.cpp \
+ src/MatrixSizeDialog.cpp \
+ src/MatrixValuesDialog.cpp \
+ src/MyParser.cpp\
+ src/ColorBox.cpp \
+ src/SymbolBox.cpp \
+ src/PatternBox.cpp \
+ src/importOPJ.cpp\
+ src/main.cpp \
+ src/SymbolDialog.cpp \
+ src/Plot.cpp \
+ src/ColorButton.cpp \
+ src/AssociationsDialog.cpp \
+ src/RenameWindowDialog.cpp \
+ src/MyWidget.cpp\
+ src/InterpolationDialog.cpp\
+ src/nrutil.cpp\
+ src/fit_gsl.cpp\
+ src/SmoothCurveDialog.cpp\
+ src/FilterDialog.cpp\
+ src/FFTDialog.cpp\
+ src/Note.cpp\
+ src/Folder.cpp\
+ src/FindDialog.cpp\
+ src/TextFormatButtons.cpp\
+ src/ScriptEdit.cpp\
+ src/ImportASCIIDialog.cpp\
+ src/ImageExportDialog.cpp\
+ src/ScaleDraw.cpp\
+ src/FunctionCurve.cpp\
+ src/Fit.cpp\
+ src/MultiPeakFit.cpp\
+ src/ExponentialFit.cpp\
+ src/PolynomialFit.cpp\
+ src/PluginFit.cpp\
+ src/NonLinearFit.cpp\
+ src/SigmoidalFit.cpp\
+ src/LogisticFit.cpp\
+ src/ScriptingEnv.cpp\
+ src/Script.cpp\
+ src/ScriptingLangDialog.cpp\
+ src/ScriptWindow.cpp\
+ src/TableStatistics.cpp\
+ src/Spectrogram.cpp\
+ src/ColorMapEditor.cpp\
+ src/SelectionMoveResizer.cpp\
+ src/Filter.cpp\
+ src/Differentiation.cpp\
+ src/Integration.cpp\
+ src/Interpolation.cpp\
+ src/SmoothFilter.cpp\
+ src/FFTFilter.cpp\
+ src/FFT.cpp\
+ src/Convolution.cpp\
+ src/Correlation.cpp\
+ src/ScreenPickerTool.cpp\
+ src/DataPickerTool.cpp\
+ src/RangeSelectorTool.cpp\
+ src/TranslateCurveTool.cpp\
+ src/MultiPeakFitTool.cpp\
+ src/CurveRangeDialog.cpp\
+ src/LineProfileTool.cpp\
+ src/PlotEnrichement.cpp\
+ src/ExtensibleFileDialog.cpp\
+ src/OpenProjectDialog.cpp\
+ src/Grid.cpp
###############################################################
##################### Compression (zlib123) ###################
###############################################################
-SOURCES +=../3rdparty/zlib123/minigzip.c
+SOURCES += ../3rdparty/zlib123/minigzip.c
###############################################################
-##################### SCRIPTING LANGUAGES SECTION #############
+################# Origin Import (liborigin) ###################
###############################################################
- SCRIPTING_LANGS = muParser
- DEFINES += SCRIPTING_CONSOLE
- DEFINES += SCRIPTING_DIALOG
+HEADERS += ../3rdparty/liborigin/OPJFile.h
+SOURCES += ../3rdparty/liborigin/OPJFile.cpp
-# Python support is unstable; use at your own risk
-unix:SCRIPTING_LANGS += Python
+###############################################################
+##################### SCRIPTING LANGUAGES SECTION #############
+###############################################################
+
+##################### Default: muParser v1.28 #################
-##################### Default: muParser v1.26 #################
contains(SCRIPTING_LANGS, muParser) {
- DEFINES += SCRIPTING_MUPARSER
- HEADERS += src/muParserScripting.h \
- ../3rdparty/muParser/muParser.h \
- ../3rdparty/muParser/muParserBase.h \
- ../3rdparty/muParser/muParserInt.h \
- ../3rdparty/muParser/muParserError.h \
- ../3rdparty/muParser/muParserStack.h \
- ../3rdparty/muParser/muParserToken.h \
- ../3rdparty/muParser/muParserBytecode.h \
- ../3rdparty/muParser/muParserCallback.h \
- ../3rdparty/muParser/muParserTokenReader.h \
- ../3rdparty/muParser/muParserFixes.h \
- ../3rdparty/muParser/muParserDef.h
- SOURCES += src/muParserScripting.cpp \
- ../3rdparty/muParser/muParser.cpp \
- ../3rdparty/muParser/muParserBase.cpp \
- ../3rdparty/muParser/muParserInt.cpp \
- ../3rdparty/muParser/muParserBytecode.cpp \
- ../3rdparty/muParser/muParserCallback.cpp \
- ../3rdparty/muParser/muParserTokenReader.cpp \
- ../3rdparty/muParser/muParserError.cpp
+ DEFINES += SCRIPTING_MUPARSER
+
+ HEADERS += src/muParserScript.h \
+ src/muParserScripting.h \
+
+ SOURCES += src/muParserScript.cpp \
+ src/muParserScripting.cpp \
}
##################### PYTHON + SIP + PyQT #####################
+
contains(SCRIPTING_LANGS, Python) {
- DEFINES += SCRIPTING_PYTHON
- HEADERS += src/PythonScripting.h
- SOURCES += src/PythonScripting.cpp
-
- unix {
- INCLUDEPATH += $$system(python -c 'from distutils import sysconfig; print sysconfig.get_python_inc()')
- LIBS += $$system(python -c 'from distutils import sysconfig; print "-lpython"+sysconfig.get_config_var("VERSION")')
- LIBS += -lm
- system(mkdir -p $${MOC_DIR})
- unix:system(sip -I /usr/share/sip -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR} src/qti.sip)
- }
-
- macx {
- INCLUDEPATH += /Library/Frameworks/Python.framework/Versions/2.5/include/python2.5/
- LIBS += -framework Python -lm
- system(mkdir -p $${MOC_DIR})
- system(sip -I/Library/Frameworks/Python.framework/Versions/2.5/share/sip -t Qt_3_3_0 -t WS_X11 -c $${MOC_DIR} src/qti.sip)
- }
+ DEFINES += SCRIPTING_PYTHON
+ HEADERS += src/PythonScript.h src/PythonScripting.h
+ SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
+
+ unix {
+ INCLUDEPATH += $$system(python python-includepath.py)
+ LIBS += $$system(python -c "\"from distutils import sysconfig; print '-lpython'+sysconfig.get_config_var('VERSION')\"")
+ LIBS += -lm
+ system(mkdir -p $${SIP_DIR})
+ system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+ }
win32 {
- #!!! Warning: on Windows only with QtiPlot 0.9 version and Qt4
- INCLUDEPATH += C:/Python24/include
- #LIBS += C:/Python24/libs/libpython24.a
- LIBS += C:\Windows\System32\python24.dll
- system(md $${MOC_DIR})
- system(C:\Python24\sip.exe -I C:\Python24\sip\PyQt4 -t Qt_4_2_1 -t WS_WIN -c $${MOC_DIR} src/qti.sip)
- }
+ INCLUDEPATH += $$system(call python-includepath.py)
+ LIBS += $$system(call python-libs-win.py)
+ system($$system(call python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+ }
##################### SIP generated files #####################
- HEADERS +=\
- ../tmp/qtiplot/sipqtiApplicationWindow.h\
- ../tmp/qtiplot/sipqtiGraph.h\
- ../tmp/qtiplot/sipqtiLineMarker.h\
- ../tmp/qtiplot/sipqtiMultiLayer.h\
- ../tmp/qtiplot/sipqtiTable.h\
- ../tmp/qtiplot/sipqtimyWidget.h\
- ../tmp/qtiplot/sipqtiScriptEdit.h\
- ../tmp/qtiplot/sipqtiNote.h\
- ../tmp/qtiplot/sipqtiFit.h\
- ../tmp/qtiplot/sipqtiExponentialFit.h\
- ../tmp/qtiplot/sipqtiTwoExpFit.h\
- ../tmp/qtiplot/sipqtiThreeExpFit.h\
- ../tmp/qtiplot/sipqtiSigmoidalFit.h\
- ../tmp/qtiplot/sipqtiGaussAmpFit.h\
- ../tmp/qtiplot/sipqtiLorentzFit.h\
- ../tmp/qtiplot/sipqtiNonLinearFit.h\
- ../tmp/qtiplot/sipqtiPluginFit.h\
- ../tmp/qtiplot/sipqtiMultiPeakFit.h\
- ../tmp/qtiplot/sipqtiPolynomialFit.h\
- ../tmp/qtiplot/sipqtiLinearFit.h\
- ../tmp/qtiplot/sipqtiMatrix.h\
- ../tmp/qtiplot/sipqtiGaussFit.h\
- ../tmp/qtiplot/sipqtiPythonScript.h\
- ../tmp/qtiplot/sipqtiFolder.h\
- ../tmp/qtiplot/sipqtiQPtrList.h
- SOURCES +=\
- ../tmp/qtiplot/sipqticmodule.cpp\
- ../tmp/qtiplot/sipqtiApplicationWindow.cpp\
- ../tmp/qtiplot/sipqtiGraph.cpp\
- ../tmp/qtiplot/sipqtiLineMarker.cpp\
- ../tmp/qtiplot/sipqtiMultiLayer.cpp\
- ../tmp/qtiplot/sipqtiTable.cpp\
- ../tmp/qtiplot/sipqtimyWidget.cpp\
- ../tmp/qtiplot/sipqtiScriptEdit.cpp\
- ../tmp/qtiplot/sipqtiNote.cpp\
- ../tmp/qtiplot/sipqtiFit.cpp\
- ../tmp/qtiplot/sipqtiExponentialFit.cpp\
- ../tmp/qtiplot/sipqtiTwoExpFit.cpp\
- ../tmp/qtiplot/sipqtiThreeExpFit.cpp\
- ../tmp/qtiplot/sipqtiSigmoidalFit.cpp\
- ../tmp/qtiplot/sipqtiGaussAmpFit.cpp\
- ../tmp/qtiplot/sipqtiLorentzFit.cpp\
- ../tmp/qtiplot/sipqtiNonLinearFit.cpp\
- ../tmp/qtiplot/sipqtiPluginFit.cpp\
- ../tmp/qtiplot/sipqtiMultiPeakFit.cpp\
- ../tmp/qtiplot/sipqtiPolynomialFit.cpp\
- ../tmp/qtiplot/sipqtiLinearFit.cpp\
- ../tmp/qtiplot/sipqtiMatrix.cpp\
- ../tmp/qtiplot/sipqtiGaussFit.cpp\
- ../tmp/qtiplot/sipqtiPythonScript.cpp\
- ../tmp/qtiplot/sipqtiFolder.cpp\
- ../tmp/qtiplot/sipqtiQPtrList.cpp
+
+ HEADERS += $${SIP_DIR}/sipqtiApplicationWindow.h\
+ $${SIP_DIR}/sipqtiGraph.h\
+ $${SIP_DIR}/sipqtiGraph3D.h\
+ $${SIP_DIR}/sipqtiArrowMarker.h\
+ $${SIP_DIR}/sipqtiImageMarker.h\
+ $${SIP_DIR}/sipqtiLegend.h\
+ $${SIP_DIR}/sipqtiGrid.h\
+ $${SIP_DIR}/sipqtiMultiLayer.h\
+ $${SIP_DIR}/sipqtiTable.h\
+ $${SIP_DIR}/sipqtiMatrix.h\
+ $${SIP_DIR}/sipqtiMyWidget.h\
+ $${SIP_DIR}/sipqtiScriptEdit.h\
+ $${SIP_DIR}/sipqtiNote.h\
+ $${SIP_DIR}/sipqtiPythonScript.h\
+ $${SIP_DIR}/sipqtiPythonScripting.h\
+ $${SIP_DIR}/sipqtiFolder.h\
+ $${SIP_DIR}/sipqtiQList.h\
+ $${SIP_DIR}/sipqtiFit.h \
+ $${SIP_DIR}/sipqtiExponentialFit.h \
+ $${SIP_DIR}/sipqtiTwoExpFit.h \
+ $${SIP_DIR}/sipqtiThreeExpFit.h \
+ $${SIP_DIR}/sipqtiSigmoidalFit.h \
+ $${SIP_DIR}/sipqtiLogisticFit.h \
+ $${SIP_DIR}/sipqtiGaussAmpFit.h \
+ $${SIP_DIR}/sipqtiLorentzFit.h \
+ $${SIP_DIR}/sipqtiNonLinearFit.h \
+ $${SIP_DIR}/sipqtiPluginFit.h \
+ $${SIP_DIR}/sipqtiMultiPeakFit.h \
+ $${SIP_DIR}/sipqtiPolynomialFit.h \
+ $${SIP_DIR}/sipqtiLinearFit.h \
+ $${SIP_DIR}/sipqtiGaussFit.h \
+ $${SIP_DIR}/sipqtiFilter.h \
+ $${SIP_DIR}/sipqtiDifferentiation.h \
+ $${SIP_DIR}/sipqtiIntegration.h \
+ $${SIP_DIR}/sipqtiInterpolation.h \
+ $${SIP_DIR}/sipqtiSmoothFilter.h \
+ $${SIP_DIR}/sipqtiFFTFilter.h \
+ $${SIP_DIR}/sipqtiFFT.h \
+ $${SIP_DIR}/sipqtiCorrelation.h \
+ $${SIP_DIR}/sipqtiConvolution.h \
+ $${SIP_DIR}/sipqtiDeconvolution.h \
+
+ SOURCES += $${SIP_DIR}/sipqticmodule.cpp\
+ $${SIP_DIR}/sipqtiApplicationWindow.cpp\
+ $${SIP_DIR}/sipqtiGraph.cpp\
+ $${SIP_DIR}/sipqtiGraph3D.cpp\
+ $${SIP_DIR}/sipqtiArrowMarker.cpp\
+ $${SIP_DIR}/sipqtiImageMarker.cpp\
+ $${SIP_DIR}/sipqtiLegend.cpp\
+ $${SIP_DIR}/sipqtiGrid.cpp\
+ $${SIP_DIR}/sipqtiMultiLayer.cpp\
+ $${SIP_DIR}/sipqtiTable.cpp\
+ $${SIP_DIR}/sipqtiMatrix.cpp\
+ $${SIP_DIR}/sipqtiMyWidget.cpp\
+ $${SIP_DIR}/sipqtiScriptEdit.cpp\
+ $${SIP_DIR}/sipqtiNote.cpp\
+ $${SIP_DIR}/sipqtiPythonScript.cpp\
+ $${SIP_DIR}/sipqtiPythonScripting.cpp\
+ $${SIP_DIR}/sipqtiFolder.cpp\
+ $${SIP_DIR}/sipqtiQList.cpp\
+ $${SIP_DIR}/sipqtiFit.cpp \
+ $${SIP_DIR}/sipqtiExponentialFit.cpp \
+ $${SIP_DIR}/sipqtiTwoExpFit.cpp \
+ $${SIP_DIR}/sipqtiThreeExpFit.cpp \
+ $${SIP_DIR}/sipqtiSigmoidalFit.cpp \
+ $${SIP_DIR}/sipqtiLogisticFit.cpp \
+ $${SIP_DIR}/sipqtiGaussAmpFit.cpp \
+ $${SIP_DIR}/sipqtiLorentzFit.cpp \
+ $${SIP_DIR}/sipqtiNonLinearFit.cpp \
+ $${SIP_DIR}/sipqtiPluginFit.cpp \
+ $${SIP_DIR}/sipqtiMultiPeakFit.cpp \
+ $${SIP_DIR}/sipqtiPolynomialFit.cpp \
+ $${SIP_DIR}/sipqtiLinearFit.cpp \
+ $${SIP_DIR}/sipqtiGaussFit.cpp \
+ $${SIP_DIR}/sipqtiFilter.cpp \
+ $${SIP_DIR}/sipqtiDifferentiation.cpp \
+ $${SIP_DIR}/sipqtiIntegration.cpp \
+ $${SIP_DIR}/sipqtiInterpolation.cpp \
+ $${SIP_DIR}/sipqtiSmoothFilter.cpp \
+ $${SIP_DIR}/sipqtiFFTFilter.cpp \
+ $${SIP_DIR}/sipqtiFFT.cpp \
+ $${SIP_DIR}/sipqtiCorrelation.cpp \
+ $${SIP_DIR}/sipqtiConvolution.cpp \
+ $${SIP_DIR}/sipqtiDeconvolution.cpp \
}
###############################################################
More information about the arch-commits
mailing list