timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-04-17 13:23:04 +10:00
Code Issues Packages Projects Releases Wiki Activity

Build: Change output paths

Browse Source 
All output (and intermediate) files will go to folder outside of source tree.
This commit is contained in:
ge0rdi
2023-06-09 17:52:19 +02:00
parent 9f949dd99b
commit 8fee436996
11 changed files with 67 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -349,7 +349,6 @@ ASALocalRun/
*.PVS-Studio.* *.PVS-Studio.*
# Classic-Shell specific ignores # Classic-Shell specific ignores
Src/StartMenu/Skins/
Src/Setup/Output/ Src/Setup/Output/
Src/Setup/Final/ Src/Setup/Final/
Src/Setup/Temp/ Src/Setup/Temp/

3
Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj
View File

@@ -35,9 +35,6 @@
<Import Project="..\..\Common.props" /> <Import Project="..\..\Common.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Platform)'=='Win32'">
<OutDir>..\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>

2
Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj
View File

@@ -48,11 +48,9 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Platform)'=='Win32'"> <PropertyGroup Condition="'$(Platform)'=='Win32'">
<OutDir>..\$(Configuration)\</OutDir>
<TargetName>$(ProjectName)_32</TargetName> <TargetName>$(ProjectName)_32</TargetName>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'"> <PropertyGroup Condition="'$(Platform)'=='x64'">
<OutDir>..\$(Configuration)64\</OutDir>
<TargetName>$(ProjectName)_64</TargetName> <TargetName>$(ProjectName)_64</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>

8
Src/Common.props
View File

@@ -9,12 +9,12 @@
<!-- Output paths --> <!-- Output paths -->
<PropertyGroup Condition="'$(Platform)'=='Win32'"> <PropertyGroup Condition="'$(Platform)'=='Win32'">
<OutDir>$(Configuration)\</OutDir> <OutDir>$(MSBuildThisFileDirectory)..\build\bin\$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir> <IntDir>$(MSBuildThisFileDirectory)..\build\obj\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'"> <PropertyGroup Condition="'$(Platform)'=='x64'">
<OutDir>$(Configuration)64\</OutDir> <OutDir>$(MSBuildThisFileDirectory)..\build\bin\$(Configuration)64\</OutDir>
<IntDir>$(Configuration)64\</IntDir> <IntDir>$(MSBuildThisFileDirectory)..\build\obj\$(ProjectName)\$(Configuration)64\</IntDir>
</PropertyGroup> </PropertyGroup>
<!-- Common settings for all configurations --> <!-- Common settings for all configurations -->

3
Src/Lib/Lib.vcxproj
View File

@@ -39,6 +39,9 @@
<Import Project="..\Common.props" /> <Import Project="..\Common.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup>
<OutDir>$(IntDir)</OutDir>
</PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>

106
Src/Setup/BuildBinaries.bat
View File

@@ -19,11 +19,11 @@ echo --- 32bit
REM ********* Make en-US.dll REM ********* Make en-US.dll
cd .. cd ..
Setup\Utility\Release\Utility.exe makeEN ClassicExplorer\Setup\ClassicExplorer32.dll StartMenu\Setup\StartMenuDLL.dll ClassicIE\Setup\ClassicIEDLL_32.dll Update\Release\Update.exe ..\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
@if ERRORLEVEL 1 exit /b 1 @if ERRORLEVEL 1 exit /b 1
Setup\Utility\Release\Utility.exe extract en-US.dll en-US.csv ..\build\bin\Release\Utility.exe extract en-US.dll en-US.csv
copy /B en-US.dll Localization\English > nul move en-US.dll Localization\English > nul
move en-US.csv Localization\English > nul move en-US.csv Localization\English > nul
cd Setup cd Setup
@@ -31,40 +31,40 @@ cd Setup
REM ********* Copy binaries REM ********* Copy binaries
copy /B ..\ClassicExplorer\Setup\ClassicExplorer32.dll Output > nul copy /B ..\..\build\bin\Setup\ClassicExplorer32.dll Output > nul
copy /B ..\ClassicExplorer\Setup\ClassicExplorerSettings.exe Output > nul copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.exe Output > nul
copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.dll Output > nul copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.dll Output > nul
copy /B ..\ClassicIE\Setup\ClassicIE_32.exe Output > nul copy /B ..\..\build\bin\Setup\ClassicIE_32.exe Output > nul
copy /B ..\StartMenu\Setup\StartMenu.exe Output > nul copy /B ..\..\build\bin\Setup\StartMenu.exe Output > nul
copy /B ..\StartMenu\Setup\StartMenuDLL.dll Output > nul copy /B ..\..\build\bin\Setup\StartMenuDLL.dll Output > nul
copy /B ..\Update\Release\Update.exe Output > nul copy /B ..\..\build\bin\Setup\StartMenuHelper32.dll Output > nul
copy /B ..\Update\DesktopToasts\Release\DesktopToasts.dll Output > nul copy /B ..\..\build\bin\Release\Update.exe Output > nul
copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.dll Output > nul copy /B ..\..\build\bin\Release\DesktopToasts.dll Output > nul
copy /B ..\Setup\SetupHelper\Release\SetupHelper.exe Output > nul copy /B ..\..\build\bin\Release\SetupHelper.exe Output > nul
copy /B ..\ClassicExplorer\Setup64\ClassicExplorer64.dll Output\x64 > nul copy /B ..\..\build\bin\Setup64\ClassicExplorer64.dll Output\x64 > nul
copy /B ..\ClassicIE\Setup64\ClassicIEDLL_64.dll Output\x64 > nul copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.dll Output\x64 > nul
copy /B ..\ClassicIE\Setup64\ClassicIE_64.exe Output\x64 > nul copy /B ..\..\build\bin\Setup64\ClassicIE_64.exe Output\x64 > nul
copy /B ..\StartMenu\Setup64\StartMenu.exe Output\x64 > nul copy /B ..\..\build\bin\Setup64\StartMenu.exe Output\x64 > nul
copy /B ..\StartMenu\Setup64\StartMenuDLL.dll Output\x64 > nul copy /B ..\..\build\bin\Setup64\StartMenuDLL.dll Output\x64 > nul
copy /B ..\StartMenu\StartMenuHelper\Setup64\StartMenuHelper64.dll Output\x64 > nul copy /B ..\..\build\bin\Setup64\StartMenuHelper64.dll Output\x64 > nul
copy /B "..\StartMenu\Skins\Classic Skin.skin" Output > nul copy /B "..\..\build\bin\Skins\Classic Skin.skin" Output > nul
copy /B "..\StartMenu\Skins\Full Glass.skin" Output > nul copy /B "..\..\build\bin\Skins\Full Glass.skin" Output > nul
copy /B "..\StartMenu\Skins\Smoked Glass.skin" Output > nul copy /B "..\..\build\bin\Skins\Smoked Glass.skin" Output > nul
copy /B "..\StartMenu\Skins\Windows Aero.skin" Output > nul copy /B "..\..\build\bin\Skins\Windows Aero.skin" Output > nul
copy /B "..\StartMenu\Skins\Windows Basic.skin" Output > nul copy /B "..\..\build\bin\Skins\Windows Basic.skin" Output > nul
copy /B "..\StartMenu\Skins\Windows XP Luna.skin" Output > nul copy /B "..\..\build\bin\Skins\Windows XP Luna.skin" Output > nul
copy /B "..\StartMenu\Skins\Windows 8.skin" Output > nul copy /B "..\..\build\bin\Skins\Windows 8.skin" Output > nul
copy /B "..\StartMenu\Skins\Metro.skin" Output > nul copy /B "..\..\build\bin\Skins\Metro.skin" Output > nul
copy /B "..\StartMenu\Skins\Classic Skin.skin7" Output > nul copy /B "..\..\build\bin\Skins\Classic Skin.skin7" Output > nul
copy /B "..\StartMenu\Skins\Windows Aero.skin7" Output > nul copy /B "..\..\build\bin\Skins\Windows Aero.skin7" Output > nul
copy /B "..\StartMenu\Skins\Windows 8.skin7" Output > nul copy /B "..\..\build\bin\Skins\Windows 8.skin7" Output > nul
copy /B "..\StartMenu\Skins\Midnight.skin7" Output > nul copy /B "..\..\build\bin\Skins\Midnight.skin7" Output > nul
copy /B "..\StartMenu\Skins\Metro.skin7" Output > nul copy /B "..\..\build\bin\Skins\Metro.skin7" Output > nul
copy /B "..\StartMenu\Skins\Metallic.skin7" Output > nul copy /B "..\..\build\bin\Skins\Metallic.skin7" Output > nul
copy /B "..\StartMenu\Skins\Immersive.skin" Output > nul copy /B "..\..\build\bin\Skins\Immersive.skin" Output > nul
copy /B "..\StartMenu\Skins\Immersive.skin7" Output > nul copy /B "..\..\build\bin\Skins\Immersive.skin7" Output > nul
REM ********* Collect debug info REM ********* Collect debug info
@@ -72,45 +72,45 @@ md Output\PDB32
md Output\PDB64 md Output\PDB64
REM Explorer 32 REM Explorer 32
copy /B ..\ClassicExplorer\Setup\ClassicExplorer32.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\ClassicExplorer32.pdb Output\PDB32 > nul
copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
copy /B ..\ClassicExplorer\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
REM Explorer 64 REM Explorer 64
copy /B ..\ClassicExplorer\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
REM IE 32 REM IE 32
copy /B ..\ClassicIE\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
copy /B ..\ClassicIE\Setup\ClassicIE_32.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
copy /B Output\ClassicIE_32.exe Output\PDB32 > nul copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
REM IE 64 REM IE 64
copy /B ..\ClassicIE\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
copy /B ..\ClassicIE\Setup64\ClassicIE_64.pdb Output\PDB64 > nul copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
REM Menu 32 REM Menu 32
copy /B ..\StartMenu\Setup\StartMenu.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
copy /B Output\StartMenu.exe Output\PDB32 > nul copy /B Output\StartMenu.exe Output\PDB32 > nul
copy /B ..\StartMenu\Setup\StartMenuDLL.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\StartMenuDLL.pdb Output\PDB32 > nul
copy /B Output\StartMenuDLL.dll Output\PDB32 > nul copy /B Output\StartMenuDLL.dll Output\PDB32 > nul
copy /B ..\StartMenu\StartMenuHelper\Setup\StartMenuHelper32.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Setup\StartMenuHelper32.pdb Output\PDB32 > nul
copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul copy /B Output\StartMenuHelper32.dll Output\PDB32 > nul
copy /B ..\Update\Release\Update.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Release\Update.pdb Output\PDB32 > nul
copy /B Output\Update.exe Output\PDB32 > nul copy /B Output\Update.exe Output\PDB32 > nul
copy /B ..\Update\DesktopToasts\Release\DesktopToasts.pdb Output\PDB32 > nul copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
copy /B Output\DesktopToasts.dll Output\PDB32 > nul copy /B Output\DesktopToasts.dll Output\PDB32 > nul
REM Menu 64 REM Menu 64
copy /B ..\StartMenu\Setup64\StartMenu.pdb Output\PDB64 > nul copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
copy /B Output\x64\StartMenu.exe Output\PDB64 > nul copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
copy /B ..\StartMenu\Setup64\StartMenuDLL.pdb Output\PDB64 > nul copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
copy /B ..\StartMenu\StartMenuHelper\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
@@ -157,11 +157,11 @@ if exist Output\PolicyDefinitions.zip (
del Output\PolicyDefinitions.zip del Output\PolicyDefinitions.zip
) )
cd ..\Localization\English cd ..\Localization\English
..\..\StartMenu\Setup\StartMenu.exe -saveadmx en-US ..\..\..\build\bin\Setup\StartMenu.exe -saveadmx en-US
@if ERRORLEVEL 1 exit /b 1 @if ERRORLEVEL 1 exit /b 1
..\..\ClassicExplorer\Setup\ClassicExplorerSettings.exe -saveadmx en-US ..\..\..\build\bin\Setup\ClassicExplorerSettings.exe -saveadmx en-US
@if ERRORLEVEL 1 exit /b 1 @if ERRORLEVEL 1 exit /b 1
..\..\ClassicIE\Setup\ClassicIE_32.exe -saveadmx en-US ..\..\..\build\bin\Setup\ClassicIE_32.exe -saveadmx en-US
@if ERRORLEVEL 1 exit /b 1 @if ERRORLEVEL 1 exit /b 1
md en-US md en-US
copy /B *.adml en-US > nul copy /B *.adml en-US > nul

6
Src/Setup/BuildInstaller.bat
View File

@@ -60,7 +60,7 @@ light Temp\Setup64.wixobj -nologo -out Temp\Setup64.msi -ext WixUIExtension -ext
REM ********* Build MSI Checksums REM ********* Build MSI Checksums
echo --- MSI Checksums echo --- MSI Checksums
Utility\Release\Utility.exe crcmsi Temp ..\..\build\bin\Release\Utility.exe crcmsi Temp
@if ERRORLEVEL 1 exit /b 1 @if ERRORLEVEL 1 exit /b 1
REM ********* Build bootstrapper REM ********* Build bootstrapper
@@ -73,10 +73,10 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio
if exist Final rd /Q /S Final if exist Final rd /Q /S Final
md Final md Final
copy /B Release\Setup.exe Final\%CS_INSTALLER_NAME%.exe > nul copy /B ..\..\build\bin\Release\Setup.exe Final\%CS_INSTALLER_NAME%.exe > nul
if defined APPVEYOR ( if defined APPVEYOR (
appveyor PushArtifact Release\Setup.exe -FileName %CS_INSTALLER_NAME%.exe appveyor PushArtifact Final\%CS_INSTALLER_NAME%.exe
) )
SET CS_LANG_FOLDER= SET CS_LANG_FOLDER=

2
Src/Setup/Utility/Utility.rc
View File

@@ -52,7 +52,7 @@ END
// FILE // FILE
// //
1 FILE "Release64\\Utility.exe" 1 FILE "..\\..\\..\\build\\bin\\Release64\\Utility.exe"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //

1
Src/Setup/en-US/en-US.vcxproj
View File

@@ -26,6 +26,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<OutDir>..\..\</OutDir> <OutDir>..\..\</OutDir>
<IntDir>..\..\..\build\obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary> <IgnoreImportLibrary>true</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>

4
Src/Skins/Skin.props
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<OutDir>$(SolutionDir)StartMenu\Skins\</OutDir> <OutDir>$(MSBuildThisFileDirectory)..\..\build\bin\Skins\</OutDir>
<IntDir>$(Configuration)\</IntDir> <IntDir>$(MSBuildThisFileDirectory)..\..\build\obj\Skins\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary> <IgnoreImportLibrary>true</IgnoreImportLibrary>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<ReadOnlyProject>true</ReadOnlyProject> <ReadOnlyProject>true</ReadOnlyProject>

6
Src/StartMenu/StartMenuDLL/StartMenuDLL.vcxproj
View File

@@ -47,12 +47,6 @@
<Import Project="..\..\Common.props" /> <Import Project="..\..\Common.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Platform)'=='Win32'">
<OutDir>..\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'">
<OutDir>..\$(Configuration)64\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_USRDLL;CLASSICSTARTMENUDLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>