Skip to content

Commit

Permalink
Traktor: Removed Ninja and FastBUILD dependencies; using plain msbuil…
Browse files Browse the repository at this point in the history
…d for autobuild instead.
  • Loading branch information
apistol78 committed Feb 26, 2024
1 parent 2f65bb3 commit 9eceb83
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: C/C++ CI
name: Build Windows

on:
push:
Expand All @@ -14,7 +14,7 @@ jobs:
- name: Install 3rdp dependencies
run: ./scripts/update-3rdp.bat
- name: Generate build files
run: ./scripts/build-projects-fbuild-win64.bat
run: ./scripts/build-projects-vs2022-win64.bat
- name: Build DebugShared
run: ./scripts/autobuild/autobuild-latest-win64.bat DebugShared
- name: Build ReleaseShared
Expand Down
5 changes: 2 additions & 3 deletions scripts/autobuild/autobuild-latest-win64.bat
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
@echo off

set CONFIG=%*
if "%CONFIG%" == "" ( set CONFIG=all )
if "%CONFIG%" neq "" ( set CONFIG="/p:Configuration=%CONFIG%" )

:: Setup our build environment.
call "%~dp0..\config.bat"
call "%~dp0..\config-vs-x64.bat"

:: Rebuild entire solution.
pushd "%TRAKTOR_HOME%\build\win64"
%FBUILD% -config "Extern Win64.bff" -noprogress -summary -cache %CONFIG%
%FBUILD% -config "Traktor Win64.bff" -noprogress -summary -cache %CONFIG%
msbuild -m "Traktor Win64.sln" %CONFIG%
popd
35 changes: 1 addition & 34 deletions scripts/misc/update-3rdp.run
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--[[
TRAKTOR
Copyright (c) 2022 Anders Pistol.
Copyright (c) 2022-2024 Anders Pistol.

This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down Expand Up @@ -439,39 +439,6 @@ local PACKAGES =
end
},

-- FastBUILD
{
type = "GET",
name = "fastbuild-windows",
os = "windows",
url = "https://fastbuild.org/downloads/v1.07/FASTBuild-Windows-x64-v1.07.zip",
patch = function()
run:execute(UNZIP .. " -qq FASTBuild-Windows-x64-v1.07.zip")
end
},

-- Ninja
{
type = "GET",
name = "ninja-windows",
os = "windows",
url = "https://github.com/ninja-build/ninja/releases/download/v1.11.0/ninja-win.zip",
patch = function()
run:execute(UNZIP .. " -qq ninja-win.zip")
end
},

-- JOM
{
type = "GET",
name = "jom-windows",
os = "windows",
url = "http://download.qt.io/official_releases/jom/jom.zip",
patch = function()
run:execute(UNZIP .. " -qq jom.zip")
end
},

-- Lemon
{
type = "GIT",
Expand Down

0 comments on commit 9eceb83

Please sign in to comment.