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 diff --git a/cmake/travis.sh b/cmake/travis.sh index 7cffe75fe..84d6f42d1 100755 --- a/cmake/travis.sh +++ b/cmake/travis.sh @@ -61,7 +61,7 @@ travis=travis echo --------------------------------------------------------- echo -if [ "$iam" = "$travis" ]; then +if [ "$iam" = "$travis" -a "$(git rev-parse --abbrev-ref HEAD)" = "master" ]; then deploybinary=1 else deploybinary=0 @@ -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 +/usr/bin/cmake --version checkExitCode server=http://sourceforge.net/projects/kst/files/3rdparty @@ -255,8 +231,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 @@ -289,14 +266,14 @@ else noinstaller=-Dkst_noinstaller=1 fi -#$cmakebin ../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 -$cmakebin ../kst \ +/usr/bin/cmake ../kst \ -Dkst_release=1 \ -Dkst_merge_files=1 \ -Dkst_version_string=$versionname \ diff --git a/src/libkstapp/commandlineparser.cpp b/src/libkstapp/commandlineparser.cpp index f9bbf7ce3..a151ffda5 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" @@ -141,18 +141,17 @@ 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 - // 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 - QString displayText = QString(text) + QString(detailText) + t; - - fprintf(stderr,"%s\n", qPrintable(displayText)); - //qWarning("%s", qPrintable(displayText)); #endif }