Commit 717b4b47 authored by Dan Stowell's avatar Dan Stowell Committed by Felipe Sateler

Merge tag 'upstream/3.8.0'

Upstream version 3.8.0
parents 8438806a dca91ca4

Too many changes to show.

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

# EditorConfig is awesome: http://EditorConfig.org
# top-most EditorConfig file
root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
[*.{h,hpp,cpp}]
indent_style = space
indent_size = 4
[lang/**.cpp]
indent_style = tab
indent_size = 4
# Tab indentation
[*.{sc,schelp}]
indent_style = tab
indent_size = 4
[CMakeLists.txt]
indent_style = tab
indent_size = 4
# Matches the exact files either .travis.yml
[*.{yml,yaml,json,js}}]
indent_style = space
indent_size = 2
......@@ -5,7 +5,11 @@ os:
- linux
- osx
cache:
sudo: required
dist: trusty
osx_image: xcode7.3
cache:
- apt
- bundler
......@@ -13,41 +17,55 @@ before_install:
- ifmac () { if [[ $TRAVIS_OS_NAME == osx ]]; then eval $@; fi; }
- iflin () { if [[ $TRAVIS_OS_NAME == linux ]]; then eval $@; fi; }
- ifmac brew update
- ifmac brew install cmake qt5 || true
#- iflin sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
- iflin "curl https://s3-us-west-2.amazonaws.com/supercollider/build-tools/linux/qt-5.3.2.zip -o qt.zip; unzip qt.zip -d $HOME/qt"
- iflin sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- iflin sudo add-apt-repository -y ppa:andykimpe/cmake # backport of cmake 2.8.12
- iflin sudo add-apt-repository -y ppa:ondrej/php5 # libicu-dev 52
- ifmac brew tap homebrew/versions
- ifmac brew outdated cmake || brew upgrade cmake
- ifmac brew install qt55 libsndfile python || true
- ifmac brew link qt55 --force
- iflin npm install -g lintspaces-cli
- iflin sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- iflin sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty
- iflin sudo apt-get update
- iflin sudo apt-get install libicu-dev=52.1-1+debphp.org~precise+1 gcc-4.8 g++-4.8 aptitude build-essential libjack-dev libsndfile1-dev libasound2-dev libavahi-client-dev libreadline6-dev libfftw3-dev libxt-dev libudev-dev pkg-config cmake=2.8.12.2-3 subversion libstdc++5
- iflin sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
- iflin sudo apt-get install --yes build-essential gcc-4.9 g++-4.9 cmake pkg-config qt55base qt55location qt55declarative qt55sensors qt55tools qt55webengine qt55webchannel qt55webkit qt55xmlpatterns libjack-jackd2-dev libsndfile1-dev libasound2-dev libavahi-client-dev libreadline6-dev libfftw3-dev libicu-dev libxt-dev libudev-dev
- iflin sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
- iflin sudo update-alternatives --auto gcc
before_script:
- iflin $TRAVIS_BUILD_DIR/.travis/lint.sh $TRAVIS_BUILD_DIR
- iflin source /opt/qt55/bin/qt55-env.sh
- mkdir BUILD
- cd BUILD
- export QT_PREFIX=$HOME/qt/gcc_64
- export QT_PLUGIN_PATH=$QT_PREFIX/plugins
- ifmac cmake -DCMAKE_PREFIX_PATH=`brew --prefix qt5` -DSC_QT=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 .. --debug-output
- iflin cmake -DSC_EL=no -DCMAKE_PREFIX_PATH=$QT_PREFIX -DCMAKE_INSTALL_PREFIX:PATH=$PWD/Install -DCMAKE_BUILD_TYPE=Release -DSC_QT=1 .. --debug-output
- export COMMIT_NAME=$TRAVIS_COMMIT
- ifmac cmake -G"Xcode" -DCMAKE_PREFIX_PATH=`brew --prefix qt55` -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 .. --debug-output
- iflin cmake -DSC_EL=no -DCMAKE_INSTALL_PREFIX:PATH=$PWD/Install -DCMAKE_BUILD_TYPE=Release .. --debug-output
# some paths
- ifmac export SCLANG=$TRAVIS_BUILD_DIR/BUILD/Install/SuperCollider/SuperCollider.app/Contents/MacOS/sclang
- iflin export SCLANG=$TRAVIS_BUILD_DIR/BUILD/Install/bin/sclang
# prep for testing
- sudo pip install git+https://github.com/scztt/qpm.git@qpm-unit
- qpm quark checkout CommonTests CommonTestsGUI --location $HOME/Quarks
- cp ../travis_test_run_proto.json ./travis_test_run.json
script:
- make install
# build
- iflin sudo make install
- ifmac cmake --build . --config Release --target install
# test
- $TRAVIS_BUILD_DIR/testsuite/sclang/launch_test.py $SCLANG
- export COMMIT_NAME=$TRAVIS_COMMIT
- qpm test.run -l ./travis_test_run.json --path $SCLANG --include $HOME/Quarks
# package
- ifmac mkdir -p $HOME/artifacts
- (ifmac cd Install; ifmac zip -r $HOME/artifacts/SC-$COMMIT_NAME.zip SuperCollider)
- (ifmac cd Install; ifmac zip -q -r $HOME/artifacts/SC-$COMMIT_NAME.zip SuperCollider)
before_deploy:
# required for github releases
- git fetch --tags
- export BUILD_PREFIX=$TRAVIS_REPO_SLUG/$TRAVIS_OS_NAME
- export FWD_HTML='<html><head><meta http-equiv="refresh" content="0; url=SC-'$COMMIT_NAME'.zip" /></head></html>'
- export S3_BUILDS_LOCATION=builds/$BUILD_PREFIX
- export S3_URL=https://supercollider.s3.amazonaws.com/$S3_BUILDS_LOCATION/SC-$COMMIT_NAME.zip
- export FWD_HTML='<html><head><meta http-equiv="refresh" content="0; url='$S3_URL'" /></head></html>'
# put everything to be archived in artifacts/
- mkdir -p "$HOME/artifacts/${TRAVIS_BRANCH%/*}"
- mkdir -p "$HOME/artifacts/${TRAVIS_TAG%/*}"
......@@ -61,25 +79,27 @@ deploy:
secret_access_key: $AWS_SECRET
bucket: supercollider
local-dir: $HOME/artifacts
upload-dir: builds/$BUILD_PREFIX
upload-dir: $S3_BUILDS_LOCATION
region: us-west-2
skip_cleanup: true
endpoint: s3-us-west-2.amazonaws.com
acl: public_read
on:
condition: $TRAVIS_OS_NAME = osx
condition: $TRAVIS_OS_NAME = osx && ! -z $AWS_KEY && ! -z $AWS_SECRET
all_branches: true
# github releases - only tags
- provider: releases
api_key:
secure: YN33x5V66b6xepehiEoIm2+UNdbjAPvgrg713F5FdTmWfmuPbLYX6a9zYQYYQ0ZO6w5kofBuWZKL1arw0ABYgUE9kmnNFgx8nR//wsfOnCcgvhGHMXpImzhWX3tPelCW4gyEBF0w8tmN9o4CCC5dcjgHJcpz/q8+eCfg0VeZOZE=
api_key: $GITHUB_KEY
file: $HOME/artifacts/SC-$COMMIT_NAME.zip
prerelease: true
skip_cleanup: true
on:
condition: $TRAVIS_OS_NAME = osx
condition: $TRAVIS_OS_NAME = osx && ! -z $GITHUB_KEY
tags: true
all_branches: true
after-deploy:
- "echo S3 Build Location: $S3_URL"
notifications:
on_success: change
......@@ -89,5 +109,3 @@ notifications:
- https://webhooks.gitter.im/e/51b9b53ca50a7bfca97d
on_success: change
on_failure: always
#!/bin/bash
set -o errexit
shopt -s globstar
dir="$1"
config="$dir"/.editorconfig
# class library
lintspaces -e "$config" "$dir"/SCClassLibrary/**/*.sc
This diff is collapsed.
This diff is collapsed.
......@@ -2,6 +2,7 @@
<head>
<title>Broken link</title>
<link rel='stylesheet' href='./scdoc.css' type='text/css' />
<link rel='stylesheet' href='./custom.css' type='text/css' />
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
<noscript>
<p>Sorry, that link was broken..
......
......@@ -2,6 +2,7 @@
<head>
<title>Document Browser</title>
<link rel='stylesheet' href='./scdoc.css' type='text/css' />
<link rel='stylesheet' href='./custom.css' type='text/css' />
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
<script src="docmap.js" type="text/javascript"></script>
<script src="scdoc.js" type="text/javascript"></script>
......
......@@ -524,7 +524,7 @@ code::
// compose a function that will return an array of random length
a = { |n| { 16.rand } ! n } <> { |x, y| rrand(4, 8) };
a.value;
// compose a fucntion from a that selects only odd values
// compose a function from a that selects only odd values
b = { |x| x.select(_.odd) } <> a;
b.value;
::
......
......@@ -116,7 +116,7 @@ SynthDef("pgrain",
) * EnvGen.ar(window, doneAction:2)
)
}
).send(s);
).add;
)
// send grains
......@@ -147,7 +147,7 @@ SynthDef("pgrain",
) * EnvGen.ar(window, doneAction:2)
)
}
).send(s);
).add;
)
// with AmpCompA
......@@ -163,7 +163,7 @@ SynthDef("pgrain",
) * EnvGen.ar(window, doneAction:2)
)
}
).send(s);
).add;
)
::
......@@ -7,7 +7,7 @@ categories:: UGens>Analysis>Amplitude
Description::
Higher frequencies are normally perceived as louder, which AmpCompA
compensates. Following the measurings by Fletcher and Munson, the
compensates. Following the measurements by Fletcher and Munson, the
ANSI standard describes a function for loudness vs. frequency.
Note that this curve is only valid for standardized amplitude.
......
......@@ -4,7 +4,7 @@ categories:: Collections, Files
related::Classes/Library, Classes/Object, Classes/LibraryBase
DESCRIPTION::
Archives can write any object to disk and read from file again. Compex structures of objects can thus be restored. Writing an object to file as a strong::compile string:: is usually more readable, but does not account for the internal structure of the object.
Archives can write any object to disk and read from file again. Complex structures of objects can thus be restored. Writing an object to file as a strong::compile string:: is usually more readable, but does not account for the internal structure of the object.
There is only one global instance: Archive.global, which is initialized automatically.
......
......@@ -188,7 +188,7 @@ code::
[1, 2, 3, 4, 5].rotate(3).postln;
::
argument::n
Number of elements to rotate. Negative n values rotate left, postive n values
Number of elements to rotate. Negative n values rotate left, positive n values
rotate right.
method::pyramid
......@@ -321,7 +321,7 @@ e.use {
::
method::flop
Invert rows and colums in a two dimensional Array (turn inside out).
Invert rows and columns in a two dimensional Array (turn inside out).
See also: Function, SequenceableCollection.
code::
[[1, 2, 3], [4, 5, 6]].flop;
......@@ -397,7 +397,7 @@ method::atIdentityHashInPairs
This method is used by IdentityDictionary to search for a key among its members.
method::asString