Skip to content

Usage text and travis build fixes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Usage text and travis build fixes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db5d9e0
travis: Use build host default cmake
tormodvolden Feb 7, 2019
3eb2c4f
Print usage text to stderr before windows pop-up
tormodvolden Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 3 additions & 27 deletions cmake/travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -289,14 +265,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 \
Expand Down
8 changes: 4 additions & 4 deletions src/libkstapp/commandlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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));
}


Expand Down