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.
2024-02-24 04:33:31 +00:00 · 2013-10-20 15:30:53 +03:00
parent cfd525c2fc
commit 5f145451b6
8 changed files with 29 additions and 66 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,9 @@
-/Build/Runtime
 /TestBench
 /ipch
 bin
 obj
-x32
-x64
+x32*
+x64*
 Certificate.bat
 *.aps
 *.docstates
--- a/Application/Application.vcxproj
+++ b/Application/Application.vcxproj
@@ -27,13 +27,8 @@
      <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <PostBuildEvent>
-      <Command>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</Command>
+      <Command>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\"</Command>
    </PostBuildEvent>
    <Manifest>
      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
@@ -51,13 +46,8 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\debug\Layouts
      <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <PostBuildEvent>
-      <Command>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</Command>
+      <Command>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\"</Command>
    </PostBuildEvent>
    <Manifest>
      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
@@ -79,13 +69,8 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x64\debug\Layouts
      <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <PostBuildEvent>
-      <Command>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</Command>
+      <Command>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\"</Command>
    </PostBuildEvent>
    <Manifest>
      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
@@ -108,13 +93,8 @@ xcopy /Q /S /Y ..\Build\Themes ..\testbench\x32\release\Layouts
      <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <PostBuildEvent>
-      <Command>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</Command>
+      <Command>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\"</Command>
    </PostBuildEvent>
    <Manifest>
      <AdditionalManifestFiles>Application.manifest</AdditionalManifestFiles>
--- 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
 	)
 )
--- 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"
--- a/Plugins/API/DllExporter/DllExporter.csproj
+++ b/Plugins/API/DllExporter/DllExporter.csproj
@@ -38,8 +38,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <NoWarn>1607</NoWarn>
-    <StartAction>Program</StartAction>
-    <StartProgram>TestBench\x32\Debug\Rainmeter.exe</StartProgram>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <PlatformTarget>x86</PlatformTarget>
@@ -50,8 +48,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <NoWarn>1607</NoWarn>
-    <StartAction>Program</StartAction>
-    <StartProgram>TestBench\x32\Release\Rainmeter.exe</StartProgram>
  </PropertyGroup>
  <PropertyGroup>
    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
@@ -64,8 +60,6 @@
    <PlatformTarget>x64</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <NoWarn>1607</NoWarn>
-    <StartAction>Program</StartAction>
-    <StartProgram>TestBench\x64\Debug\Rainmeter.exe</StartProgram>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <OutputPath>bin\x64\Release\</OutputPath>
@@ -75,8 +69,6 @@
    <PlatformTarget>x64</PlatformTarget>
    <ErrorReport>prompt</ErrorReport>
    <NoWarn>1607</NoWarn>
-    <StartAction>Program</StartAction>
-    <StartProgram>TestBench\x64\Release\Rainmeter.exe</StartProgram>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.Build.Utilities" />
--- a/Plugins/PluginInputText/PluginInputText.csproj
+++ b/Plugins/PluginInputText/PluginInputText.csproj
@@ -35,7 +35,7 @@
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)TestBench\x32\Debug\Plugins\</OutputPath>
+    <OutputPath>$(SolutionDir)x32-Debug\Plugins\</OutputPath>
    <DefineConstants>TRACE;DEBUG</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    <DebugType>none</DebugType>
    <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)TestBench\x32\Release\Plugins\</OutputPath>
+    <OutputPath>$(SolutionDir)x32-Release\Plugins\</OutputPath>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
@@ -56,7 +56,7 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)TestBench\x64\Debug\Plugins\</OutputPath>
+    <OutputPath>$(SolutionDir)x64-Debug\Plugins\</OutputPath>
    <DefineConstants>TRACE;DEBUG;X64</DefineConstants>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <DebugType>full</DebugType>
@@ -65,7 +65,7 @@
    <NoWarn>1607</NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>$(SolutionDir)TestBench\x64\Release\Plugins\</OutputPath>
+    <OutputPath>$(SolutionDir)x64-Release\Plugins\</OutputPath>
    <DefineConstants>TRACE;X64</DefineConstants>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <Optimize>true</Optimize>
--- a/Rainmeter.props
+++ b/Rainmeter.props
@@ -15,14 +15,10 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Platform)'=='Win32'">
-    <OutDir>$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir>
-    <IntDir>.\x32\$(Configuration)\</IntDir>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Platform)'=='x64'">
-    <OutDir>$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir>
-    <IntDir>.\x64\$(Configuration)\</IntDir>
+  <PropertyGroup>
+    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)x32-$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)x64-$(Configuration)\</OutDir>
+    <IntDir>$(OutDir)\Obj\$(ProjectName)\</IntDir>
  </PropertyGroup>

  <PropertyGroup>
--- a/SkinInstaller/SkinInstaller.vcxproj
+++ b/SkinInstaller/SkinInstaller.vcxproj
@@ -19,12 +19,8 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\x32\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\x64\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)TestBench\x32\$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)TestBench\x64\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\x32\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\x64\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>