From 3b61b53fd12d7874606475ab78995a413a01df70 Mon Sep 17 00:00:00 2001 From: Scott Graves Date: Fri, 24 Mar 2017 12:07:57 -0500 Subject: [PATCH] Build fixes --- Seeds.txt | 2 +- SiaDrive_Debug_Packager.iss | 1 - SiaDrive_Release_Packager.iss | 1 - build.cmd | 10 +++++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Seeds.txt b/Seeds.txt index 24299a8..d130748 100644 --- a/Seeds.txt +++ b/Seeds.txt @@ -1,4 +1,4 @@ - Work Laptop +Work Laptop vitals thirsty tattoo unjustly already lexicon ruthless rated skater voyage avoid jeers aunt tawny richly glass menu kidneys went wounded wounded trendy towel lipstick raking bacon dozen blip aggravate Home Laptop diff --git a/SiaDrive_Debug_Packager.iss b/SiaDrive_Debug_Packager.iss index ecd713e..7a06503 100644 --- a/SiaDrive_Debug_Packager.iss +++ b/SiaDrive_Debug_Packager.iss @@ -33,7 +33,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: ".\dist\Debug\siadrive.exe"; DestDir: "{app}"; Flags: ignoreversion Source: ".\dist\Debug\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files diff --git a/SiaDrive_Release_Packager.iss b/SiaDrive_Release_Packager.iss index 46c65a0..6a6a3b5 100644 --- a/SiaDrive_Release_Packager.iss +++ b/SiaDrive_Release_Packager.iss @@ -33,7 +33,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked [Files] -Source: ".\dist\Release\siadrive.exe"; DestDir: "{app}"; Flags: ignoreversion Source: ".\dist\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files diff --git a/build.cmd b/build.cmd index 50c29b1..536c7de 100644 --- a/build.cmd +++ b/build.cmd @@ -18,7 +18,15 @@ mkdir build\%TARGET_MODE% >NUL 2>&1 pushd build\%TARGET_MODE% >NUL 2>&1 (%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%TARGET_MODE% -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\%TARGET_MODE%" ..\..) && ( %CMAKE% --build . --config %TARGET_MODE%) && ( - %CMAKE% --build . --target install --config %TARGET_MODE% + %CMAKE% --build . --target install --config %TARGET_MODE% && ( + rd /s /q "%ROOT%dist\%TARGET_MODE%\config" + rd /s /q "%ROOT%dist\%TARGET_MODE%\htdocs\.idea" + del /q "%ROOT%dist\%TARGET_MODE%\*.log" + if "%TARGET_MODE%"=="Release" ( + del /q "%ROOT%dist\%TARGET_MODE%\*.lib" + del /q "%ROOT%dist\%TARGET_MODE%\*.pdb" + ) + ) ) popd