Skip to content

Circle CI #8

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
davidhesselbom wants to merge 36 commits into
base: develop
Choose a base branch
from
Open

Circle CI #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
24be646
Removed openmp flag, made VC flags specific to win32-msvc*.
davidhesselbom Sep 24, 2015
0884fcc
Update appveyor.yml
davidhesselbom Sep 20, 2015
bf8356d
Update appveyor.yml
davidhesselbom Sep 20, 2015
19a7631
Update appveyor.yml
davidhesselbom Sep 22, 2015
aafd275
Update appveyor.yml
davidhesselbom Sep 22, 2015
7b89444
Update appveyor.yml
davidhesselbom Sep 22, 2015
08c0d52
Update appveyor.yml
davidhesselbom Sep 22, 2015
c5827a1
Update appveyor.yml
davidhesselbom Sep 22, 2015
b2df6d6
Maybe I'll need that submodule now...
davidhesselbom Sep 23, 2015
adcecd2
Attempt to fix build by setting QMAKEFEATURES variable.
davidhesselbom Sep 24, 2015
fbef0fe
What's inside C:\MinGW and what's in %PATH%?
davidhesselbom Sep 24, 2015
fa964a8
Don't add old MinGW to %PATH%. Duh.
davidhesselbom Sep 24, 2015
e103a46
Add old MinGW to ¤PATH% *AFTER* Qt\Tools\MinGW.
davidhesselbom Sep 24, 2015
3723aa4
Fixed tools path and removed old MinGW path... again.
davidhesselbom Sep 24, 2015
1eb39fe
Updated 3rdparty/windows submodule.
davidhesselbom Sep 24, 2015
df6019f
Don't call pthread_setname_np when compiling with MinGW.
davidhesselbom Dec 21, 2015
7ef4f72
Commit for great justice
davidhesselbom Dec 22, 2015
f63bfc2
Update circle.yml
davidhesselbom Sep 19, 2015
fcbaf4b
Update circle.yml
davidhesselbom Sep 19, 2015
b126e07
Update circle.yml
davidhesselbom Sep 19, 2015
2c563f7
Update circle.yml
davidhesselbom Sep 19, 2015
278f3e4
Update circle.yml
davidhesselbom Sep 19, 2015
3af8f0d
Update circle.yml
davidhesselbom Sep 19, 2015
c2c7c54
Update circle.yml
davidhesselbom Sep 19, 2015
d23940c
Update circle.yml
davidhesselbom Sep 19, 2015
e5cf2f0
Update circle.yml
davidhesselbom Sep 19, 2015
9e5e8fe
Update circle.yml
davidhesselbom Sep 19, 2015
588ecda
Update circle.yml
davidhesselbom Sep 19, 2015
c0bcab0
Only install qt5-default.
davidhesselbom Sep 20, 2015
164d50e
apt-get update before installing qt5-default.
davidhesselbom Sep 20, 2015
4e4cb2a
apt-get update, but don't install packages.
davidhesselbom Sep 20, 2015
41506f4
Update circle.yml
davidhesselbom Sep 21, 2015
18454e9
Update circle.yml
davidhesselbom Sep 21, 2015
a8c446d
Update circle.yml
davidhesselbom Sep 21, 2015
763c8dc
Update circle.yml
davidhesselbom Sep 21, 2015
147b116
Trying to install gcc-4.9 instead of g++-4.9...
davidhesselbom Dec 22, 2015
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
2 changes: 1 addition & 1 deletion 3rdparty/windows
Open in desktop
Submodule windows updated 10589 files
2 changes: 1 addition & 1 deletion README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Freq source code
# Freq source code
/===================\
|Scalograms are cool|
\===================/
Expand Down
16 changes: 11 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
install:
- set QTDIR=C:\Qt\5.5\msvc2013_64
# - set QTDIR=C:\Qt\5.5\mingw492_32
# - set QTDIR=C:\Qt\5.5\msvc2013_64
- set QTDIR=C:\Qt\5.5\mingw492_32
- set PATH=%PATH%;%QTDIR%\bin
- set PATH=%PATH%;C:\Qt\Tools\mingw492_32\bin
# - set PATH=%PATH%;C:\MinGW\bin
# - set PATH=%PATH%;C:\Qt\Tools\mingw492_32
- set QMAKEFEATURES=C:\projects\freq\features
- git submodule init
- git submodule update --depth 1 3rdparty\windows
- dir /s /b /a:d C:\Qt\5.5
- dir /s /b /a:d C:\MinGW
- echo %PATH%
build_script:
- cd quick
- qmake -r
# - mingw32-make
- qmake -r -Wall -spec win32-g++
- mingw32-make
12 changes: 11 additions & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
machine:
environment:
CXX: g++-4.9
dependencies:
pre:
- sudo apt-get -y -qq install libgles2-mesa-dev libegl1-mesa-drivers libgl1-mesa-dri mesa-common-dev libglu1-mesa-dev build-essential
- yes y | sudo add-apt-repository ppa:ubuntu-toolchain-r/test
- sudo apt-get purge $(dpkg -l | grep libqt | awk '{print $2}')
- sudo apt-get install netbase
- sudo apt-get install libqt5webkit5-dev qt5-default; true
- sudo apt-get install gcc-4.9
checkout:
post:
- git submodule init
- git submodule update --depth 1 3rdparty/ubuntu
test:
override:
- echo "Hello Circle!"
- cd quick
- qmake -r
- make
3 changes: 1 addition & 2 deletions features/buildflags.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ message("buildflags for $$_PRO_FILE_PWD_ with $$QMAKESPEC")
CONFIG += legacy-opengl
win32-msvc*:CONFIG += debug_and_release
CONFIG += warn_on
!macx-ios*:CONFIG += openmp
CONFIG(debug, debug|release): DEFINES += _DEBUG
CONFIG(debug, debug|release): DEFINES += SHARED_STATE_NO_TIMEOUT # don't timeout locks when stepping in a debugger
CONFIG(release, debug|release): DEFINES += SHARED_STATE_NO_TIMEOUT # use simple locks in release
Expand Down Expand Up @@ -87,7 +86,7 @@ macx {
}
}

win32 {
win32-msvc* {
DEFINES += _SCL_SECURE_NO_WARNINGS _CRT_SECURE_NO_WARNINGS

CONFIG(debug, debug|release) {
Expand Down
2 changes: 2 additions & 0 deletions lib/justmisc/thread_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ thread_pool::
#ifdef __clang__
pthread_setname_np(ss.str ().c_str ());
#else
#ifndef __MINGW32__
pthread_setname_np(pthread_self(), ss.str ().c_str ());
#endif
#endif
}
#endif
Expand Down