CMake: Move build/*/ directories to cmake/ directory

.github/workflows/build.yml

@@ -252,7 +252,7 @@ jobs:
 
     - name: "[macOS] Sign Package"
       if: runner.os == 'macOS' && env.MACOS_CODESIGN_OPENSSL_PASSWORD != null && env.MACOS_CODESIGN_CERTIFICATE_PASSWORD != null
-      run: codesign --verbose=4 --options runtime --sign "${APPLE_CODESIGN_IDENTITY}" --entitlements ../build/osx/entitlements.plist *.dmg
+      run: codesign --verbose=4 --options runtime --sign "${APPLE_CODESIGN_IDENTITY}" --entitlements ../cmake/macos/entitlements.plist *.dmg
       working-directory: cmake_build
 
     - name: "[Windows] Sign Package"
@@ -268,7 +268,7 @@ jobs:
         FILE_TO_DEPLOY: ${{ matrix.artifacts_path }}
         OS: ${{ runner.os }}
         DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD: ${{ secrets.DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD }}
-        SSH_KEY: build/certificates/downloads-hostgator.mixxx.org.key
+        SSH_KEY: cmake/certificates/downloads-hostgator.mixxx.org.key
 
     - name: "Upload GitHub Actions artifacts"
       uses: actions/upload-artifact@v2

CMakeLists.txt

@@ -2530,11 +2530,11 @@ set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5opengl5, libqt5svg5, libqt5xml5, libqt5s
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 
 set(CPACK_WIX_UPGRADE_GUID "921DC99C-4DCF-478D-B950-50685CB9E6BE")
-set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/build/wix/LICENSE.rtf")
+set(CPACK_WIX_LICENSE_RTF "${CMAKE_CURRENT_SOURCE_DIR}/cmake/wix/LICENSE.rtf")
 set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/res/images/ic_mixxx.ico")
 set(CPACK_WIX_PROPERTY_ARPHELPLINK "${CPACK_PACKAGE_HOMEPAGE_URL}")
-set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/build/wix/images/banner.bmp")
-set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/build/wix/images/dialog.bmp")
+set(CPACK_WIX_UI_BANNER "${CMAKE_CURRENT_SOURCE_DIR}/cmake/wix/images/banner.bmp")
+set(CPACK_WIX_UI_DIALOG "${CMAKE_CURRENT_SOURCE_DIR}/cmake/wix/images/dialog.bmp")
 
 include(CPack)
 
@@ -2566,7 +2566,7 @@ if(APPLE AND MACOS_BUNDLE)
 
     set(BUNDLE_NAME "${MIXXX_INSTALL_PREFIX}")
     set(BUNDLE_DIRS "${CMAKE_PREFIX_PATH}/lib;${Qt5Widgets_DIR}/../..")
-    set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/build/osx/entitlements.plist")
+    set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos/entitlements.plist")
 
     configure_file(cmake/modules/BundleInstall.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/BundleInstall.cmake" @ONLY)
     install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/BundleInstall.cmake")

build/debian/changelog → cmake/debian/changelog

@@ -18,16 +18,16 @@ mixxx (2.2.2-0ubuntu1) bionic; urgency=medium
 
 mixxx (2.2.1-0ubuntu1) bionic; urgency=medium
 
-  * Bugfix release 
+  * Bugfix release
 
  -- Daniel Schürmann <[email protected]>  Thu, 22 Apr 2019 23:05:28 +0100
 
 mixxx (2.2.0-0ubuntu1) bionic; urgency=medium
 
-  * Bugfix release 
+  * Bugfix release
 
  -- Daniel Schürmann <[email protected]>  Fr, 11 Jan 2019 23:26:08 +0100
- 
+
 mixxx (2.1.8-0ubuntu1) bionic; urgency=medium
 
   * New upstream release
@@ -36,7 +36,7 @@ mixxx (2.1.8-0ubuntu1) bionic; urgency=medium
 
 mixxx (2.1.7-0ubuntu1) bionic; urgency=medium
 
-  * New upstream release  
+  * New upstream release
 
  -- Daniel Schürmann <[email protected]>  Mon, 14 Jan 2019 00:08:23 +0100
 

cmake/debian/mixxx-test.install

@@ -0,0 +1,2 @@
+usr/bin/mixxx-test
+usr/share/mixxx-test/test_results.xml

build/debian/mixxx.sgml → cmake/debian/mixxx.sgml

@@ -432,5 +432,3 @@ sgml-local-catalogs:nil
 sgml-local-ecat-files:nil
 End:
 -->
-
-

build/wix/LICENSE.rtf → cmake/wix/LICENSE.rtf

@@ -2073,4 +2073,4 @@ Moreover, you may apply this exception to a modified version of the Library, pro
 Furthermore, you are not required to apply this additional permission to a modified version of the Library.\par
 \par
 }
-
+