Skip to content

Commit

Permalink
stripped down the make dist script on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
TobiasKozel committed Mar 28, 2020
1 parent 1a4b921 commit bcf25fd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 97 deletions.
10 changes: 0 additions & 10 deletions guitard.sln
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,11 @@ Global
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.ActiveCfg = Debug|x64
{41785AE4-5B70-4A75-880B-4B418B4E13C6}.Tracer|x64.Build.0 = Debug|x64
{2EB4846A-93E0-43A0-821E-12237105168F}.Debug|Win32.ActiveCfg = Debug|Win32
{2EB4846A-93E0-43A0-821E-12237105168F}.Debug|Win32.Build.0 = Debug|Win32
{2EB4846A-93E0-43A0-821E-12237105168F}.Debug|x64.ActiveCfg = Debug|x64
{2EB4846A-93E0-43A0-821E-12237105168F}.Debug|x64.Build.0 = Debug|x64
{2EB4846A-93E0-43A0-821E-12237105168F}.Release|Win32.ActiveCfg = Release|Win32
{2EB4846A-93E0-43A0-821E-12237105168F}.Release|Win32.Build.0 = Release|Win32
{2EB4846A-93E0-43A0-821E-12237105168F}.Release|x64.ActiveCfg = Release|x64
{2EB4846A-93E0-43A0-821E-12237105168F}.Release|x64.Build.0 = Release|x64
{2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|Win32.ActiveCfg = Debug|Win32
{2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|Win32.Build.0 = Debug|Win32
{2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|x64.ActiveCfg = Debug|x64
{2EB4846A-93E0-43A0-821E-12237105168F}.Tracer|x64.Build.0 = Debug|x64
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|Win32.ActiveCfg = Debug|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|Win32.Build.0 = Debug|Win32
{079FC65A-F0E5-4E97-B318-A16D1D0B89DF}.Debug|x64.ActiveCfg = Debug|x64
Expand All @@ -60,13 +54,9 @@ Global
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|Win32.ActiveCfg = Debug|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Debug|x64.ActiveCfg = Debug|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.ActiveCfg = Release|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|Win32.Build.0 = Release|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.ActiveCfg = Release|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Release|x64.Build.0 = Release|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.ActiveCfg = Debug|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|Win32.Build.0 = Debug|Win32
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.ActiveCfg = Debug|x64
{DC4B5920-933D-4C82-B842-F34431D55A93}.Tracer|x64.Build.0 = Debug|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion scripts/compile_faust.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cwd = os.getcwd()
outFolder = os.path.join(cwd, "src/main/faust/generated")
rootFolder = "guitard"
baseCommand = "faust -i -single -scn FaustHeadlessDsp -a "
baseCommand = "faust -i -double -scn FaustHeadlessDsp -a "
baseCommand += os.path.join(cwd, "src/main/faust/FaustArchitecture.cpp")

for root, dirs, files in os.walk(cwd):
Expand Down
88 changes: 2 additions & 86 deletions scripts/makedist-win.bat
Original file line number Diff line number Diff line change
@@ -1,102 +1,18 @@
echo off

REM - batch file to build MSVS project and zip the resulting binaries (or make installer)
REM - updating version numbers requires python and python path added to %PATH% env variable
REM - zipping requires 7zip in %ProgramFiles%\7-Zip\7z.exe
REM - building installer requires innotsetup in "%ProgramFiles(x86)%\Inno Setup 5\iscc"
REM - AAX codesigning requires wraptool tool added to %PATH% env variable and aax.key/.crt in .\..\..\..\Certificates\

if %1 == 1 (echo Making GuitarD Windows DEMO VERSION distribution ...) else (echo Making GuitarD Windows FULL VERSION distribution ...)

echo "touching source"

copy /b ..\*.cpp+,,

echo ------------------------------------------------------------------
echo Updating version numbers ...

call python prepare_resources-win.py %1
call python update_installer_version.py %1

cd ..\

echo ------------------------------------------------------------------
echo Building ...

if exist "%ProgramFiles(x86)%" (goto 64-Bit) else (goto 32-Bit)

if not defined DevEnvDir (
:32-Bit
echo 32-Bit O/S detected
call "%ProgramFiles%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_x64
goto END

:64-Bit
echo 64-Bit Host O/S detected
call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x86_x64
goto END
:END
)


REM - set preprocessor macros like this, for instance to enable demo build:
if %1 == 1 (
set CMDLINE_DEFINES="DEMO_VERSION=1"
REM -copy ".\resources\img\AboutBox_Demo.png" ".\resources\img\AboutBox.png"
) else (
set CMDLINE_DEFINES="DEMO_VERSION=0"
REM -copy ".\resources\img\AboutBox_Registered.png" ".\resources\img\AboutBox.png"
)

REM - Could build individual targets like this:
REM - msbuild GuitarD-app.vcxproj /p:configuration=release /p:platform=win32

echo Building 32 bit binaries...
msbuild GuitarD.sln /p:configuration=release /p:platform=win32 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly

echo Building 64 bit binaries...
msbuild GuitarD.sln /p:configuration=release /p:platform=x64 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly;append

REM --echo Copying AAX Presets

REM --echo ------------------------------------------------------------------
REM --echo Code sign AAX binary...
REM --info at pace central, login via iLok license manager https://www.paceap.com/pace-central.html
REM --wraptool sign --verbose --account XXXXX --wcguid XXXXX --keyfile XXXXX.p12 --keypassword XXXXX --in .\build-win\aax\bin\GuitarD.aaxplugin\Contents\Win32\GuitarD.aaxplugin --out .\build-win\aax\bin\GuitarD.aaxplugin\Contents\Win32\GuitarD.aaxplugin
REM --wraptool sign --verbose --account XXXXX --wcguid XXXXX --keyfile XXXXX.p12 --keypassword XXXXX --in .\build-win\aax\bin\GuitarD.aaxplugin\Contents\x64\GuitarD.aaxplugin --out .\build-win\aax\bin\GuitarD.aaxplugin\Contents\x64\GuitarD.aaxplugin

REM - Make Installer (InnoSetup)
msbuild guitard.sln /p:configuration=release /p:platform=x64 /nologo /verbosity:minimal /fileLogger /m /flp:logfile=build-win.log;errorsonly;append

echo ------------------------------------------------------------------
echo Making Installer ...

if exist "%ProgramFiles(x86)%" (goto 64-Bit-is) else (goto 32-Bit-is)

:32-Bit-is
"%ProgramFiles%\Inno Setup 5\iscc" /Q /cc ".\installer\GuitarD.iss"
goto END-is

:64-Bit-is
"%ProgramFiles(x86)%\Inno Setup 5\iscc" /Q /cc ".\installer\GuitarD.iss"
goto END-is

:END-is

REM - Codesign Installer for Windows 8+
REM -"C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe" sign /f "XXXXX.p12" /p XXXXX /d "GuitarD Installer" ".\installer\GuitarD Installer.exe"

REM -if %1 == 1 (
REM -copy ".\installer\GuitarD Installer.exe" ".\installer\GuitarD Demo Installer.exe"
REM -del ".\installer\GuitarD Installer.exe"
REM -)

REM - ZIP
echo ------------------------------------------------------------------
echo Making Zip File ...

call python scripts\make_zip.py %1

echo ------------------------------------------------------------------
echo Printing log file to console...

type build-win.log
"%ProgramFiles(x86)%\Inno Setup 6\iscc" /Q ".\installer\GuitarD.iss"

0 comments on commit bcf25fd

Please sign in to comment.