Skip to content

Commit a3b8ac7

Browse files
mossheimmossheim
authored
Merge pull request supercollider#4169 from supercollider/3.10
3.10 -> master
2 parents 1c1a180 + 8242701 commit a3b8ac7

File tree

2,037 files changed

+88058
-65794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,037 files changed

+88058
-65794
lines changed

‎.appveyor.yml

+15-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version: '{build}' # incremented with each build
99
clone_depth: 10
1010

1111
# https://www.appveyor.com/docs/build-environment/#build-worker-images
12-
image: Visual Studio 2013
12+
image: Visual Studio 2017
1313

1414
# disable automatic tests
1515
test: off
@@ -20,23 +20,29 @@ environment:
2020
ASIO_ZIP: asiosdk2.3.zip
2121

2222
matrix:
23-
- QT_DIR: "C:/Qt/5.5/msvc2013"
24-
CMAKE_GENERATOR: "Visual Studio 12 2013"
23+
- QT_DIR: "C:/Qt/5.9/msvc2015"
24+
CMAKE_GENERATOR: "Visual Studio 15 2017"
2525
FFTW_URL: ftp://ftp.fftw.org/pub/fftw/fftw-3.3.5-dll32.zip
2626
ARCH: "x86"
2727
S3_BUILDS_LOCATION: "builds/supercollider/supercollider/win32"
28+
# https://www.appveyor.com/docs/lang/cpp/
29+
VCVARS_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars32.bat"
2830

29-
- QT_DIR: "C:/Qt/5.5/msvc2013_64"
30-
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
31+
- QT_DIR: "C:/Qt/5.11/msvc2017_64"
32+
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
3133
FFTW_URL: ftp://ftp.fftw.org/pub/fftw/fftw-3.3.5-dll64.zip
3234
ARCH: "x64"
3335
S3_BUILDS_LOCATION: "builds/supercollider/supercollider/win64"
36+
VCVARS_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat"
3437

3538
install:
3639
- ps: echo "Install phase start"
3740

3841
- ps: $env:PROGFILES = if ($env:ARCH -eq "x64") { 'Program Files' } else { 'Program Files (x86)' }
3942

43+
# Load command-line tools (lib.exe)
44+
- cmd: call "%VCVARS_SCRIPT%"
45+
4046
- cmd: echo "Get submodules"
4147
- cmd: git submodule update --init --recursive
4248

@@ -59,7 +65,7 @@ install:
5965
# can't use appveyor DownloadFile because it's FTP
6066
- ps: Invoke-WebRequest $env:FFTW_URL -OutFile fftw.zip
6167
- ps: 7z x fftw.zip -y
62-
- cmd: "\"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/lib\" /machine:%ARCH% /def:libfftw3f-3.def"
68+
- cmd: lib.exe /machine:%ARCH% /def:libfftw3f-3.def
6369
- cmd: cd ..
6470
- cmd: move fftw "C:/%PROGFILES%/fftw"
6571
- cmd: echo "Done installing fftw"
@@ -128,9 +134,9 @@ deploy:
128134
# s3 upload - every commit
129135
- provider: S3
130136
access_key_id:
131-
secure: Imi70fjxyMWt9kwV9RfVT7qV8OaxA40iGlR1hO12SK4=
137+
secure: cUwCIb/EtpG3uAP48WylcMNxAh3yEbPNcQGPZDnh6go=
132138
secret_access_key:
133-
secure: 3K2MRfkIb7BJk4kCCakxcGAjkc1LCYZHpD32I52mYd//2WHE63xVJl/qd3Q1IBhI
139+
secure: 9n0lOPh/3hpwSEf1l0QySYngrgWYqplZozQ9ZJMxtDARIV5DIBn/NXttTfkh1Z3k
134140
bucket: supercollider
135141
region: us-west-2
136142
folder: $(S3_BUILDS_LOCATION)
@@ -143,7 +149,7 @@ deploy:
143149
description: appveyor_$(APPVEYOR_REPO_TAG_NAME)
144150
artifact: installer
145151
auth_token:
146-
secure: rxXJNY+6n25Th9R4+7qI+AcnTj0wCAMSnBGH2+5s7DlVLrAGsSY6+EEDbeHWGGeI
152+
secure: 6m5+IiGj/pLhiUJvZPqs7yOlSe0ttH3pklaM7w1i8ca4YRUrIKddsGTZAZo86qLx
147153
prerelease: true
148154
on:
149155
appveyor_repo_tag: true

‎.github/ISSUE_TEMPLATE.md

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<!--- Hi, and thanks for contributing! -->
2+
3+
<!--- Before opening a new issue, please search our existing issues to see if anyone else has had the-->
4+
<!--- same issue as you. Make sure to provide a general summary of the issue in the Title above! -->
5+
6+
Environment
7+
-----------
8+
9+
* Your SuperCollider version:
10+
* Your operating system and version:
11+
12+
<!--- If you are compiling from a branch other than master, please provide the SHA1 hash of the commit -->
13+
<!--- Include any other relevant details about your environment (Qt version, audio driver, etc.) -->
14+
15+
Steps to reproduce (for bugs)
16+
-----------------------------
17+
18+
```supercollider
19+
// Please paste SuperCollider code here.
20+
// It really helps if you try to simplify your example as much as possible.
21+
```
22+
23+
Error message (for bugs)
24+
------------------------
25+
26+
```
27+
// Please paste any error messages here **in their entirety**.
28+
// If this is a SuperCollider error message, include the full stack trace.
29+
// Link to a Gist (https://gist.github.com) if the message is long.
30+
```
31+
32+
Expected Behavior
33+
-----------------
34+
35+
<!--- If you're describing a bug, tell us what should happen -->
36+
<!--- If you're suggesting a change/improvement, tell us how it should work -->
37+
38+
Current Behavior
39+
----------------
40+
41+
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
42+
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
43+
44+
<!--- Thanks again for contributing! -->

‎.github/PULL_REQUEST_TEMPLATE.md

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<!--- Hi, and thanks for contributing! -->
2+
<!--- Make sure to provide a general summary of your changes in the title above. -->
3+
<!--- For example: "[scsynth] Fix crash when encountering cute kittens" -->
4+
5+
Purpose and Motivation
6+
----------------------
7+
8+
<!--- Why is this change required? What problem does it solve? -->
9+
<!--- If it fixes an open issue, please link to it here by writing "Fixes #555". -->
10+
11+
Types of changes
12+
----------------
13+
14+
<!--- What types of changes does your pull request introduce? -->
15+
<!--- Some examples are below (you can delete the lines that don't apply): -->
16+
17+
- Documentation (non-code change which corrects or adds documentation for existing features)
18+
- Bug fix (non-breaking change which fixes an issue)
19+
- New feature (non-breaking change which adds functionality)
20+
- Breaking change (fix or feature that would cause existing functionality to change)
21+
22+
Checklist
23+
---------
24+
25+
<!--- Complete an item by checking it: [x] -->
26+
27+
- [ ] All tests are passing
28+
- [ ] If necessary, new tests were created to address changes in PR, and tests are passing
29+
- [ ] Updated documentation, if necessary
30+
- [ ] This PR is ready for review
31+
32+
<!--- See DEVELOPING.md for instructions on running and writing tests. -->
33+
34+
Remaining Work
35+
--------------
36+
37+
<!--- If any work remains to be done, please give a brief description here. -->
38+
<!--- Consider providing a todo-list so we can easily track completion progress. -->
39+
40+
<!--- Thanks for contributing! -->

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,6 @@
1717
[submodule "external_libraries/yaml-cpp"]
1818
path = external_libraries/yaml-cpp
1919
url = https://github.com/supercollider/yaml-cpp.git
20+
[submodule "editors/sc-el"]
21+
path = editors/sc-el
22+
url = https://github.com/supercollider/scel/

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ matrix:
1414
env: QT=false
1515
group: edge
1616
- os: osx
17-
osx_image: xcode7.3
17+
osx_image: xcode8.3
1818
env: QT=true
1919

2020
# use ccache to speed up build times. on osx,

‎.travis/before-install-linux.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
npm install -g lintspaces-cli
44
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
5-
sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty
5+
sudo add-apt-repository --yes ppa:beineri/opt-qt591-trusty
66
sudo apt-get update
77
sudo apt-get install --yes build-essential gcc-4.9 g++-4.9 cmake pkg-config libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev libreadline6-dev libfftw3-dev libicu-dev libxt-dev libudev-dev
88
if [[ -n "$1" && "$1" == "--qt=true" ]]; then
9-
sudo apt-get install --yes libgl1-mesa-dev qt55base qt55location qt55declarative qt55sensors qt55tools qt55webengine qt55webchannel qt55webkit qt55xmlpatterns
9+
sudo apt-get install --yes libgl1-mesa-dev qt59base qt59location qt59declarative qt59tools qt59webengine qt59webchannel qt59xmlpatterns qt59svg qt59websockets
1010
fi
1111
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
1212
sudo update-alternatives --auto gcc

‎.travis/before-install-osx.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/bin/sh
22

3-
brew update
4-
brew tap homebrew/versions
5-
brew outdated cmake || brew upgrade cmake
3+
export BREW_NO_AUTO_UPDATE=1
4+
export BREW_NO_ANALYTICS=1
65

76
# according to https://docs.travis-ci.com/user/caching#ccache-cache
87
brew install ccache
98
export PATH="/usr/local/opt/ccache/libexec:$PATH"
109

1110
brew install libsndfile || true
12-
brew install qt55 || true
13-
brew link qt55 --force
11+
brew install portaudio || true
12+
brew install qt5 || true
13+
brew link qt5 --force
1414

1515
# To get less noise in xcode output
1616
gem install xcpretty

‎.travis/before-script-linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
$TRAVIS_BUILD_DIR/.travis/lint.sh $TRAVIS_BUILD_DIR
44
if [[ -n "$1" && "$1" == "--qt=true" ]]; then
5-
source /opt/qt55/bin/qt55-env.sh
5+
source /opt/qt59/bin/qt59-env.sh
66
cmake -DSC_EL=OFF -DCMAKE_INSTALL_PREFIX:PATH=$TRAVIS_BUILD_DIR/BUILD/Install -DCMAKE_BUILD_TYPE=Release $TRAVIS_BUILD_DIR --debug-output
77
else
88
cmake -DSC_EL=OFF -DSC_QT=OFF -DSC_IDE=OFF -DCMAKE_INSTALL_PREFIX:PATH=$TRAVIS_BUILD_DIR/BUILD/Install -DCMAKE_BUILD_TYPE=Release $TRAVIS_BUILD_DIR --debug-output

‎.travis/before-script-osx.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
#!/bin/sh
22

3-
cmake -G"Xcode" -DRULE_LAUNCH_COMPILE=ccache -DCMAKE_PREFIX_PATH=`brew --prefix qt55` -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 $TRAVIS_BUILD_DIR --debug-output
3+
cmake -G"Xcode" \
4+
-DRULE_LAUNCH_COMPILE=ccache \
5+
-DCMAKE_PREFIX_PATH=`brew --prefix qt5` \
6+
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 \
7+
-DSUPERNOVA=ON \
8+
$TRAVIS_BUILD_DIR --debug-output

‎.travis/package-osx.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
mkdir -p $HOME/artifacts
44

55
cd $TRAVIS_BUILD_DIR/BUILD/Install
6-
zip -q -r $HOME/artifacts/SC-$TRAVIS_COMMIT.zip SuperCollider
6+
zip -q -r --symlinks $HOME/artifacts/SC-$TRAVIS_COMMIT.zip SuperCollider

‎.travis/qpm-prep.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
cd $TRAVIS_BUILD_DIR/BUILD
4-
sudo pip install git+https://github.com/scztt/qpm.git@qpm-unit
4+
sudo pip2 install git+https://github.com/scztt/qpm.git@qpm-unit
55

66
mkdir $HOME/Quarks && cd $HOME/Quarks
77
git clone --depth=1 https://github.com/supercollider-quarks/API

‎.travis/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ else
66
export SCLANG=$TRAVIS_BUILD_DIR/BUILD/Install/SuperCollider/SuperCollider.app/Contents/MacOS/sclang
77
fi
88

9-
$TRAVIS_BUILD_DIR/testsuite/sclang/launch_test.py $SCLANG
9+
# $TRAVIS_BUILD_DIR/testsuite/sclang/launch_test.py $SCLANG
1010

1111
if [[ $QT == true ]]; then $TRAVIS_BUILD_DIR/.travis/qpm-test.sh; fi

0 commit comments

Comments
 (0)