Modern CMake Upgrade

.appveyor.yml

@@ -0,0 +1,61 @@
+# Appveyor Behavior Config
+version: '{build}'
+clone_depth: 1 # Only clone the head of the repo
+pull_requests:
+  do_not_increment_build_number: true
+
+# Appveyor Build Config
+image:
+  - Visual Studio 2017
+
+platform:
+  - Win32
+  - x64
+
+init:
+  - "echo System Architecture: %PLATFORM%"
+  - choco upgrade cmake	nsis                    # Upgrade CMake
+  - set path=C:\Program Files\CMake\bin;%path%	# Add it to the path
+
+before_build:
+  - mkdir build && cd build
+  - cmake -G "%GENERATOR%" -DOPENSSL_ROOT_DIR="%OPENSSL_DIR%" ..
+
+build_script:
+  - cd %APPVEYOR_BUILD_FOLDER%\build
+  - msbuild Etterna.sln /p:Configuration=Release /p:Platform="%PLATFORM%"
+
+# CPack after build
+after_build:
+- cmd: cpack
+- cmd: ren "%APPVEYOR_BUILD_FOLDER%\build\*.exe" "*-%appveyor_build_version%-%PLATFORM%.exe"
+
+# Generate all possible combinations of the following environment variables
+# This will generate 4 builds, and do crosses that we don't want like a
+# 64bit generator and 32bit OpenSSL.
+environment:
+  matrix:
+    - GENERATOR: "Visual Studio 15 2017"
+      OPENSSL_DIR: "C:/OpenSSL-v11-Win32"
+    - GENERATOR: "Visual Studio 15 2017 Win64"
+      OPENSSL_DIR: "C:/OpenSSL-v11-Win64"
+
+# Don't generate builds with this specific combination of environment variables
+matrix:
+  exclude:
+    - platform: x64
+      GENERATOR: "Visual Studio 15 2017"
+      OPENSSL_DIR: "C:/OpenSSL-v11-Win32"
+
+    - platform: Win32
+      GENERATOR: "Visual Studio 15 2017 Win64"
+      OPENSSL_DIR: "C:/OpenSSL-v11-Win64"
+
+# Cache Choclatey packages so they don't need to be downloaded every time.
+cache:
+  - C:\ProgramData\chocolatey\bin -> appveyor.yml
+  - C:\ProgramData\chocolatey\lib -> appveyor.yml
+
+artifacts:
+- path: 'build\*.exe'
+  name: EtternaDevBuild

.ci/build.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+update_cmake (){
+    CMAKE_DIR="${HOME}/cmake_binary"
+    mkdir -p ${CMAKE_DIR} && cd ${CMAKE_DIR}
+    curl -LO https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0-Linux-x86_64.sh
+    sudo sh cmake-3.14.0-Linux-x86_64.sh --prefix=/usr/local/ --exclude-subdir --skip-license
+    PATH=/usr/local/bin:${PATH} # add it to path in front of everything else
+}
+
+update_cmake
+echo "CMake Updated!"
+

.gitignore

@@ -1,124 +1,20 @@
-# Traditional Compilation File Stuff.
-*.o
-*.obj
-*.a
-
-# Doxygen documentation
-Utils/temp
-stepmania.chm
-# For people using vscode
+# Common ignore files
+.DS_Store
 .vscode
-# CMake Files/Directories
-CMakeFiles/
-CMakeCache.txt
-cmake_install.cmake
-CPackConfig.cmake
-CPackSourceConfig.cmake
-# The following are generated from CMake, and thus should be stopped.
-install_manifest.txt
-_CPack_Packages
-Build/**
-Debug/
-MinSizeRel/
-Release/
-RelWithDebInfo/
-Contents/
-Xcode/Info.StepMania.plist
-Xcode/plistHelper.hpp
-src/generated
-extern/mad-0.15.1b/config.h
-extern/libjpeg/jconfig.h
-extern/newogg/include/ogg/config_types.h
-Program/*.dll
-!Program/parallel_lights_io.dll
-!Program/dlls/*.dll
-
-# Text Editor Based Items
-*.log
+.vs
+Build/
 
-# Mac Programming Files
-*.pbxuser
-PBProject/build
-Xcode/build
-Xcode/*.xcodeproj/xcuserdata/
-*.xcodeproj/xcuserdata
-*.xcodeproj/project.xcworkspace
-*.xcscheme
-WorkspaceSettings.xcsettings
-UserInterfaceState.xcuserstate
-*.xccheckout
-contents.xcworkspacedata
-xcschememanagement.plist
-PBProject/Hardware.plist
-
-# Mac General Files
+# Ignore executables (Linux, macOS, Windows)
+/Etterna
 *.app
-*.dmg
-.DS_Store
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-
-# Visual Studio
-*.sln
-*.vcxproj
-*.vcxproj.filters
-*.pdb
-*.ilk
-*.map
-*.res
-*.suo
-UpgradeLog*.htm
-
-# Windows General Files
 *.exe
 
-# Linux General Files
-.dirstamp
-Makefile
-stepmania
-Makefile.in
-config.status
-_build/*
-aclocal.m4
-autoconf/*
-autom4te.cache/*
-configure
-src/Makefile.in
-src/Makefile
-src/config.h
-src/config.h.in
-src/stamp-h1
-GtkModule.so
-StepMania
-core
-
-# StepMania Specific
+# Etterna Related Ignore
 Cache/
-Save/**
-Songs/
 Logs/
-src/*.so
-crashinfo.txt
-
-# include calc .a file
-!extern/MinaCalc/MinaCalc.a
-!extern/MinaCalc/libMinaCalc.a
-
-# calc
-src/MinaCalc
-
-# Unknown File Types
-tests/*.err
-*.ncb
-*.tlog
-*.user
-*.vdi
-*.pch
-
-nsis_strings_temp\.inc
-BatchRecalc/*
-
-Xcode/Info\.Etterna\.plist
+Program/
+Save/
+Songs/
 
-extern/LuaJit*/lj_*def.h
+# Misc Ignores
+crashinfo.txt

.travis.yml

@@ -1,114 +1,73 @@
 language: cpp
-dist: trusty
+dist: xenial
 sudo: required
 
-matrix:
-        include:
-                # OSX
-                - env: CXX_COMPILER=clang++ CC_COMPILER=clang BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1
-                  os: osx
-                  osx_image: xcode10.1
+git:
+  depth: false
 
-                # LINUX
-                - env: CXX_COMPILER=clang++-5.0 CC_COMPILER=clang-5.0 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1
-                  compiler: clang
-                  addons: &1
-                          apt:
-                                  sources:
-                                          - ubuntu-toolchain-r-test
-                                          - llvm-toolchain-precise
-                                  packages:
-                                          - nasm
-                                          - libudev-dev
-                                          - clang-5.0
-                                          - clang-format-5.0
-                                          - libmad0-dev
-                                          - libgtk2.0-dev
-                                          - binutils-dev
-                                          - libasound-dev
-                                          - libpulse-dev
-                                          - libjack-dev
-                                          - libc6-dev
-                                          - libogg-dev
-                                          - libvorbis-dev
-                                          - libxtst-dev
-                                          - libxrandr-dev
-                                          - libglew-dev
-                                          - libuv-dev
-                - env: CXX_COMPILER=clang++-5.0 CC_COMPILER=clang-5.0 BUILD_TYPE=Release WITH_FFMPEG=ON WITH_FFMPEG_JOBS=1
-                  compiler: clang
-                  addons: *1
-                - env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1 MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
-                  compiler: gcc
-                  addons:
-                          apt:
-                                  sources:
-                                          - ubuntu-toolchain-r-test
-                                          - llvm-toolchain-precise
-                                  packages:
-                                          - nasm
-                                          - libudev-dev
-                                          - gcc-5
-                                          - g++-5
-                                          - libmad0-dev
-                                          - libgtk2.0-dev
-                                          - binutils-dev
-                                          - libasound-dev
-                                          - libpulse-dev
-                                          - libjack-dev
-                                          - libc6-dev
-                                          - libogg-dev
-                                          - libvorbis-dev
-                                          - libxtst-dev
-                                          - libxrandr-dev
-                                          - libglew-dev
-                                          - libuv-dev
-                                          - clang-format-5.0
-                          coverity_scan:
-                                  project:
-                                          name: etternagame/etterna
-                                          description: "Build submitted via Travis CI"
-                                  notification_email: etternadev@gmail.com
-                                  build_command_prepend:
-                                          "cov-configure --comptype g++
-                                          --compiler g++-5 --template"
-                                  build_command: "make -j 4"
-                                  branch_pattern: coverity_scan
+# Path is modified here since we install CMake to the /usr/local/ prefix. Usually the system
+# would check the full path until it reached CMake, but Travis specifically adds their CMake
+# version to their path. We want our CMake to have priority, so we add it to the start of the 
+# search path. 
+env:
+  - PATH=/usr/local/bin:${PATH}
 
-before_script:
-        # ALL
-        - mkdir ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
+matrix:
+  include:
 
-        # LINUX
-        - if [ "${CXX_COMPILER}" = "g++-5" ]; then export CXX="g++-5" CC="gcc-5"; fi
-        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi
-        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}; fi
+    ##### Linux ##################
+    - os: linux
+      compiler: clang
+    - os: linux
+      compiler: gcc
 
-        # OSX
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update > /dev/null; fi
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install openssl nasm zlib clang-format; fi
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install --HEAD libuv; fi
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo gem install xcpretty; fi
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..; fi
+    ##### macOS ##################
+    - os: osx
+      osx_image: xcode10.1
+      install:
+        - sudo gem install xcpretty
+      script:
+        - mkdir -p ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
+        - cmake -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G "Xcode" ..
+        - set -o pipefail && xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target Etterna -destination 'platform=OSX,arch=x86_64' -configuration Release | xcpretty
 
+# This will only run for the linux builds
+# The other os's have overridden the script tag
 script:
-        # LINUX
-        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then make -j 4; fi
-        - if [ "$TRAVIS_OS_NAME" != "osx" ]; then cd .. && bash format-check.sh; fi
+  - sh .ci/build.sh
+  - mkdir -p ${TRAVIS_BUILD_DIR}/build && cd ${TRAVIS_BUILD_DIR}/build
+  - cmake ..
+  - make
 
-        # OSX
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target Etterna -destination 'platform=OSX,arch=x86_64' -xcconfig ../Xcode/conf.cnf -configuration RelWithDebInfo | xcpretty && exit ${PIPESTATUS[0]}; fi
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then mv ../*.app ../Etterna.app; fi
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then xcodebuild ARCHS="x86_64" -project Etterna.xcodeproj -target dmg -configuration RelWithDebInfo; fi
+addons:
+  homebrew:
+    packages:
+      - openssl
+      - cmake
+      - nasm
+    update: true
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-precise
+    packages:
+      - nasm
+      - libudev-dev
+      - gcc-5
+      - g++-5
+      - libmad0-dev
+      - libgtk2.0-dev
+      - binutils-dev
+      - libasound-dev
+      - libpulse-dev
+      - libjack-dev
+      - libc6-dev
+      - libogg-dev
+      - libvorbis-dev
+      - libxtst-dev
+      - libxrandr-dev
+      - libglew-dev
+      - libuv-dev
+      - clang-format-5.0
+    update: true
 
-before_install:
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then rvm install 2.2.6;
-          gem install dropbox-deployment; fi
-
-after_success:
-        - if [ "$TRAVIS_OS_NAME" == "osx" ]; then cd ${TRAVIS_BUILD_DIR};
-          ruby uploadDmg.rb; fi
-
-env:
-        global:
-                secure: gXXVXUQdzic8X/WhHgPih7zEPOMvzz1o4XudnEgiIGrk5gwVajXLVc0TEVT9uogeuHZxhT0sM7idYmtSXTe6zUBfoV/WXnyfeZVQhI59iy35bWUKdbpPpO9bAafdmMB2d9b3v5QT8iubOPAudVNGENBZiXiGovAJBmqxnjpjdU1aQBsy5rhFssSOcizIV7GrOcsCGoilTceonPtLp8xX2mt/WQJhPHrAUmZks5uPNNYDXv9a8BoLeTYKzbFoz7GNvoxEUfmFV2W2jr/szfpnbmvRMqKgErsJDlc2b/oaD0EKUJOdu8eNNuOpLKZSPiMQstmDZtQ65boOuXVudAx3T1zFaDhhP3PZwG6KLwnrf0ttLRSdIW5Mm+SzEHuJXp2qwBPyAQJIKJLqqu/OUeNorWfz0jFvYyVlNZlTX5ZaxjEj05qj3DAEfokCuueNY+KFccdouMQX0ks3of4/WKLYH1BL743Binc5SYgK38xA7bzwcjFyyEBQFoc9FayrLkk0Yi/ed2mV1XdBvr7vmFxYDlZQkg425KLtCX7GN/++5FVF01IH1cZa3siJ7XT5EJBu6vxisByHRwPSWWagn2WgvkxHjgAnBcvgYBIcoKsxFBytsyyh3g5fVSWovSnTerr5glwv7cXdyhMAXp1gGL900tjij0BiEWRzKfbiroDjVn0=