Commit 5d066e18 authored by Georges Khaznadar's avatar Georges Khaznadar

New upstream version 3.10.0+repack

parent 4fd58552
......@@ -9,7 +9,7 @@ version: '{build}' # incremented with each build
clone_depth: 10
# https://www.appveyor.com/docs/build-environment/#build-worker-images
image: Visual Studio 2013
image: Visual Studio 2017
# disable automatic tests
test: off
......@@ -20,23 +20,29 @@ environment:
ASIO_ZIP: asiosdk2.3.zip
matrix:
- QT_DIR: "C:/Qt/5.5/msvc2013"
CMAKE_GENERATOR: "Visual Studio 12 2013"
- 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.5/msvc2013_64"
CMAKE_GENERATOR: "Visual Studio 12 2013 Win64"
- 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
......@@ -59,7 +65,7 @@ install:
# 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: "\"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin/lib\" /machine:%ARCH% /def:libfftw3f-3.def"
- cmd: lib.exe /machine:%ARCH% /def:libfftw3f-3.def
- cmd: cd ..
- cmd: move fftw "C:/%PROGFILES%/fftw"
- cmd: echo "Done installing fftw"
......@@ -128,9 +134,9 @@ deploy:
# s3 upload - every commit
- provider: S3
access_key_id:
secure: Imi70fjxyMWt9kwV9RfVT7qV8OaxA40iGlR1hO12SK4=
secure: cUwCIb/EtpG3uAP48WylcMNxAh3yEbPNcQGPZDnh6go=
secret_access_key:
secure: 3K2MRfkIb7BJk4kCCakxcGAjkc1LCYZHpD32I52mYd//2WHE63xVJl/qd3Q1IBhI
secure: 9n0lOPh/3hpwSEf1l0QySYngrgWYqplZozQ9ZJMxtDARIV5DIBn/NXttTfkh1Z3k
bucket: supercollider
region: us-west-2
folder: $(S3_BUILDS_LOCATION)
......@@ -143,7 +149,7 @@ deploy:
description: appveyor_$(APPVEYOR_REPO_TAG_NAME)
artifact: installer
auth_token:
secure: rxXJNY+6n25Th9R4+7qI+AcnTj0wCAMSnBGH2+5s7DlVLrAGsSY6+EEDbeHWGGeI
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! -->
......@@ -14,7 +14,7 @@ matrix:
env: QT=false
group: edge
- os: osx
osx_image: xcode7.3
osx_image: xcode8.3
env: QT=true
# use ccache to speed up build times. on osx,
......
......@@ -2,11 +2,11 @@
npm install -g lintspaces-cli
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
sudo add-apt-repository --yes ppa:beineri/opt-qt551-trusty
sudo add-apt-repository --yes ppa:beineri/opt-qt591-trusty
sudo apt-get update
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
if [[ -n "$1" && "$1" == "--qt=true" ]]; then
sudo apt-get install --yes libgl1-mesa-dev qt55base qt55location qt55declarative qt55sensors qt55tools qt55webengine qt55webchannel qt55webkit qt55xmlpatterns
sudo apt-get install --yes libgl1-mesa-dev qt59base qt59location qt59declarative qt59tools qt59webengine qt59webchannel qt59xmlpatterns qt59svg qt59websockets
fi
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
sudo update-alternatives --auto gcc
#!/bin/sh
brew update
brew tap homebrew/versions
brew outdated cmake || brew upgrade cmake
export BREW_NO_AUTO_UPDATE=1
export BREW_NO_ANALYTICS=1
# according to https://docs.travis-ci.com/user/caching#ccache-cache
brew install ccache
export PATH="/usr/local/opt/ccache/libexec:$PATH"
brew install libsndfile || true
brew install qt55 || true
brew link qt55 --force
brew install portaudio || true
brew install qt5 || true
brew link qt5 --force
# To get less noise in xcode output
gem install xcpretty
......@@ -2,7 +2,7 @@
$TRAVIS_BUILD_DIR/.travis/lint.sh $TRAVIS_BUILD_DIR
if [[ -n "$1" && "$1" == "--qt=true" ]]; then
source /opt/qt55/bin/qt55-env.sh
source /opt/qt59/bin/qt59-env.sh
cmake -DSC_EL=OFF -DCMAKE_INSTALL_PREFIX:PATH=$TRAVIS_BUILD_DIR/BUILD/Install -DCMAKE_BUILD_TYPE=Release $TRAVIS_BUILD_DIR --debug-output
else
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
......
#!/bin/sh
cmake -G"Xcode" -DRULE_LAUNCH_COMPILE=ccache -DCMAKE_PREFIX_PATH=`brew --prefix qt55` -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 $TRAVIS_BUILD_DIR --debug-output
cmake -G"Xcode" \
-DRULE_LAUNCH_COMPILE=ccache \
-DCMAKE_PREFIX_PATH=`brew --prefix qt5` \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.10 \
-DSUPERNOVA=ON \
$TRAVIS_BUILD_DIR --debug-output
......@@ -3,4 +3,4 @@
mkdir -p $HOME/artifacts
cd $TRAVIS_BUILD_DIR/BUILD/Install
zip -q -r $HOME/artifacts/SC-$TRAVIS_COMMIT.zip SuperCollider
zip -q -r --symlinks $HOME/artifacts/SC-$TRAVIS_COMMIT.zip SuperCollider
#!/bin/bash
cd $TRAVIS_BUILD_DIR/BUILD
sudo pip install git+https://github.com/scztt/qpm.git@qpm-unit
sudo pip2 install git+https://github.com/scztt/qpm.git@qpm-unit
mkdir $HOME/Quarks && cd $HOME/Quarks
git clone --depth=1 https://github.com/supercollider-quarks/API
......
......@@ -6,6 +6,6 @@ else
export SCLANG=$TRAVIS_BUILD_DIR/BUILD/Install/SuperCollider/SuperCollider.app/Contents/MacOS/sclang
fi
$TRAVIS_BUILD_DIR/testsuite/sclang/launch_test.py $SCLANG
# $TRAVIS_BUILD_DIR/testsuite/sclang/launch_test.py $SCLANG
if [[ $QT == true ]]; then $TRAVIS_BUILD_DIR/.travis/qpm-test.sh; fi
This diff is collapsed.
......@@ -4,8 +4,11 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
set(LINUX 1)
endif()
cmake_minimum_required (VERSION 2.8.12)
set(SUPERNOVA_CMAKE_MINVERSION 3.1)
if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|DragonFly|OpenBSD|NetBSD")
set(LINUX_OR_BSD 1)
endif()
cmake_minimum_required (VERSION 3.5)
include("SCVersion.txt")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}")
......@@ -71,7 +74,7 @@ ADD_CUSTOM_TARGET(uninstall
if(WIN32)
SET(SC_WIN_BUNDLE_NAME "SuperCollider" CACHE STRING "Folder name of SC install")
if(CMAKE_CL_64 OR "$ENV{MSYSTEM}" MATCHES "64" OR CMAKE_C_COMPILER MATCHES "64")
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(CMAKE_LIBRARY_ARCHITECTURE "x64" CACHE STRING "Architecture of target system (for 64bit)")
else()
SET(CMAKE_LIBRARY_ARCHITECTURE "x86" CACHE STRING "Architecture of target system (for 32bit)")
......@@ -104,7 +107,7 @@ if (${CMAKE_COMPILER_IS_GNUCXX})
message(FATAL_ERROR "SuperCollider requires at least gcc-4.8 when compiled with gcc.")
endif()
add_definitions("-ffast-math -fsigned-zeros -fno-associative-math")
add_definitions("-fno-math-errno -fno-signaling-nans -fsigned-zeros -fno-associative-math")
if(APPLE)
exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
......@@ -127,7 +130,7 @@ endif()
if(APPLE)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/Install" CACHE STRING "Cmake install path")
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/Install" CACHE STRING "Cmake install path" FORCE)
endif()
elseif(UNIX)
add_definitions(-DSC_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/SuperCollider")
......@@ -195,15 +198,12 @@ else()
set(SC_IDE False)
endif()
endif (SC_QT)
option(NO_X11 "Disables the building of plugins that require the X11 library (for UI-less compiles)" OFF)
option(ENABLE_TESTSUITE "Compile testsuite." ON)
if(CMAKE_SYSTEM_NAME MATCHES "Linux|FreeBSD|DragonFly|OpenBSD|NetBSD" AND NOT CMAKE_VERSION VERSION_LESS SUPERNOVA_CMAKE_MINVERSION)
option(SUPERNOVA "Build with supernova as optional audio synthesis server" ON)
else()
option(SUPERNOVA "Build with supernova as optional audio synthesis server" OFF)
endif()
# Build supernova by default only when on Linux or BSD systems
option(SUPERNOVA "Build with supernova as optional audio synthesis server" ${LINUX_OR_BSD})
option(SN_MEMORY_DEBUGGING "Build supernova for memory debugging (disable memory pools).")
option(SC_MEMORY_DEBUGGING "Build sclang&scsynth for memory debugging (disable memory pools).")
......@@ -219,8 +219,6 @@ option(NO_GPL3 "Disable GPL3 code, for pure-GPL2 situations. (Not recommended.)"
option(SCLANG_SERVER "Build with internal server." ON)
option(SC_WII "Build sclang with WII support (broken on osx after 10.7)" OFF)
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG)
option(NATIVE "Optimize binary for this architecture (binaries may not run on other machines).")
endif()
......@@ -576,7 +574,7 @@ if(APPLE)
# set(CPACK_PACKAGE_FILE_NAME "${scappbundlename}-${PROJECT_VERSION}")
set(CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/package/ds_store")
set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/package/background.png")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/icons/SCcube.icns")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/icons/sc_ide.icns")
endif()
if(NOT WIN32) # We define a custom 'package' target in platform/windows/CMakeLists.txt
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<!doctype html>
<html lang="en">
<head>
<title>Document Browser | SuperCollider Help</title>
<link rel='stylesheet' href='./scdoc.css' type='text/css' />
<link rel='stylesheet' href='./custom.css' type='text/css' />
<link rel='stylesheet' href='./browse.css' type='text/css' />
<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
<script src="lib/jquery.min.js"></script>
<script>
var scdoc_title = "Document Browser";
var scdoc_sc_version = "";
......@@ -14,35 +16,36 @@
<script src="scdoc.js" type="text/javascript"></script>
<script src="browse.js"></script>
</head>
<body>
<noscript>
<!--<meta http-equiv="refresh" content="3; URL=Overviews/Categories.html">
<noscript>
<!--<meta http-equiv="refresh" content="3; URL=Overviews/Categories.html">
<p>JavaScript is not available, redirecting to <a href="Overviews/Categories.html">static category overview</a>...-->
<p>The document browser needs JavaScript.
</noscript>
<div class='contents'>
<div id="menubar"></div>
<div class='header'>
<h1>Document Browser</h1>
<div id='summary'>Browse categories</div>
</div>
<div id="search_checks">
Filter:
<select id="menu_filter">
<option SELECTED value="all">All documents</option>
<option value="classes">Classes only</option>
<option value="reference">Reference only</option>
<option value="guides">Guides only</option>
<option value="tutorials">Tutorials only</option>
<option value="overviews">Overviews only</option>
<option value="other">Other only</option>
</select>
<input type="checkbox" id="check_extensions" checked="true">Include extensions</input>
</div>
<p>The document browser needs JavaScript.
</noscript>
<div id="menubar"></div>
<div class='contents'>
<div class='header'>
<h1>Document Browser</h1>
<div id='summary'>Browse categories</div>
</div>