From 94fa838c4f5f5ed6bbc6839d2b74460d1147892f Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Tue, 5 Feb 2019 17:32:45 +0100 Subject: [PATCH 01/13] Try 3rdparty zip with getdata 0.10.0 --- cmake/travis.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index 7cffe75fe..3b4886e1d 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -255,8 +255,9 @@ checkExitCode # # download 3rdparty # +altserver=http://toolshed.sourceforge.net/kst if [ ! -d $dep/$extlib ]; then - wget $server/$extlib.zip + wget $altserver/$extlib.zip checkExitCode cd $dep unzip -q $builddir/$extlib.zip From 5e14fcef7e9c22daff27f0ed5096f54dd28bb136 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Tue, 5 Feb 2019 18:01:56 +0100 Subject: [PATCH 02/13] Workaround for Travis PPA key issue --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ea5f4109..171c2bf74 100755 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ matrix: install: + - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157 - sudo apt-get -y update - sudo apt-get -y install cmake g++-mingw-w64-i686 g++-mingw-w64-x86-64 #- sudo apt-get update From 60ea408cc1ecaf951c06d9de5b15b19e9b2c22a4 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Wed, 6 Feb 2019 00:07:32 +0100 Subject: [PATCH 03/13] Cross-build getdata 0.10.0 using i686-w64-mingw32-gcc-dw2-4.7.2-Ubuntu64-12.04.tar.xz --- cmake/travis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/travis.sh b/cmake/travis.sh index 3b4886e1d..3afba1d75 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -182,6 +182,7 @@ else mingwdir=mingw32$exc extlib=kst-3rdparty-win32-gcc$exc-4.7.2 extlib=kst-3rdparty-win32-gcc4.7 + extlib=kst-3rdparty-win32-gcc4.7-tv useext= useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=$dep/"$extlib fi From 57f37187b41cf3fe73b74d6c97eca4456b6ad7c1 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Wed, 6 Feb 2019 00:25:40 +0100 Subject: [PATCH 04/13] Folder name didn't match zip file name --- cmake/travis.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index 3afba1d75..3b4886e1d 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -182,7 +182,6 @@ else mingwdir=mingw32$exc extlib=kst-3rdparty-win32-gcc$exc-4.7.2 extlib=kst-3rdparty-win32-gcc4.7 - extlib=kst-3rdparty-win32-gcc4.7-tv useext= useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=$dep/"$extlib fi From b094453f1e8945a507de1586fc9f196347067a6d Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Wed, 6 Feb 2019 01:11:36 +0100 Subject: [PATCH 05/13] Pick up getdata cross-built on Ubuntu 14.04 --- cmake/travis.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/travis.sh b/cmake/travis.sh index 3b4886e1d..3afba1d75 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -182,6 +182,7 @@ else mingwdir=mingw32$exc extlib=kst-3rdparty-win32-gcc$exc-4.7.2 extlib=kst-3rdparty-win32-gcc4.7 + extlib=kst-3rdparty-win32-gcc4.7-tv useext= useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=$dep/"$extlib fi From 24dbcce264248cb8b0abc9cabbdcff5d2c2d28c4 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 17 Jan 2019 22:50:04 +0100 Subject: [PATCH 06/13] Typos and punctuation in usage text Signed-off-by: Tormod Volden --- src/libkstapp/commandlineparser.cpp | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp index f9bbf7ce3..2b28c5634 100644 --- a/src/libkstapp/commandlineparser.cpp +++ b/src/libkstapp/commandlineparser.cpp @@ -65,34 +65,34 @@ namespace Kst { " --Letter Print to Letter sized paper.\n" " --A4 Print to A4 sized paper.\n" " --png Render to a png image, and exit.\n" -" --pngHeight Height of png image (pixels)\n" -" --pngWidth Width of png image (pixels)\n" +" --pngHeight Height of png image (pixels).\n" +" --pngWidth Width of png image (pixels).\n" "File Options:\n" -" -f default: 'end' counts from end.\n" +" -f default: 'end' counts from end\n" " -n default: 'end' reads to end of file\n" " -s default: 0 (read every sample)\n" -" -a apply averaging filter: requires -s\n\n" -"Ascii File Options - for ascii files only: these are all stick\n" +" -a Apply averaging filter (requires -s).\n\n" +"Ascii File Options - for ascii files only: These are all sticky\n" " --asciiDataStart Data starts here. Files start at line 1.\n" " --asciiFieldNames Field names are in this row.\n" -" --asciiNoFieldNames Fields are named for their data column\n" -" --asciiReadUnits Read units from line \n" -" --asciiNoUnits Do not read units\n" -" --asciiSpaceDelim Columns are Space/tab delimited\n" -" --asciiDelim Columns are dlimited with \n" -" --asciiFixedWidth Columns have width \n" -" --asciiNoFixedWidth Columns are delimited, not fixed width\n" -" --asciiDecimalDot Use a . as a decimal separator (ie, 10.1)\n" -" --asciiDecimalComma Use a , as a decimal separator (ie, 10,1)\n" +" --asciiNoFieldNames Fields are named for their data column.\n" +" --asciiReadUnits Read units from line .\n" +" --asciiNoUnits Do not read units.\n" +" --asciiSpaceDelim Columns are Space/Tab delimited.\n" +" --asciiDelim Columns are delimited with .\n" +" --asciiFixedWidth Columns have width .\n" +" --asciiNoFixedWidth Columns are delimited, not fixed width.\n" +" --asciiDecimalDot Use a . as a decimal separator (e.g. 10.1).\n" +" --asciiDecimalComma Use a , as a decimal separator (e.g. 10,1).\n" "Position:\n" " -P : Place curves in one plot.\n" " -A Place future curves in individual plots.\n" -" -m Layout plots in columns\n" +" -m Layout plots in columns.\n" " -T Place future curves a new tab.\n" "Appearance\n" -" -d: use points for the next curve\n" -" -l: use lines for the next curve\n" -" -b: use bargraph for the next curve\n" +" -d: Use points for the next curve.\n" +" -l: Use lines for the next curve.\n" +" -b: Use bargraph for the next curve.\n" " --xlabel Set X label of all future plots.\n" " --ylabel Set Y label of all future plots.\n" " --xlabelauto AutoSet X label of all future plots.\n" @@ -100,14 +100,14 @@ namespace Kst { "Data Object Modifiers\n" " -x : Create vector and use as X vector for curves.\n" " -e : Create vector and use as Y-error vector for next -y.\n" -" -r : sample rate (spectra & spectograms).\n" +" -r : sample rate (spectra & spectrograms)\n" "Data Objects:\n" -" -y plot an XY curve of field.\n" -" -p plot the spectrum of field.\n" -" -h plot a histogram of field.\n" -" -z plot an image of matrix field.\n" +" -y Plot an XY curve of field.\n" +" -p Plot the spectrum of field.\n" +" -h Plot a histogram of field.\n" +" -z Plot an image of matrix field.\n" "Misc:\n" -" --serverName= Set the server name for pyKst scrips connecting with this session.\n" +" --serverName= Set the server name for pyKst scripts connecting with this session.\n" "\n" "****************\n" "*** Examples ***\n" From 83dea1ccdf720664f61e8db6fb6fe299ab5841ff Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 17 Jan 2019 22:51:19 +0100 Subject: [PATCH 07/13] Write usage text to stderr on Windows too Signed-off-by: Tormod Volden --- src/libkstapp/commandlineparser.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp index 2b28c5634..945deb77a 100644 --- a/src/libkstapp/commandlineparser.cpp +++ b/src/libkstapp/commandlineparser.cpp @@ -142,18 +142,17 @@ namespace Kst { static void printText(const QString& text, const QString& detailText = QString(), const QString& t = QString()) { #ifdef Q_OS_WIN - // No console on Windows. + // Not always console on Windows. QMessageBox box(QMessageBox::Information, "Kst", text + t); if (!detailText.isEmpty()) { box.setDetailedText(detailText); } box.exec(); -#else +#endif QString displayText = QString(text) + QString(detailText) + t; fprintf(stderr,"%s\n", qPrintable(displayText)); //qWarning("%s", qPrintable(displayText)); -#endif } From 0845e17b5139c8137c492fe141837ceae61b02e0 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 7 Feb 2019 20:57:55 +0100 Subject: [PATCH 08/13] travis.sh: Do not always deploy Signed-off-by: Tormod Volden --- cmake/travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index 3afba1d75..682ba91dc 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -61,7 +61,7 @@ travis=travis echo --------------------------------------------------------- echo -if [ "$iam" = "$travis" ]; then +if [ "$iam" = "$travis" && "$(git rev-parse --abbrev-ref HEAD)" = "master" ]; then deploybinary=1 else deploybinary=0 From 69b495ebbeebf1313ec97604ada405e3c92a7570 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 7 Feb 2019 21:02:50 +0100 Subject: [PATCH 09/13] Use build host stock cmake Signed-off-by: Tormod Volden --- cmake/travis.sh | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index 682ba91dc..ee2ea88b5 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -138,31 +138,7 @@ mkdir $build builddir=$PWD/$build cd $builddir - - -# --------------------------------------------------------- -# -# get actual cmake -# -cmakever=cmake-3.4.1-Linux-x86_64 - -if [ "$iam" = "$travis" ]; then - if [ ! -d $dep/$cmakever ]; then - cmakebin=x - if [ ! -d $dep/$cmakever ]; then - wget --no-check-certificate http://www.cmake.org/files/v3.4/$cmakever.tar.gz - checkExitCode - cd $dep - tar xf $builddir/$cmakever.tar.gz - checkExitCode - cd $builddir - fi - fi - cmakebin=$dep/$cmakever/bin/cmake -else - cmakebin=cmake -fi -$cmakebin --version +cmake --version checkExitCode server=http://sourceforge.net/projects/kst/files/3rdparty @@ -291,14 +267,14 @@ else noinstaller=-Dkst_noinstaller=1 fi -#$cmakebin ../kst \ +#cmake ../kst \ # -Dkst_release=1 \ # -Dkst_version_string=$versionname \ # -Dkst_install_prefix=./$versionname \ # -Dkst_cross=$dep/$mingwdir/bin/$mingw \ # $rev $qtopt $useext $console $noinstaller $generator -$cmakebin ../kst \ +cmake ../kst \ -Dkst_release=1 \ -Dkst_merge_files=1 \ -Dkst_version_string=$versionname \ From 45cb44793ca016370f6404b897f0d5f2e98126d7 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 7 Feb 2019 21:05:34 +0100 Subject: [PATCH 10/13] travis.sh: 3rd party zip file renamed back Signed-off-by: Tormod Volden --- cmake/travis.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index ee2ea88b5..b34754c44 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -158,7 +158,6 @@ else mingwdir=mingw32$exc extlib=kst-3rdparty-win32-gcc$exc-4.7.2 extlib=kst-3rdparty-win32-gcc4.7 - extlib=kst-3rdparty-win32-gcc4.7-tv useext= useext="-Dkst_3rdparty=1 -Dkst_3rdparty_dir=$dep/"$extlib fi From 7db881cbbffb2ea068dcaa1f9fd542297f910838 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 7 Feb 2019 21:13:59 +0100 Subject: [PATCH 11/13] windows: Print usage text to stderr before the pop-up window Signed-off-by: Tormod Volden --- src/libkstapp/commandlineparser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp index 945deb77a..a151ffda5 100644 --- a/src/libkstapp/commandlineparser.cpp +++ b/src/libkstapp/commandlineparser.cpp @@ -141,6 +141,10 @@ namespace Kst { static void printText(const QString& text, const QString& detailText = QString(), const QString& t = QString()) { + QString displayText = QString(text) + QString(detailText) + t; + + fprintf(stderr,"%s\n", qPrintable(displayText)); + //qWarning("%s", qPrintable(displayText)); #ifdef Q_OS_WIN // Not always console on Windows. QMessageBox box(QMessageBox::Information, "Kst", text + t); @@ -149,10 +153,6 @@ static void printText(const QString& text, const QString& detailText = QString() } box.exec(); #endif - QString displayText = QString(text) + QString(detailText) + t; - - fprintf(stderr,"%s\n", qPrintable(displayText)); - //qWarning("%s", qPrintable(displayText)); } From 56dadbeb0d144182354d721abb96eb3f8ea5cbda Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 7 Feb 2019 22:01:38 +0100 Subject: [PATCH 12/13] travis.sh: Fix test syntax --- cmake/travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index b34754c44..c028ab150 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -61,7 +61,7 @@ travis=travis echo --------------------------------------------------------- echo -if [ "$iam" = "$travis" && "$(git rev-parse --abbrev-ref HEAD)" = "master" ]; then +if [ "$iam" = "$travis" -a "$(git rev-parse --abbrev-ref HEAD)" = "master" ]; then deploybinary=1 else deploybinary=0 From 8090f671df4ab0a45eba969e5d5f1a8a59e930c5 Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Thu, 7 Feb 2019 22:55:04 +0100 Subject: [PATCH 13/13] Try cmake 2.8.12 (default in Ubuntu 14.04) The Travis build machine also has cmake 3.9.2 which is used by default. --- cmake/travis.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/travis.sh b/cmake/travis.sh index c028ab150..84d6f42d1 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -138,7 +138,7 @@ mkdir $build builddir=$PWD/$build cd $builddir -cmake --version +/usr/bin/cmake --version checkExitCode server=http://sourceforge.net/projects/kst/files/3rdparty @@ -266,14 +266,14 @@ else noinstaller=-Dkst_noinstaller=1 fi -#cmake ../kst \ +#/usr/bin/cmake ../kst \ # -Dkst_release=1 \ # -Dkst_version_string=$versionname \ # -Dkst_install_prefix=./$versionname \ # -Dkst_cross=$dep/$mingwdir/bin/$mingw \ # $rev $qtopt $useext $console $noinstaller $generator -cmake ../kst \ +/usr/bin/cmake ../kst \ -Dkst_release=1 \ -Dkst_merge_files=1 \ -Dkst_version_string=$versionname \