Conan fully removed from project (#229)

* attempt to build without conan

- many files modified to match before conan build times
- lacking dirs in lib-src and cmake-proxies restored

* got it build on windows x64/x86 also with ninja

* added ckath's patches for linux

* changed generator to ninja

* looks like ninja was using mingw instead of cl for building on windows

* name changing

* repair ninja

* update pkgbuild, remove conan as makedep

* improve the linux package workaround

instead of copying all the libs, only grab the local ones which just
happen to be misplaced for whatever reason

* added compiler cache

* added some commits regarding sccache working on windows from tenacity

* fix linux workaround (#226)

* cleaned windows builds with ninja



Co-authored-by: swirl <roachh@protonmail.com>
Co-authored-by: Megumin <83077245+meguminloli@users.noreply.github.com>

Author: 3 people

.github/workflows/cmake_build.yml

@@ -19,9 +19,6 @@ jobs:
       # This variables will be used by all the steps
       WINDOWS_CERTIFICATE: ${{ secrets.WINDOWS_CERTIFICATE }}
       WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}
-      # Conan home location to be used for cache action
-      CONAN_USER_HOME: "${{ github.workspace }}/conan-home/"
-      CONAN_USER_HOME_SHORT: "${{ github.workspace }}/conan-home/short"
     strategy:
       fail-fast: false
       matrix:
@@ -30,35 +27,68 @@ jobs:
         - name: Ubuntu_18.04
           os: ubuntu-18.04
           arch: x86_64 # as reported by `arch` or `uname -m`
-          generator: Unix Makefiles
+          generator: Ninja
+          compiler_cache: ccache
+          compiler_cache_path: ~/.ccache
 
         - name: macOS_Intel
           os: macos-latest
           arch: Intel # as reported by Apple menu > About This Mac
-          generator: Xcode
+          generator: Ninja
+          compiler_cache: ccache
+          compiler_cache_path: ~/Library/Caches/ccache
 
         - name: Windows_32bit
           os: windows-latest
-          arch: 32bit # as reported by Windows Settings > System > About
-          generator: Visual Studio 16 2019
-
+          arch: x86 # as reported by Windows Settings > System > About
+          generator: Ninja
+          cc: cl
+          cxx: cl
+          compiler_cache: sccache
+          compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
+        
         - name: Windows_64bit
           os: windows-latest
-          arch: 64bit # as reported by Windows Settings > System > About
-          generator: Visual Studio 16 2019
+          arch: amd64 # as reported by Windows Settings > System > About
+          generator: Ninja
+          cc: cl
+          cxx: cl
+          compiler_cache: sccache
+          compiler_cache_path: C:\Users\runneradmin\AppData\Local\Mozilla\sccache\cache
 
     steps:
-
     - name: Checkout
       uses: actions/checkout@v2
 
+    - uses: seanmiddleditch/gha-setup-ninja@master
+    
+    
     - name: Dependencies
       run: |
         exec bash "scripts/ci/dependencies.sh"
 
     - name: Environment
       run: |
         source "scripts/ci/environment.sh"
+
+    - name: "Set up MSVC Developer Command Prompt"
+      if: startswith( matrix.config.os, 'windows' )
+      uses: seanmiddleditch/gha-setup-vsdevenv@v3
+      with:
+        arch: ${{ matrix.config.arch }}
+
+    - name: "Install sccache"
+      if: startswith( matrix.config.os, 'windows' )
+      run: choco install sccache
+
+    - name: "Set up compiler cache"
+      uses: actions/cache@v2
+      with:
+        path: ${{ matrix.config.compiler_cache_path }}
+        key: ${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ github.head_ref }}-${{ github.run_number }}
+        restore-keys: |
+          ${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ github.head_ref }}-
+
     
     #- name: Install Apple codesigning certificates
     #  uses: apple-actions/import-codesign-certs@v1
@@ -67,17 +97,6 @@ jobs:
     #    p12-file-base64: ${{ secrets.APPLE_CERTIFICATE }}
     #    p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
 
-    - name: Cache for .conan
-      id: cache-conan
-      uses: actions/cache@v2
-      env:
-        cache-name: cache-conan-modules
-      with:
-        path: ${{ env.CONAN_USER_HOME }}
-        key: host-${{ matrix.config.name }}-${{ hashFiles('cmake-proxies/CMakeLists.txt') }}
-        restore-keys: |
-          host-${{ matrix.config.name }}-
-
     - name: Configure
       env:
         # Error reporing
@@ -88,6 +107,8 @@ jobs:
         APPLE_CODESIGN_IDENTITY: ${{ secrets.APPLE_CODESIGN_IDENTITY }}
         APPLE_NOTARIZATION_USER_NAME: ${{ secrets.APPLE_NOTARIZATION_USER_NAME }}
         APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
+        CC: ${{ matrix.config.cc }}
+        CXX: ${{ matrix.config.cxx }}
       run: |
         exec bash "scripts/ci/configure.sh"
 

.gitignore

@@ -206,3 +206,9 @@ win/xaudacity.ico
 #other files that get in the way
 */not-for-git/*
 *.dll
+
+# files autogenerated by vs
+out
+CMakeSettings.json
+.vs
+.vscode

BUILDING.md

@@ -3,28 +3,9 @@
 ## Prerequisites
 
 * **python3** >= 3.5
-* **conan** >= 1.32.0
 * **cmake** >= 3.16
 * A working C++17 compiler
 
-### Conan
-
-[The best way to install Conan is `pip`.](https://docs.conan.io/en/latest/installation.html)
-
-To install Conan on Windows:
-
-```
-$ pip install conan
-```
-
-To install Conan on macOS and Linux:
-
-```
-$ sudo pip3 install conan
-```
-
-Alternatively, on macOS, Conan is available from `brew`.
-
 ### CMake
 
 On Windows, please use the [prebuilt binaries](https://cmake.org/download/).
@@ -52,7 +33,6 @@ On Debian or Ubuntu, you can install everything required using the following com
 ```
 $ sudo apt-get update
 $ sudo apt-get install -y build-essential cmake git python3-pip
-$ sudo pip3 install conan
 $ sudo apt-get install libgtk2.0-dev libasound2-dev libavformat-dev libjack-jackd2-dev uuid-dev
 ```
 
@@ -84,8 +64,6 @@ $ sudo apt-get install libgtk2.0-dev libasound2-dev libavformat-dev libjack-jack
       
 Generally, steps 1-5 are only needed the first-time you configure. Then, after you've generated the solution, you can open it in Visual Studio next time. If the project configuration has changed, the IDE will invoke CMake internally. 
 
-> Conan Center provides prebuilt binaries only for **x64**. Configuring the project for Win32 will take much longer, as all the 3rd party libraries will be built during the configuration.
-
 ## macOS
 
 1. Clone Sneedacity from the Sneedacity GitHub project. 

CMakeLists.txt

@@ -123,8 +123,20 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON )
 find_program( CCACHE_PROGRAM ccache )
 mark_as_advanced( FORCE CCACHE_PROGRAM )
 
+# use sccache if available
+find_program( SCCACHE_PROGRAM sccache )
+mark_as_advanced( FORCE SCCACHE_PROGRAM )
+
 if( CCACHE_PROGRAM )
-   set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
+   message( STATUS "Using ccache" )
+   set( CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" )
+   set( CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}" )
+endif()
+
+if( SCCACHE_PROGRAM )
+   message( STATUS "Using ${SCCACHE_PROGRAM} for source code cache" )
+   set( CMAKE_C_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}" )
+   set( CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}" )
 endif()
 
 # Define option() prefix
@@ -151,8 +163,6 @@ cmd_option( ${_OPT}obey_system_dependencies
             Off
 )
 
-include( SneedacityDependencies )
-
 # Pull all the modules we'll need
 include( CheckCXXCompilerFlag )
 include( CheckIncludeFile )
@@ -257,18 +267,17 @@ if( CMAKE_GENERATOR MATCHES "Visual Studio" )
    include( InstallRequiredSystemLibraries )
 endif()
 
-# Where the final product is stored
-set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
-
 set ( _SHARED_PROXY_BASE "shared" )
 set ( _SHARED_PROXY_BASE_PATH "${CMAKE_BINARY_DIR}/${_SHARED_PROXY_BASE}")
 
 # Define the non-install and executable paths
 if( CMAKE_CONFIGURATION_TYPES )
+    set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
    set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}" )
    set( _SHARED_PROXY_PATH "${_SHARED_PROXY_BASE_PATH}/${CMAKE_CFG_INTDIR}")
 else()
-   set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}" )
+   set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE} )
+   set( _DESTDIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/" )
    set( _SHARED_PROXY_PATH "${_SHARED_PROXY_BASE_PATH}/${CMAKE_BUILD_TYPE}")
 endif()
 
@@ -344,6 +353,17 @@ elseif( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
    if( NOT IS_64BIT )
       set( SSE_FLAG "/arch:SSE2" )
    endif()
+      # required for sccache
+   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+      string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+      string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
+   elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+      string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+      string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+   elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+      string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+      string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+    endif()
 endif()
 
 check_include_files( "float.h;stdarg.h;stdlib.h;string.h" STDC_HEADERS )
@@ -456,7 +476,6 @@ find_package( Python3 )
 if( Python3_FOUND )
    set( PYTHON "${Python3_EXECUTABLE}" )
 elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
-   # This is an odd case now, as Conan requires Python as well
    nuget_package( pkgdir "python3" "3.7.7" )
    file( TO_NATIVE_PATH "${pkgdir}/tools/python.exe" PYTHON )
 endif()
@@ -467,10 +486,6 @@ include( "src/Experimental.cmake" )
 
 # Add our children
 add_subdirectory( "cmake-proxies" )
-
-# Conan uses find_package and does not set GLOBAL flag
-resolve_conan_dependencies()
-
 add_subdirectory( "help" )
 add_subdirectory( "images" )
 add_subdirectory( "libraries" )