From 5f145451b6ef751d48a03d0c72f2d6a1dce73c8c Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sun, 20 Oct 2013 15:30:53 +0300 Subject: [PATCH] Change build output to /{x32,x64}-{Debug,Release}/ instead of /TestBench/{x32,x64}/{Debug,Release}/ This additionally changes the intermediate directory to /{x32,x64}-{Debug,Release}/Obj/ to avoid cluttering the working tree. --- .gitignore | 5 ++- Application/Application.vcxproj | 36 +++++-------------- Build/Build.bat | 10 +++--- Build/Installer/Installer.nsi | 12 +++---- Plugins/API/DllExporter/DllExporter.csproj | 8 ----- .../PluginInputText/PluginInputText.csproj | 8 ++--- Rainmeter.props | 12 +++---- SkinInstaller/SkinInstaller.vcxproj | 4 --- 8 files changed, 29 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index f8e2e4b2..920c8d61 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ -/Build/Runtime /TestBench /ipch bin obj -x32 -x64 +x32* +x64* Certificate.bat *.aps *.docstates diff --git a/Application/Application.vcxproj b/Application/Application.vcxproj index 12a8d140..d5b3e3ca 100644 --- a/Application/Application.vcxproj +++ b/Application/Application.vcxproj @@ -27,13 +27,8 @@ Shlwapi.lib;%(AdditionalDependencies) - if exist ..\testbench\x32\debug\Skins goto skip -mkdir ..\testbench\x32\debug\Skins -if not exist ..\testbench\x32\debug\Layouts (mkdir ..\testbench\x32\debug\Layouts) -echo "Copying skins..." -xcopy /Q /S /Y ..\Build\Skins ..\testbench\x32\debug\Skins -xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\Layouts -:skip + if not exist "$(OutDir)Skins" xcopy /Q /S /Y ..\Build\Skins "$(OutDir)Skins\" +if not exist "$(OutDir)Layouts" xcopy /Q /S /Y ..\Build\Themes "$(OutDir)Layouts\" Application.manifest @@ -51,13 +46,8 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\Layouts Shlwapi.lib;%(AdditionalDependencies) - if exist ..\testbench\x64\debug\Skins goto skip -mkdir ..\testbench\x64\debug\Skins -if not exist ..\testbench\x64\debug\Layouts (mkdir ..\testbench\x64\debug\Layouts) -echo "Copying skins..." -xcopy /Q /S /Y ..\Build\Skins ..\testbench\x64\debug\Skins -xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\Layouts -:skip + if not exist "$(OutDir)Skins" xcopy /Q /S /Y ..\Build\Skins "$(OutDir)Skins\" +if not exist "$(OutDir)Layouts" xcopy /Q /S /Y ..\Build\Themes "$(OutDir)Layouts\" Application.manifest @@ -79,13 +69,8 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\Layouts Shlwapi.lib;%(AdditionalDependencies) - if exist ..\testbench\x32\release\Skins goto skip -mkdir ..\testbench\x32\release\Skins -if not exist ..\testbench\x32\release\Layouts (mkdir ..\testbench\x32\release\Layouts) -echo "Copying skins..." -xcopy /Q /S /Y ..\Build\Skins ..\testbench\x32\release\Skins -xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\Layouts -:skip + if not exist "$(OutDir)Skins" xcopy /Q /S /Y ..\Build\Skins "$(OutDir)Skins\" +if not exist "$(OutDir)Layouts" xcopy /Q /S /Y ..\Build\Themes "$(OutDir)Layouts\" Application.manifest @@ -108,13 +93,8 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\Layouts Shlwapi.lib;%(AdditionalDependencies) - if exist ..\testbench\x64\release\Skins goto skip -mkdir ..\testbench\x64\release\Skins -if not exist ..\testbench\x64\release\Layouts (mkdir ..\testbench\x64\release\Layouts) -echo "Copying skins..." -xcopy /Q /S /Y ..\Build\Skins ..\testbench\x64\release\Skins -xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\release\Layouts -:skip + if not exist "$(OutDir)Skins" xcopy /Q /S /Y ..\Build\Skins "$(OutDir)Skins\" +if not exist "$(OutDir)Layouts" xcopy /Q /S /Y ..\Build\Themes "$(OutDir)Layouts\" Application.manifest diff --git a/Build/Build.bat b/Build/Build.bat index 5a40fba0..b281ea3a 100644 --- a/Build/Build.bat +++ b/Build/Build.bat @@ -116,9 +116,9 @@ for /f "tokens=1,2,3 delims=," %%a in (..\Language\List) do ( echo #include "English.h"> "..\Language\Language.rc" echo #include "Resource.rc">> "..\Language\Language.rc" if "%1" == "BUILDLANGUAGES" ( - xcopy /Q /S /Y ..\TestBench\x32\Release\Languages\*.dll ..\TestBench\x64\Release\Languages\ > nul - xcopy /Q /S /Y ..\TestBench\x32\Release\Languages\*.dll ..\TestBench\x32\Debug\Languages\ > nul - xcopy /Q /S /Y ..\TestBench\x32\Release\Languages\*.dll ..\TestBench\x64\Debug\Languages\ > nul + xcopy /Q /S /Y ..\x32-Release\Languages\*.dll ..\x64-Release\Languages\ > nul + xcopy /Q /S /Y ..\x32-Release\Release\Languages\*.dll ..\x32-Debug\Languages\ > nul + xcopy /Q /S /Y ..\x32-Release\Release\Languages\*.dll ..\x64-Debug\Languages\ > nul if exist "BuildLog.txt" del "BuildLog.txt" goto END ) @@ -127,9 +127,9 @@ if "%1" == "BUILDLANGUAGES" ( if not "%CERTFILE%" == "" ( echo * Signing binaries for %%Z in (Rainmeter.dll Rainmeter.exe SkinInstaller.exe SkinInstaller.dll) do ( - %SIGNTOOL% ..\TestBench\x32\Release\%%Z > BuildLog.txt + %SIGNTOOL% ..\x32-Release\%%Z > BuildLog.txt if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Signing x32\%%Z failed & goto END - %SIGNTOOL% ..\TestBench\x64\Release\%%Z > BuildLog.txt + %SIGNTOOL% ..\x64-Release\%%Z > BuildLog.txt if not %ERRORLEVEL% == 0 echo ERROR %ERRORLEVEL%: Signing x64\%%Z failed & goto END ) ) diff --git a/Build/Installer/Installer.nsi b/Build/Installer/Installer.nsi index 852b00e9..e986e10f 100644 --- a/Build/Installer/Installer.nsi +++ b/Build/Installer/Installer.nsi @@ -507,13 +507,13 @@ FunctionEnd !macro InstallFiles DIR ARCH SetOutPath "$INSTDIR" - File "..\..\TestBench\${DIR}\Release\Rainmeter.exe" - File "..\..\TestBench\${DIR}\Release\Rainmeter.dll" - File "..\..\TestBench\${DIR}\Release\SkinInstaller.exe" - File "..\..\TestBench\${DIR}\Release\SkinInstaller.dll" + File "..\..\${DIR}-Release\Rainmeter.exe" + File "..\..\${DIR}-Release\Rainmeter.dll" + File "..\..\${DIR}-Release\SkinInstaller.exe" + File "..\..\${DIR}-Release\SkinInstaller.dll" SetOutPath "$INSTDIR\Plugins" - File /x *Example*.dll "..\..\TestBench\${DIR}\Release\Plugins\*.dll" + File /x *Example*.dll "..\..\${DIR}-Release\Plugins\*.dll" SetOutPath "$INSTDIR\Runtime" File "$%VS110COMNTOOLS%..\..\VC\redist\${ARCH}\Microsoft.VC110.CRT\msvcp110.dll" @@ -670,7 +670,7 @@ SkipIniMove: RMDir /r "$INSTDIR\Languages" SetOutPath "$INSTDIR\Languages" - File "..\..\TestBench\x32\Release\Languages\*.*" + File "..\..\x32-Release\Languages\*.*" SetOutPath "$INSTDIR\Defaults\Skins" RMDir /r "$INSTDIR\Skins\illustro" diff --git a/Plugins/API/DllExporter/DllExporter.csproj b/Plugins/API/DllExporter/DllExporter.csproj index 6b74c8af..b0628af5 100644 --- a/Plugins/API/DllExporter/DllExporter.csproj +++ b/Plugins/API/DllExporter/DllExporter.csproj @@ -38,8 +38,6 @@ prompt 4 1607 - Program - TestBench\x32\Debug\Rainmeter.exe x86 @@ -50,8 +48,6 @@ prompt 4 1607 - Program - TestBench\x32\Release\Rainmeter.exe OnOutputUpdated @@ -64,8 +60,6 @@ x64 prompt 1607 - Program - TestBench\x64\Debug\Rainmeter.exe bin\x64\Release\ @@ -75,8 +69,6 @@ x64 prompt 1607 - Program - TestBench\x64\Release\Rainmeter.exe diff --git a/Plugins/PluginInputText/PluginInputText.csproj b/Plugins/PluginInputText/PluginInputText.csproj index 903d8a51..9167e764 100644 --- a/Plugins/PluginInputText/PluginInputText.csproj +++ b/Plugins/PluginInputText/PluginInputText.csproj @@ -35,7 +35,7 @@ true full false - $(SolutionDir)TestBench\x32\Debug\Plugins\ + $(SolutionDir)x32-Debug\Plugins\ TRACE;DEBUG prompt 4 @@ -46,7 +46,7 @@ none true - $(SolutionDir)TestBench\x32\Release\Plugins\ + $(SolutionDir)x32-Release\Plugins\ TRACE prompt 4 @@ -56,7 +56,7 @@ true - $(SolutionDir)TestBench\x64\Debug\Plugins\ + $(SolutionDir)x64-Debug\Plugins\ TRACE;DEBUG;X64 true full @@ -65,7 +65,7 @@ 1607 - $(SolutionDir)TestBench\x64\Release\Plugins\ + $(SolutionDir)x64-Release\Plugins\ TRACE;X64 true true diff --git a/Rainmeter.props b/Rainmeter.props index bd92bb1c..2a824e21 100644 --- a/Rainmeter.props +++ b/Rainmeter.props @@ -15,14 +15,10 @@ true - - $(SolutionDir)TestBench\x32\$(Configuration)\ - .\x32\$(Configuration)\ - - - - $(SolutionDir)TestBench\x64\$(Configuration)\ - .\x64\$(Configuration)\ + + $(SolutionDir)x32-$(Configuration)\ + $(SolutionDir)x64-$(Configuration)\ + $(OutDir)\Obj\$(ProjectName)\ diff --git a/SkinInstaller/SkinInstaller.vcxproj b/SkinInstaller/SkinInstaller.vcxproj index 5f0d0b3b..675426b3 100644 --- a/SkinInstaller/SkinInstaller.vcxproj +++ b/SkinInstaller/SkinInstaller.vcxproj @@ -19,12 +19,8 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)TestBench\x32\$(Configuration)\ - $(SolutionDir)TestBench\x64\$(Configuration)\ .\x32\$(Configuration)\ .\x64\$(Configuration)\ - $(SolutionDir)TestBench\x32\$(Configuration)\ - $(SolutionDir)TestBench\x64\$(Configuration)\ .\x32\$(Configuration)\ .\x64\$(Configuration)\ true