nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup non-optional Defines from CI config

Browse Source 
Removed redundant config and fixed GSL for windows instructions
Remove some compiler warnings to reduce log size
This commit is contained in:
Ale Martinez
2020-05-30 17:23:00 -03:00
parent df160a10a1
commit 2d3eed0a98
7 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@@ -109,7 +109,6 @@ install:
- echo PYTHONLIBS=-L\"c:\python37-x64\libs\" -lpython37 >> src\gcconfig.pri
# GSL
- echo DEFINES+=GC_WANT_GSL >> src\gcconfig.pri
- echo GSL_INCLUDES=c:\tools\vcpkg\installed\x64-windows\include >> src\gcconfig.pri
- echo GSL_LIBS=-Lc:\tools\vcpkg\installed\x64-windows\lib -lgsl -lgslcblas >> src\gcconfig.pri

8
src/gcconfig.pri.in
View File

@@ -40,11 +40,9 @@
#GSL_INCLUDES = /usr/include
#GSL_LIBS = -lgsl -lgslcblas -lm
#
# Windows - edit to your install location
# us vcpkg install gsl
#DEFINES += GC_WANT_GSL
#GSL_INCLUDES = C:/gsl-1.11/include/
#GSL_LIBS = -LC:/gsl-1.11/bin -llibgsl-0 -llibgslcblas-0
# Windows - use vcpkg to install gsl and edit to your install location
#GSL_INCLUDES = c:\vcpkg\installed\x64-windows\include
#GSL_LIBS = -LC:\vcpkg\installed\x64-windows\lib -lgsl -lgslcblas
# put output into a separate dir
# to keep main directory clear

1
src/src.pro
View File

@@ -199,7 +199,6 @@ TRANSLATIONS = Resources/translations/gc_fr.ts \
# need lrelease to generate qm files
isEmpty(QMAKE_LRELEASE) {
win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
unix:!macx {QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease }
else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
}

8
travis/linux/before_script.sh
View File

@@ -6,14 +6,9 @@ cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
cp src/gcconfig.pri.in src/gcconfig.pri
# Define GC version string, only for tagged builds
if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi
# user WEBENGINE
echo DEFINES += NOWEBKIT >> src/gcconfig.pri
# Trusty needs C99 mode to enable declarations in for loops
echo QMAKE_CFLAGS += -std=gnu99 >> src/gcconfig.pri
# make a relese build
# make a release build
sed -i "s|#\(CONFIG += release.*\)|\1 static|" src/gcconfig.pri
# lrelease command
sed -i "s|#\(QMAKE_LRELEASE = \).*|\1 lrelease|" src/gcconfig.pri
sed -i "s|^#QMAKE_CXXFLAGS|QMAKE_CXXFLAGS|" src/gcconfig.pri
# Enable -lz
sed -i "s|^#LIBZ_LIBS|LIBZ_LIBS|" src/gcconfig.pri
@@ -47,7 +42,6 @@ echo DEFINES += GC_WANT_PYTHON >> src/gcconfig.pri
echo PYTHONINCLUDES = -I/usr/include/python3.7 >> src/gcconfig.pri
echo PYTHONLIBS = -L/usr/lib/python3.7/config-3.7m-x86_64-linux-gnu -lpython3.7m >> src/gcconfig.pri
# GSL
echo DEFINES += GC_WANT_GSL >> src/gcconfig.pri
echo GSL_LIBS = -lgsl -lgslcblas -lm >> src/gcconfig.pri
# Patch Secrets.h

4
travis/linux/script.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
export PATH=/opt/qt514/bin:$PATH
qmake -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-deprecated-declarations"
make --silent -j3 || make
qmake -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-unused-value" QMAKE_CFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-unused-value"
make --silent -j4 || make
exit

3
travis/osx/before_script.sh
View File

@@ -16,9 +16,7 @@ cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
cp src/gcconfig.pri.in src/gcconfig.pri
# Define GC version string, only for tagged builds
if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi
echo DEFINES += NOWEBKIT >> src/gcconfig.pri
sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri
sed -i "" "s|#\(QMAKE_LRELEASE\).*|\1 += /usr/local/opt/qt5/bin/lrelease|" src/gcconfig.pri
sed -i "" "s|#\(QMAKE_CXXFLAGS\).*|\1_RELEASE += -mmacosx-version-min=10.7 -arch x86_64|" src/gcconfig.pri
sed -i "" "s|^#CloudDB|CloudDB|" src/gcconfig.pri
sed -i "" "s|^#LIBZ|LIBZ|" src/gcconfig.pri
@@ -51,7 +49,6 @@ echo DEFINES += GC_WANT_PYTHON >> src/gcconfig.pri
echo PYTHONINCLUDES = -ICore `python3-config --includes` >> src/gcconfig.pri
echo PYTHONLIBS = `python3-config --ldflags` >> src/gcconfig.pri
# GSL
echo DEFINES += GC_WANT_GSL >> src/gcconfig.pri
echo GSL_LIBS = -lgsl -lgslcblas -lm >> src/gcconfig.pri
# Patch Secrets.h

2
travis/osx/script.sh
View File

@@ -1,6 +1,6 @@
#!/bin/bash
set -ev
CC=clang CXX=clang++ /usr/local/opt/qt5/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-deprecated-register -Wno-nullability-completeness"
CC=clang CXX=clang++ /usr/local/opt/qt5/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-deprecated-register -Wno-nullability-completeness -Wno-sign-compare" QMAKE_CFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-sign-compare"
CC=clang CXX=clang++ make qmake_all
CC=clang CXX=clang++ make -j4 sub-qwt --silent
CC=clang CXX=clang++ make -j4 sub-src --silent || CC=clang CXX=clang++ make sub-src