Commit 381ba792 authored by Georges Khaznadar's avatar Georges Khaznadar

Merge branch 'upstream' into 'upstream'

Upgrade to version 3.10

See merge request !3
parents 4a3a7b11 d019b1d8

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

# Appveyor config file for SuperCollider
# Author: Brian Heim
# Created on 2017-12-31
# See http://www.appveyor.com/docs/appveyor-yml
version: '{build}' # incremented with each build
# shallow_clone doesn't clone, repository is not git so can't get submodules
clone_depth: 10
# https://www.appveyor.com/docs/build-environment/#build-worker-images
image: Visual Studio 2017
# disable automatic tests
test: off
environment:
CMAKE_CONFIGURATION: Release
ASIO_URL: "http://www.steinberg.net/sdk_downloads/asiosdk2.3.zip"
ASIO_ZIP: asiosdk2.3.zip
matrix:
- QT_DIR: "C:/Qt/5.9/msvc2015"
CMAKE_GENERATOR: "Visual Studio 15 2017"
FFTW_URL: ftp://ftp.fftw.org/pub/fftw/fftw-3.3.5-dll32.zip
ARCH: "x86"
S3_BUILDS_LOCATION: "builds/supercollider/supercollider/win32"
# https://www.appveyor.com/docs/lang/cpp/
VCVARS_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars32.bat"
- QT_DIR: "C:/Qt/5.11/msvc2017_64"
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
FFTW_URL: ftp://ftp.fftw.org/pub/fftw/fftw-3.3.5-dll64.zip
ARCH: "x64"
S3_BUILDS_LOCATION: "builds/supercollider/supercollider/win64"
VCVARS_SCRIPT: "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvars64.bat"
install:
- ps: echo "Install phase start"
- ps: $env:PROGFILES = if ($env:ARCH -eq "x64") { 'Program Files' } else { 'Program Files (x86)' }
# Load command-line tools (lib.exe)
- cmd: call "%VCVARS_SCRIPT%"
- cmd: echo "Get submodules"
- cmd: git submodule update --init --recursive
# Install libsndfile, FFTW, and ASIO SDK. Note that DirectX SDK, Windows SDK are already installed.
- cmd: echo "Install 3rd-party tools"
- cmd: mkdir 3rdparty && cd 3rdparty
# libsndfile using hosted repository. Couldn't find a way to get the installer to work silently.
- cmd: echo "Install libsndfile"
- cmd: mkdir libsndfile && cd libsndfile
- cmd: git clone https://github.com/brianlheim/libsndfile-windows-%ARCH% libsndfile
- cmd: set MEGANERD_DIR=C:/%PROGFILES%/Mega-Nerd
- cmd: mkdir "%MEGANERD_DIR%"
- cmd: move libsndfile "%MEGANERD_DIR%/libsndfile"
- cmd: cd .. && echo "Done installing libsndfile"
# FFTW3, including lib prep
- cmd: echo "Install fftw"
- cmd: mkdir fftw && cd fftw
# can't use appveyor DownloadFile because it's FTP
- ps: Invoke-WebRequest $env:FFTW_URL -OutFile fftw.zip
- ps: 7z x fftw.zip -y
- cmd: lib.exe /machine:%ARCH% /def:libfftw3f-3.def
- cmd: cd ..
- cmd: move fftw "C:/%PROGFILES%/fftw"
- cmd: echo "Done installing fftw"
# ASIO SDK
- cmd: echo "Install asio_sdk"
- cmd: mkdir asio_sdk && cd asio_sdk
- appveyor DownloadFile %ASIO_URL%
- ps: 7z x $env:ASIO_ZIP -y
- cmd: move ASIOSDK2.3 "%APPVEYOR_BUILD_FOLDER%\external_libraries\asiosdk"
- cmd: cd .. && echo "Done installing asio_sdk"
- cmd: cd .. && echo "Done installing 3rd-party tools"
- cmd: echo "Install phase end"
before_build:
- set PATH=%QT_DIR%\bin;%PATH%
- mkdir build
- cd build
build_script:
- cmake -G "%CMAKE_GENERATOR%" -D CMAKE_PREFIX_PATH=%QT_DIR% ..
- cmake --build . --target install --config %CMAKE_CONFIGURATION%
# after_build instead of before_deploy so artifacts are collected at the right time
after_build:
- ps: $env:ARCHIVE_NAME="SC-Windows-$env:ARCH-$env:APPVEYOR_REPO_COMMIT.zip"
- ps: $env:S3_URL="https://supercollider.s3.amazonaws.com/$env:S3_BUILDS_LOCATION/$env:ARCHIVE_NAME"
- ps: $env:FWD_HTML="<html><head><meta http-equiv=""refresh"" content=""0; url='$env:S3_URL'"" /></head></html>"
- ps: $env:BRANCH_ESC=$env:APPVEYOR_REPO_BRANCH -replace '/', ''
- ps: cd $env:APPVEYOR_BUILD_FOLDER
- echo "Making artifacts"
- ps: mkdir artifacts
- ps: cd artifacts
- ps: echo $env:FWD_HTML > $env:BRANCH_ESC-latest.html
- ps: Copy-Item -Path $env:APPVEYOR_BUILD_FOLDER/build/Install/SuperCollider . -Recurse
- ps: 7z a $env:ARCHIVE_NAME -tzip SuperCollider
- ps: rmdir -Recurse -Force SuperCollider
- ps: >-
If (Test-Path env:APPVEYOR_REPO_TAG_NAME) {
# required for github releases
# -q because otherwise PS reads output from stderr and thinks there's a problem
git fetch --tags -q
$env:TAG_ESC=$env:APPVEYOR_REPO_TAG_NAME -replace '/', ''
echo $env:FWD_HTML > $env:TAG_ESC.html
cd ../build
# to get NSIS in path for installer generation
$env:PATH="C:\Program Files (x86)\NSIS;$env:PATH"
cmake --build . --target installer --config Release
}
- ps: cd ..
after_deploy:
- ps: echo "S3 Build Location = $env:S3_URL"
artifacts:
- path: artifacts
name: art_folder
- path: build\Install\*.exe
name: installer
type: File
deploy:
# s3 upload - every commit
- provider: S3
access_key_id:
secure: cUwCIb/EtpG3uAP48WylcMNxAh3yEbPNcQGPZDnh6go=
secret_access_key:
secure: 9n0lOPh/3hpwSEf1l0QySYngrgWYqplZozQ9ZJMxtDARIV5DIBn/NXttTfkh1Z3k
bucket: supercollider
region: us-west-2
folder: $(S3_BUILDS_LOCATION)
artifact: art_folder
unzip: true
set_public: true
# github releases - only tags
- provider: GitHub
description: appveyor_$(APPVEYOR_REPO_TAG_NAME)
artifact: installer
auth_token:
secure: 6m5+IiGj/pLhiUJvZPqs7yOlSe0ttH3pklaM7w1i8ca4YRUrIKddsGTZAZo86qLx
prerelease: true
on:
appveyor_repo_tag: true
<!--- Hi, and thanks for contributing! -->
<!--- Before opening a new issue, please search our existing issues to see if anyone else has had the-->
<!--- same issue as you. Make sure to provide a general summary of the issue in the Title above! -->
Environment
-----------
* Your SuperCollider version:
* Your operating system and version:
<!--- If you are compiling from a branch other than master, please provide the SHA1 hash of the commit -->
<!--- Include any other relevant details about your environment (Qt version, audio driver, etc.) -->
Steps to reproduce (for bugs)
-----------------------------
```supercollider
// Please paste SuperCollider code here.
// It really helps if you try to simplify your example as much as possible.
```
Error message (for bugs)
------------------------
```
// Please paste any error messages here **in their entirety**.
// If this is a SuperCollider error message, include the full stack trace.
// Link to a Gist (https://gist.github.com) if the message is long.
```
Expected Behavior
-----------------
<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->
Current Behavior
----------------
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
<!--- Thanks again for contributing! -->
<!--- Hi, and thanks for contributing! -->
<!--- Make sure to provide a general summary of your changes in the title above. -->
<!--- For example: "[scsynth] Fix crash when encountering cute kittens" -->
Purpose and Motivation
----------------------
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to it here by writing "Fixes #555". -->
Types of changes
----------------
<!--- What types of changes does your pull request introduce? -->
<!--- Some examples are below (you can delete the lines that don't apply): -->
- Documentation (non-code change which corrects or adds documentation for existing features)
- Bug fix (non-breaking change which fixes an issue)
- New feature (non-breaking change which adds functionality)
- Breaking change (fix or feature that would cause existing functionality to change)
Checklist
---------
<!--- Complete an item by checking it: [x] -->
- [ ] All tests are passing
- [ ] If necessary, new tests were created to address changes in PR, and tests are passing
- [ ] Updated documentation, if necessary
- [ ] This PR is ready for review
<!--- See DEVELOPING.md for instructions on running and writing tests. -->
Remaining Work
--------------
<!--- If any work remains to be done, please give a brief description here. -->
<!--- Consider providing a todo-list so we can easily track completion progress. -->
<!--- Thanks for contributing! -->
compiler:
- gcc
language: cpp
os:
- linux
- osx
sudo: required
dist: trusty
osx_image: xcode7.3
matrix:
fast_finish: true
include:
- os: linux
sudo: required
dist: trusty
env: QT=true
group: edge
- os: linux
sudo: required
dist: trusty
env: QT=false
group: edge
- os: osx
osx_image: xcode8.3
env: QT=true
# use ccache to speed up build times. on osx,
# we install it during the the before_install step
# with xcode, this requires an additional flag passed during the configuration phase.
# see README_MACOS.md for details.
cache: