@@ -10,17 +10,15 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio
10
10
REM Restore NuGet packages
11
11
" %MSBuildDir% MSBuild.exe" ..\OpenShell.sln /m /t:Restore -p:RestorePackagesConfig=true /verbosity:quiet /nologo
12
12
13
- if %ARCH% == ARM64 (
14
- REM ********* Build ARM64 solution
15
- echo --- ARM64
16
- " %MSBuildDir% MSBuild.exe" ..\OpenShell.sln /m /t:Rebuild /p:Configuration=" Setup" /p:Platform=" ARM64" /verbosity:quiet /nologo
17
- if ERRORLEVEL 1 exit /b 1
18
- ) else (
19
- REM ********* Build x64 solution
20
- echo --- x64
21
- " %MSBuildDir% MSBuild.exe" ..\OpenShell.sln /m /t:Rebuild /p:Configuration=" Setup" /p:Platform=" x64" /verbosity:quiet /nologo
22
- if ERRORLEVEL 1 exit /b 1
23
- )
13
+ REM ********* Build x64 solution
14
+ echo --- x64
15
+ " %MSBuildDir% MSBuild.exe" ..\OpenShell.sln /m /t:Rebuild /p:Configuration=" Setup" /p:Platform=" x64" /verbosity:quiet /nologo
16
+ @ if ERRORLEVEL 1 exit /b 1
17
+
18
+ REM ********* Build ARM64 solution
19
+ echo --- ARM64
20
+ " %MSBuildDir% MSBuild.exe" ..\OpenShell.sln /m /t:Rebuild /p:Configuration=" Setup" /p:Platform=" ARM64" /verbosity:quiet /nologo
21
+ if ERRORLEVEL 1 exit /b 1
24
22
25
23
REM ********* Build 32-bit solution (must be after 64-bit)
26
24
echo --- x86
@@ -53,21 +51,19 @@ copy /B ..\..\build\bin\Release\Update.exe Output > nul
53
51
copy /B ..\..\build\bin\Release\DesktopToasts.dll Output > nul
54
52
copy /B ..\..\build\bin\Release\SetupHelper.exe Output > nul
55
53
56
- if %ARCH% == ARM64 (
57
- copy /B ..\..\build\bin\SetupARM64\ClassicExplorerARM64.dll Output\ARM64 > nul
58
- copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_ARM64.dll Output\ARM64 > nul
59
- copy /B ..\..\build\bin\SetupARM64\ClassicIE_ARM64.exe Output\ARM64 > nul
60
- copy /B ..\..\build\bin\SetupARM64\StartMenu.exe Output\ARM64 > nul
61
- copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.dll Output\ARM64 > nul
62
- copy /B ..\..\build\bin\SetupARM64\StartMenuHelperARM64.dll Output\ARM64 > nul
63
- ) else (
64
- copy /B ..\..\build\bin\Setup64\ClassicExplorer64.dll Output\x64 > nul
65
- copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.dll Output\x64 > nul
66
- copy /B ..\..\build\bin\Setup64\ClassicIE_64.exe Output\x64 > nul
67
- copy /B ..\..\build\bin\Setup64\StartMenu.exe Output\x64 > nul
68
- copy /B ..\..\build\bin\Setup64\StartMenuDLL.dll Output\x64 > nul
69
- copy /B ..\..\build\bin\Setup64\StartMenuHelper64.dll Output\x64 > nul
70
- )
54
+ copy /B ..\..\build\bin\SetupARM64\ClassicExplorerA64.dll Output\ARM64 > nul
55
+ copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_A64.dll Output\ARM64 > nul
56
+ copy /B ..\..\build\bin\SetupARM64\ClassicIE_A64.exe Output\ARM64 > nul
57
+ copy /B ..\..\build\bin\SetupARM64\StartMenu.exe Output\ARM64 > nul
58
+ copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.dll Output\ARM64 > nul
59
+ copy /B ..\..\build\bin\SetupARM64\StartMenuHelperA64.dll Output\ARM64 > nul
60
+
61
+ copy /B ..\..\build\bin\Setup64\ClassicExplorer64.dll Output\x64 > nul
62
+ copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.dll Output\x64 > nul
63
+ copy /B ..\..\build\bin\Setup64\ClassicIE_64.exe Output\x64 > nul
64
+ copy /B ..\..\build\bin\Setup64\StartMenu.exe Output\x64 > nul
65
+ copy /B ..\..\build\bin\Setup64\StartMenuDLL.dll Output\x64 > nul
66
+ copy /B ..\..\build\bin\Setup64\StartMenuHelper64.dll Output\x64 > nul
71
67
72
68
copy /B " ..\..\build\bin\Skins\Classic Skin.skin" Output > nul
73
69
copy /B " ..\..\build\bin\Skins\Full Glass.skin" Output > nul
@@ -89,7 +85,7 @@ copy /B "..\..\build\bin\Skins\Immersive.skin7" Output > nul
89
85
90
86
REM ********* Collect debug info
91
87
md Output\PDB32
92
- md Output\PDBx64
88
+ md Output\PDB64
93
89
md Output\PDBARM64
94
90
95
91
REM Explorer 32
@@ -98,35 +94,31 @@ copy /B Output\ClassicExplorer32.dll Output\PDB32 > nul
98
94
copy /B ..\..\build\bin\Setup\ClassicExplorerSettings.pdb Output\PDB32 > nul
99
95
copy /B Output\ClassicExplorerSettings.exe Output\PDB32 > nul
100
96
101
- if %ARCH% == ARM64 (
102
- REM Explorer ARM64
103
- copy /B ..\..\build\bin\SetupARM64\ClassicExplorerARM64.pdb Output\PDBARM64 > nul
104
- copy /B Output\ARM64\ClassicExplorerARM64.dll Output\PDBARM64 > nul
105
- ) else (
106
- REM Explorer x64
107
- copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDBx64 > nul
108
- copy /B Output\x64\ClassicExplorer64.dll Output\PDBx64 > nul
109
- )
97
+ REM Explorer 64
98
+ copy /B ..\..\build\bin\Setup64\ClassicExplorer64.pdb Output\PDB64 > nul
99
+ copy /B Output\x64\ClassicExplorer64.dll Output\PDB64 > nul
100
+
101
+ REM Explorer ARM64
102
+ copy /B ..\..\build\bin\SetupARM64\ClassicExplorerA64.pdb Output\PDBARM64 > nul
103
+ copy /B Output\ARM64\ClassicExplorerA64.dll Output\PDBARM64 > nul
110
104
111
105
REM IE 32
112
106
copy /B ..\..\build\bin\Setup\ClassicIEDLL_32.pdb Output\PDB32 > nul
113
107
copy /B Output\ClassicIEDLL_32.dll Output\PDB32 > nul
114
108
copy /B ..\..\build\bin\Setup\ClassicIE_32.pdb Output\PDB32 > nul
115
109
copy /B Output\ClassicIE_32.exe Output\PDB32 > nul
116
110
117
- if %ARCH% == ARM64 (
118
- REM IE ARM64
119
- copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_ARM64.pdb Output\PDBARM64 > nul
120
- copy /B Output\ARM64\ClassicIEDLL_ARM64.dll Output\PDBARM64 > nul
121
- copy /B ..\..\build\bin\SetupARM64\ClassicIE_ARM64.pdb Output\PDBARM64 > nul
122
- copy /B Output\ARM64\ClassicIE_ARM64.exe Output\PDBARM64 > nul
123
- ) else (
124
- REM IE x64
125
- copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDBx64 > nul
126
- copy /B Output\x64\ClassicIEDLL_64.dll Output\PDBx64 > nul
127
- copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDBx64 > nul
128
- copy /B Output\x64\ClassicIE_64.exe Output\PDBx64 > nul
129
- )
111
+ REM IE 64
112
+ copy /B ..\..\build\bin\Setup64\ClassicIEDLL_64.pdb Output\PDB64 > nul
113
+ copy /B Output\x64\ClassicIEDLL_64.dll Output\PDB64 > nul
114
+ copy /B ..\..\build\bin\Setup64\ClassicIE_64.pdb Output\PDB64 > nul
115
+ copy /B Output\x64\ClassicIE_64.exe Output\PDB64 > nul
116
+
117
+ REM IE ARM64
118
+ copy /B ..\..\build\bin\SetupARM64\ClassicIEDLL_A64.pdb Output\PDBARM64 > nul
119
+ copy /B Output\ARM64\ClassicIEDLL_A64.dll Output\PDBARM64 > nul
120
+ copy /B ..\..\build\bin\SetupARM64\ClassicIE_A64.pdb Output\PDBARM64 > nul
121
+ copy /B Output\ARM64\ClassicIE_A64.exe Output\PDBARM64 > nul
130
122
131
123
REM Menu 32
132
124
copy /B ..\..\build\bin\Setup\StartMenu.pdb Output\PDB32 > nul
@@ -140,23 +132,21 @@ copy /B Output\Update.exe Output\PDB32 > nul
140
132
copy /B ..\..\build\bin\Release\DesktopToasts.pdb Output\PDB32 > nul
141
133
copy /B Output\DesktopToasts.dll Output\PDB32 > nul
142
134
143
- if %ARCH% == ARM64 (
144
- REM Menu ARM64
145
- copy /B ..\..\build\bin\SetupARM64\StartMenu.pdb Output\PDBARM64 > nul
146
- copy /B Output\ARM64\StartMenu.exe Output\PDBARM64 > nul
147
- copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.pdb Output\PDBARM64 > nul
148
- copy /B Output\ARM64\StartMenuDLL.dll Output\PDBARM64 > nul
149
- copy /B ..\..\build\bin\StartMenuHelper\SetupARM64\StartMenuHelperARM64.pdb Output\PDBARM64 > nul
150
- copy /B Output\ARM64\StartMenuHelperARM64.dll Output\PDBARM64 > nul
151
- ) else (
152
- REM Menu x64
153
- copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDBx64 > nul
154
- copy /B Output\x64\StartMenu.exe Output\PDBx64 > nul
155
- copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDBx64 > nul
156
- copy /B Output\x64\StartMenuDLL.dll Output\PDBx64 > nul
157
- copy /B ..\..\build\bin\StartMenuHelper\Setup64\StartMenuHelper64.pdb Output\PDBx64 > nul
158
- copy /B Output\x64\StartMenuHelper64.dll Output\PDBx64 > nul
159
- )
135
+ REM Menu 64
136
+ copy /B ..\..\build\bin\Setup64\StartMenu.pdb Output\PDB64 > nul
137
+ copy /B Output\x64\StartMenu.exe Output\PDB64 > nul
138
+ copy /B ..\..\build\bin\Setup64\StartMenuDLL.pdb Output\PDB64 > nul
139
+ copy /B Output\x64\StartMenuDLL.dll Output\PDB64 > nul
140
+ copy /B ..\..\build\bin\Setup64\StartMenuHelper64.pdb Output\PDB64 > nul
141
+ copy /B Output\x64\StartMenuHelper64.dll Output\PDB64 > nul
142
+
143
+ REM Menu ARM64
144
+ copy /B ..\..\build\bin\SetupARM64\StartMenu.pdb Output\PDBARM64 > nul
145
+ copy /B Output\ARM64\StartMenu.exe Output\PDBARM64 > nul
146
+ copy /B ..\..\build\bin\SetupARM64\StartMenuDLL.pdb Output\PDBARM64 > nul
147
+ copy /B Output\ARM64\StartMenuDLL.dll Output\PDBARM64 > nul
148
+ copy /B ..\..\build\bin\SetupARM64\StartMenuHelperA64.pdb Output\PDBARM64 > nul
149
+ copy /B Output\ARM64\StartMenuHelperA64.dll Output\PDBARM64 > nul
160
150
161
151
REM ********* Source Index PDBs
162
152
@@ -174,7 +164,7 @@ if exist %PDBSTR_PATH% (
174
164
)
175
165
)
176
166
177
- for %%f in (Output\PDBx64 \*.pdb) do (
167
+ for %%f in (Output\PDB64 \*.pdb) do (
178
168
%PDBSTR_PATH% -w -p:%%f -s:srcsrv -i:Output\pdbstr.txt
179
169
if not ERRORLEVEL 0 (
180
170
echo Error adding source index to PDB
@@ -196,13 +186,13 @@ REM ********* Prepare symbols
196
186
set SYMSTORE_PATH = " C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\symstore.exe"
197
187
198
188
%SYMSTORE_PATH% add /r /f Output\PDB32 /s Output\symbols /t OpenShell -:NOREFS > nul
199
- %SYMSTORE_PATH% add /r /f Output\PDBx64 /s Output\symbols /t OpenShell -:NOREFS > nul
189
+ %SYMSTORE_PATH% add /r /f Output\PDB64 /s Output\symbols /t OpenShell -:NOREFS > nul
200
190
%SYMSTORE_PATH% add /r /f Output\PDBARM64 /s Output\symbols /t OpenShell -:NOREFS > nul
201
191
rd /Q /S Output\symbols\000Admin > nul
202
192
del Output\symbols\pingme.txt > nul
203
193
204
194
rd /Q /S Output\PDB32
205
- rd /Q /S Output\PDBx64
195
+ rd /Q /S Output\PDB64
206
196
rd /Q /S Output\PDBARM64
207
197
208
198
REM ********* Build ADMX
0 commit comments