Skip to content

Commit 8fee436

Browse files
ge0rdige0rdi
committed
Build: Change output paths
All output (and intermediate) files will go to folder outside of source tree.
1 parent 9f949dd commit 8fee436

File tree

11 files changed

+69
-77
lines changed

11 files changed

+69
-77
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ ASALocalRun/
349349
*.PVS-Studio.*
350350

351351
# Classic-Shell specific ignores
352-
Src/StartMenu/Skins/
353352
Src/Setup/Output/
354353
Src/Setup/Final/
355354
Src/Setup/Temp/

‎Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
<Import Project="..\..\Common.props" />
3636
</ImportGroup>
3737
<PropertyGroup Label="UserMacros" />
38-
<PropertyGroup Condition="'$(Platform)'=='Win32'">
39-
<OutDir>..\$(Configuration)\</OutDir>
40-
</PropertyGroup>
4138
<ItemDefinitionGroup>
4239
<ClCompile>
4340
<PrecompiledHeader>NotUsing</PrecompiledHeader>

‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@
4848
</ImportGroup>
4949
<PropertyGroup Label="UserMacros" />
5050
<PropertyGroup Condition="'$(Platform)'=='Win32'">
51-
<OutDir>..\$(Configuration)\</OutDir>
5251
<TargetName>$(ProjectName)_32</TargetName>
5352
</PropertyGroup>
5453
<PropertyGroup Condition="'$(Platform)'=='x64'">
55-
<OutDir>..\$(Configuration)64\</OutDir>
5654
<TargetName>$(ProjectName)_64</TargetName>
5755
</PropertyGroup>
5856
<ItemDefinitionGroup>

‎Src/Common.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
<!-- Output paths -->
1111
<PropertyGroup Condition="'$(Platform)'=='Win32'">
12-
<OutDir>$(Configuration)\</OutDir>
13-
<IntDir>$(Configuration)\</IntDir>
12+
<OutDir>$(MSBuildThisFileDirectory)..\build\bin\$(Configuration)\</OutDir>
13+
<IntDir>$(MSBuildThisFileDirectory)..\build\obj\$(ProjectName)\$(Configuration)\</IntDir>
1414
</PropertyGroup>
1515
<PropertyGroup Condition="'$(Platform)'=='x64'">
16-
<OutDir>$(Configuration)64\</OutDir>
17-
<IntDir>$(Configuration)64\</IntDir>
16+
<OutDir>$(MSBuildThisFileDirectory)..\build\bin\$(Configuration)64\</OutDir>
17+
<IntDir>$(MSBuildThisFileDirectory)..\build\obj\$(ProjectName)\$(Configuration)64\</IntDir>
1818
</PropertyGroup>
1919

2020
<!-- Common settings for all configurations -->

‎Src/Lib/Lib.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
<Import Project="..\Common.props" />
4040
</ImportGroup>
4141
<PropertyGroup Label="UserMacros" />
42+
<PropertyGroup>
43+
<OutDir>$(IntDir)</OutDir>
44+
</PropertyGroup>
4245
<ItemDefinitionGroup>
4346
<ClCompile>
4447
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎Src/Setup/BuildBinaries.bat

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -19,98 +19,98 @@ echo --- 32bit
1919

2020
REM ********* Make en-US.dll
2121
cd ..
22-
Setup\Utility\Release\Utility.exe makeEN ClassicExplorer\Setup\ClassicExplorer32.dll StartMenu\Setup\StartMenuDLL.dll ClassicIE\Setup\ClassicIEDLL_32.dll Update\Release\Update.exe
22+
..\build\bin\Release\Utility.exe makeEN ..\build\bin\Setup\ClassicExplorer32.dll ..\build\bin\Setup\StartMenuDLL.dll ..\build\bin\Setup\ClassicIEDLL_32.dll ..\build\bin\Release\Update.exe
2323
@if ERRORLEVEL 1 exit /b 1
2424

25-
Setup\Utility\Release\Utility.exe extract en-US.dll en-US.csv
26-
copy /B en-US.dll Localization\English > nul
25+
..\build\bin\Release\Utility.exe extract en-US.dll en-US.csv
26+
move en-US.dll Localization\English > nul
2727
move en-US.csv Localization\English > nul
2828

2929
cd Setup
3030

3131

3232
REM ********* Copy binaries
3333

34-
copy /B ..\ClassicExplorer\Setup\ClassicExplorer32.dll Output > nul
35-
copy /B ..\ClassicExplorer\Setup\ClassicExplorerSettings.exe Output > nul
36-
copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.dll Output > nul
37-
copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul
38-
copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul
39-
copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul
40-
copy /B ..\Update\Release\Update.exe Output > nul
41-
copy /B ..\Update\DesktopToasts\Release\DesktopToasts.dll Output > nul
42-
copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul
43-
copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul
44-
45-
copy /B ..\ClassicExplorer\Setup64\ClassicExplorer64.dll Output\x64 > nul
46-
copy /B ..\ClassicIE\Setup64\ClassicIEDLL_64.dll Output\x64 > nul
47-
copy /B ..\ClassicIE\Setup64\ClassicIE_64.exe Output\x64 > nul
48-
copy /B ..\StartMenu\Setup64\StartMenu.exe Output\x64 > nul
49-
copy /B ..\StartMenu\Setup64\StartMenuDLL.dll Output\x64 > nul
50-
copy /B ..\StartMenu\StartMenuHelper\Setup64\StartMenuHelper64.dll Output\x64 > nul
51-
52-
copy /B "..\StartMenu\Skins\Classic Skin.skin" Output > nul
53-
copy /B "..\StartMenu\Skins\Full Glass.skin" Output > nul
54-
copy /B "..\StartMenu\Skins\Smoked Glass.skin" Output > nul
55-
copy /B "..\StartMenu\Skins\Windows Aero.skin" Output > nul
56-
copy /B "..\StartMenu\Skins\Windows Basic.skin" Output > nul
57-
copy /B "..\StartMenu\Skins\Windows XP Luna.skin" Output > nul
58-
copy /B "..\StartMenu\Skins\Windows 8.skin" Output > nul
59-
copy /B "..\StartMenu\Skins\Metro.skin" Output > nul
60-
copy /B "..\StartMenu\Skins\Classic Skin.skin7" Output > nul
61-
copy /B "..\StartMenu\Skins\Windows Aero.skin7" Output > nul
62-
copy /B "..\StartMenu\Skins\Windows 8.skin7" Output > nul
63-
copy /B "..\StartMenu\Skins\Midnight.skin7" Output > nul
64-
copy /B "..\StartMenu\Skins\Metro.skin7" Output > nul
65-
copy /B "..\StartMenu\Skins\Metallic.skin7" Output > nul
66-
copy /B "..\StartMenu\Skins\Immersive.skin" Output > nul
67-
copy /B "..\StartMenu\Skins\Immersive.skin7" Output > nul
34+
copy /B ..\..\build\bin\Setup\ClassicExplorer32.dll Output > nul
35+
copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.exe Output > nul
36+
copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.dll Output > nul
37+
copy /B ..\..\build\bin\Setup\ClassicIE_32.exe Output > nul
38+
copy /B ..\..\build\bin\Setup\StartMenu.exe Output > nul
39+
copy /B ..\..\build\bin\Setup\StartMenuDLL.dll Output > nul
40+
copy /B ..\..\build\bin\Setup\StartMenuHelper32.dll Output > nul
41+
copy /B ..\..\build\bin\Release\Update.exe Output > nul
42+
copy /B ..\..\build\bin\Release\DesktopToasts.dll Output > nul
43+
copy /B ..\..\build\bin\Release\SetupHelper.exe Output > nul
44+
45+
copy /B ..\..\build\bin\Setup64\ClassicExplorer64.dll Output\x64 > nul
46+
copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.dll Output\x64 > nul
47+
copy /B ..\..\build\bin\Setup64\ClassicIE_64.exe Output\x64 > nul
48+
copy /B ..\..\build\bin\Setup64\StartMenu.exe Output\x64 > nul
49+
copy /B ..\..\build\bin\Setup64\StartMenuDLL.dll Output\x64 > nul
50+
copy /B ..\..\build\bin\Setup64\StartMenuHelper64.dll Output\x64 > nul
51+
52+
copy /B "..\..\build\bin\Skins\Classic Skin.skin" Output > nul
53+
copy /B "..\..\build\bin\Skins\Full Glass.skin" Output > nul
54+
copy /B "..\..\build\bin\Skins\Smoked Glass.skin" Output > nul
55+
copy /B "..\..\build\bin\Skins\Windows Aero.skin" Output > nul
56+
copy /B "..\..\build\bin\Skins\Windows Basic.skin" Output > nul
57+
copy /B "..\..\build\bin\Skins\Windows XP Luna.skin" Output > nul
58+
copy /B "..\..\build\bin\Skins\Windows 8.skin" Output > nul
59+
copy /B "..\..\build\bin\Skins\Metro.skin" Output > nul
60+
copy /B "..\..\build\bin\Skins\Classic Skin.skin7" Output > nul
61+
copy /B "..\..\build\bin\Skins\Windows Aero.skin7" Output > nul
62+
copy /B "..\..\build\bin\Skins\Windows 8.skin7" Output > nul
63+
copy /B "..\..\build\bin\Skins\Midnight.skin7" Output > nul
64+
copy /B "..\..\build\bin\Skins\Metro.skin7" Output > nul
65+
copy /B "..\..\build\bin\Skins\Metallic.skin7" Output > nul
66+
copy /B "..\..\build\bin\Skins\Immersive.skin" Output > nul
67+
copy /B "..\..\build\bin\Skins\Immersive.skin7" Output > nul
6868

6969

7070
REM ********* Collect debug info
7171
md Output\PDB32
7272
md Output\PDB64
7373

7474
REM Explorer 32
75-
copy /B ..\ClassicExplorer\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
75+
copy /B ..\..\build\bin\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
7676
copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
77-
copy /B ..\ClassicExplorer\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
77+
copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
7878
copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
7979

8080
REM Explorer 64
81-
copy /B ..\ClassicExplorer\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
81+
copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
8282
copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
8383

8484
REM IE 32
85-
copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
85+
copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
8686
copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
87-
copy /B ..\ClassicIE\Setup\ClassicIE_32.pdb Output\PDB32 > nul
87+
copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
8888
copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
8989

9090
REM IE 64
91-
copy /B ..\ClassicIE\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
91+
copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
9292
copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
93-
copy /B ..\ClassicIE\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
93+
copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
9494
copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
9595

9696
REM Menu 32
97-
copy /B ..\StartMenu\Setup\StartMenu.pdb Output\PDB32 > nul
97+
copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
9898
copy /B Output\StartMenu.exe Output\PDB32 > nul
99-
copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul
99+
copy /B ..\..\build\bin\Setup\StartMenuDLL.pdb Output\PDB32 > nul
100100
copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
101-
copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
101+
copy /B ..\..\build\bin\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
102102
copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
103-
copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul
103+
copy /B ..\..\build\bin\Release\Update.pdb Output\PDB32 > nul
104104
copy /B Output\Update.exe Output\PDB32 > nul
105-
copy /B ..\Update\DesktopToasts\Release\DesktopToasts.pdb Output\PDB32 > nul
105+
copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
106106
copy /B Output\DesktopToasts.dll Output\PDB32 > nul
107107

108108
REM Menu 64
109-
copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul
109+
copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
110110
copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
111-
copy /B ..\StartMenu\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
111+
copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
112112
copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
113-
copy /B ..\StartMenu\StartMenuHelper\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
113+
copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
114114
copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
115115

116116

@@ -157,11 +157,11 @@ if exist Output\PolicyDefinitions.zip (
157157
del Output\PolicyDefinitions.zip
158158
)
159159
cd ..\Localization\English
160-
..\..\StartMenu\Setup\StartMenu.exe -saveadmx en-US
160+
..\..\..\build\bin\Setup\StartMenu.exe -saveadmx en-US
161161
@if ERRORLEVEL 1 exit /b 1
162-
..\..\ClassicExplorer\Setup\ClassicExplorerSettings.exe -saveadmx en-US
162+
..\..\..\build\bin\Setup\ClassicExplorerSettings.exe -saveadmx en-US
163163
@if ERRORLEVEL 1 exit /b 1
164-
..\..\ClassicIE\Setup\ClassicIE_32.exe -saveadmx en-US
164+
..\..\..\build\bin\Setup\ClassicIE_32.exe -saveadmx en-US
165165
@if ERRORLEVEL 1 exit /b 1
166166
md en-US
167167
copy /B *.adml en-US > nul

‎Src/Setup/BuildInstaller.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ light Temp\Setup64.wixobj -nologo -out Temp\Setup64.msi -ext WixUIExtension -ext
6060

6161
REM ********* Build MSI Checksums
6262
echo --- MSI Checksums
63-
Utility\Release\Utility.exe crcmsi Temp
63+
..\..\build\bin\Release\Utility.exe crcmsi Temp
6464
@if ERRORLEVEL 1 exit /b 1
6565

6666
REM ********* Build bootstrapper
@@ -73,10 +73,10 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio
7373
if exist Final rd /Q /S Final
7474
md Final
7575

76-
copy /B Release\Setup.exe Final\%CS_INSTALLER_NAME%.exe > nul
76+
copy /B ..\..\build\bin\Release\Setup.exe Final\%CS_INSTALLER_NAME%.exe > nul
7777

7878
if defined APPVEYOR (
79-
appveyor PushArtifact Release\Setup.exe -FileName %CS_INSTALLER_NAME%.exe
79+
appveyor PushArtifact Final\%CS_INSTALLER_NAME%.exe
8080
)
8181

8282
SET CS_LANG_FOLDER=

‎Src/Setup/Utility/Utility.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ END
5252
// FILE
5353
//
5454

55-
1 FILE "Release64\\Utility.exe"
55+
1 FILE "..\\..\\..\\build\\bin\\Release64\\Utility.exe"
5656

5757
/////////////////////////////////////////////////////////////////////////////
5858
//

‎Src/Setup/en-US/en-US.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<PropertyGroup Label="UserMacros" />
2727
<PropertyGroup>
2828
<OutDir>..\..\</OutDir>
29+
<IntDir>..\..\..\build\obj\$(ProjectName)\</IntDir>
2930
<IgnoreImportLibrary>true</IgnoreImportLibrary>
3031
<LinkIncremental>false</LinkIncremental>
3132
</PropertyGroup>

‎Src/Skins/Skin.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<OutDir>$(SolutionDir)StartMenu\Skins\</OutDir>
5-
<IntDir>$(Configuration)\</IntDir>
4+
<OutDir>$(MSBuildThisFileDirectory)..\..\build\bin\Skins\</OutDir>
5+
<IntDir>$(MSBuildThisFileDirectory)..\..\build\obj\Skins\$(ProjectName)\</IntDir>
66
<IgnoreImportLibrary>true</IgnoreImportLibrary>
77
<LinkIncremental>false</LinkIncremental>
88
<ReadOnlyProject>true</ReadOnlyProject>

0 commit comments

Comments
 (0)