Skip to content

Commit 900fae8

Browse files
dchapyshevdchapyshev
committed
Fixed target directory for x64 installer.
1 parent 2fad176 commit 900fae8

File tree

7 files changed

+24
-10
lines changed

7 files changed

+24
-10
lines changed

‎installer/build.cmd‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,16 @@ if "%ASPIA_BIN_DIR%" == "" ( goto :USAGE )
1515
set SRC_DIR=%ASPIA_SRC_DIR%\installer
1616
set EN_US_POSTFIX=%ASPIA_VERSION%-%ASPIA_ARCH%
1717

18+
if "%ASPIA_ARCH%" == "x86_64" ( set CANDLE_ARCH=x64 )
19+
if "%ASPIA_ARCH%" == "x64" ( set CANDLE_ARCH=x64 )
20+
if "%ASPIA_ARCH%" == "x86" ( set CANDLE_ARCH=x86 )
21+
1822
echo "##################################################"
1923
echo "Aspia Src Dir: %ASPIA_SRC_DIR%"
2024
echo "Aspia Bin Dir: %ASPIA_BIN_DIR%"
2125
echo "Aspia Version: %ASPIA_VERSION%"
2226
echo "Aspia Arch: %ASPIA_ARCH%"
27+
echo "Candle Arch: %CANDLE_ARCH%"
2328
echo "Installer Src Dir: %SRC_DIR%"
2429

2530
goto :MSI
@@ -39,7 +44,7 @@ pushd %SRC_DIR%
3944
echo "##################################################"
4045
echo "Creating MSI packages for Aspia Console"
4146
set CONSOLE_EN_US_MSI=%ASPIA_BIN_DIR%\aspia-console-%EN_US_POSTFIX%.msi
42-
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -ext WixUtilExtension -ext WixUIExtension console.wxs
47+
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -arch %CANDLE_ARCH% -ext WixUtilExtension -ext WixUIExtension console.wxs
4348
"%WIX%\bin\light" -sval -out "%CONSOLE_EN_US_MSI%" -cultures:en-us -ext WixUtilExtension -ext WixUIExtension -loc translations\console.en-us.wxl "%ASPIA_BIN_DIR%\console.wixobj"
4449
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-console-de-de.msi" -cultures:de-de -ext WixUtilExtension -ext WixUIExtension -loc translations\console.de-de.wxl "%ASPIA_BIN_DIR%\console.wixobj"
4550
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-console-it-it.msi" -cultures:it-it -ext WixUtilExtension -ext WixUIExtension -loc translations\console.it-it.wxl "%ASPIA_BIN_DIR%\console.wixobj"
@@ -77,7 +82,7 @@ cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs"
7782
echo "##################################################"
7883
echo "Creating MSI packages for Aspia Client"
7984
set CLIENT_EN_US_MSI=%ASPIA_BIN_DIR%\aspia-client-%EN_US_POSTFIX%.msi
80-
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -ext WixUtilExtension -ext WixUIExtension client.wxs
85+
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -arch %CANDLE_ARCH% -ext WixUtilExtension -ext WixUIExtension client.wxs
8186
"%WIX%\bin\light" -sval -out "%CLIENT_EN_US_MSI%" -cultures:en-us -ext WixUtilExtension -ext WixUIExtension -loc translations\client.en-us.wxl "%ASPIA_BIN_DIR%\client.wixobj"
8287
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-client-de-de.msi" -cultures:de-de -ext WixUtilExtension -ext WixUIExtension -loc translations\client.de-de.wxl "%ASPIA_BIN_DIR%\client.wixobj"
8388
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-client-it-it.msi" -cultures:it-it -ext WixUtilExtension -ext WixUIExtension -loc translations\client.it-it.wxl "%ASPIA_BIN_DIR%\client.wixobj"
@@ -115,7 +120,7 @@ cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs"
115120
echo "##################################################"
116121
echo "Creating MSI packages for Aspia Host"
117122
set HOST_EN_US_MSI=%ASPIA_BIN_DIR%\aspia-host-%EN_US_POSTFIX%.msi
118-
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -ext WixUtilExtension -ext WixUIExtension host.wxs
123+
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -arch %CANDLE_ARCH% -ext WixUtilExtension -ext WixUIExtension host.wxs
119124
"%WIX%\bin\light" -sval -out "%HOST_EN_US_MSI%" -cultures:en-us -ext WixUtilExtension -ext WixUIExtension -loc translations\host.en-us.wxl "%ASPIA_BIN_DIR%\host.wixobj"
120125
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-host-de-de.msi" -cultures:de-de -ext WixUtilExtension -ext WixUIExtension -loc translations\host.de-de.wxl "%ASPIA_BIN_DIR%\host.wixobj"
121126
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-host-it-it.msi" -cultures:it-it -ext WixUtilExtension -ext WixUIExtension -loc translations\host.it-it.wxl "%ASPIA_BIN_DIR%\host.wixobj"
@@ -152,12 +157,12 @@ cscript "%ProgramFiles(x86)%\Windows Kits\10\bin\%SDK_VERSION%\x86\wilangid.vbs"
152157

153158
echo "##################################################"
154159
echo "Creating MSI packages for Aspia Router"
155-
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -ext WixUtilExtension -ext WixUIExtension router.wxs
160+
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -arch %CANDLE_ARCH% -ext WixUtilExtension -ext WixUIExtension router.wxs
156161
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-router-%ASPIA_VERSION%-%ASPIA_ARCH%.msi" -cultures:en-us -ext WixUtilExtension -ext WixUIExtension -loc translations\router.en-us.wxl "%ASPIA_BIN_DIR%\router.wixobj"
157162

158163
echo "##################################################"
159164
echo "Creating MSI packages for Aspia Relay"
160-
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -ext WixUtilExtension -ext WixUIExtension relay.wxs
165+
"%WIX%\bin\candle" -out "%ASPIA_BIN_DIR%\\" -arch %CANDLE_ARCH% -ext WixUtilExtension -ext WixUIExtension relay.wxs
161166
"%WIX%\bin\light" -sval -out "%ASPIA_BIN_DIR%\aspia-relay-%ASPIA_VERSION%-%ASPIA_ARCH%.msi" -cultures:en-us -ext WixUtilExtension -ext WixUIExtension -loc translations\relay.en-us.wxl "%ASPIA_BIN_DIR%\relay.wixobj"
162167

163168
rem Restore working directory

‎installer/client.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Property Id="ARPPRODUCTICON" Value="aspia.ico" />
2626

2727
<Directory Id="TARGETDIR" Name="SourceDir">
28-
<Directory Id="ProgramFilesFolder">
28+
<Directory Id="$(var.Program_Files)">
2929
<Directory Id="VendorProgramFilesFolder" Name="Aspia">
3030
<Directory Id="INSTALLLOCATION" Name="Client" />
3131
</Directory>

‎installer/console.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<Property Id="ARPPRODUCTICON" Value="aspia.ico" />
2626

2727
<Directory Id="TARGETDIR" Name="SourceDir">
28-
<Directory Id="ProgramFilesFolder">
28+
<Directory Id="$(var.Program_Files)">
2929
<Directory Id="VendorProgramFilesFolder" Name="Aspia">
3030
<Directory Id="INSTALLLOCATION" Name="Console" />
3131
</Directory>

‎installer/host.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<Property Id="ARPPRODUCTICON" Value="aspia.ico" />
2828

2929
<Directory Id="TARGETDIR" Name="SourceDir">
30-
<Directory Id="ProgramFilesFolder">
30+
<Directory Id="$(var.Program_Files)">
3131
<Directory Id="VendorProgramFilesFolder" Name="Aspia">
3232
<Directory Id="INSTALLLOCATION" Name="Host" />
3333
</Directory>

‎installer/relay.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<Property Id="ARPPRODUCTICON" Value="aspia.ico" />
2828

2929
<Directory Id="TARGETDIR" Name="SourceDir">
30-
<Directory Id="ProgramFilesFolder">
30+
<Directory Id="$(var.Program_Files)">
3131
<Directory Id="VendorProgramFilesFolder" Name="Aspia">
3232
<Directory Id="INSTALLLOCATION" Name="Relay" />
3333
</Directory>

‎installer/router.wxs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<Property Id="ARPPRODUCTICON" Value="aspia.ico" />
2828

2929
<Directory Id="TARGETDIR" Name="SourceDir">
30-
<Directory Id="ProgramFilesFolder">
30+
<Directory Id="$(var.Program_Files)">
3131
<Directory Id="VendorProgramFilesFolder" Name="Aspia">
3232
<Directory Id="INSTALLLOCATION" Name="Router" />
3333
</Directory>

‎installer/version.wxi‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,13 @@
33
<?define Manufacturer="Dmitry Chapyshev"?>
44
<?define Version="$(env.ASPIA_VERSION)"?>
55
<?define SourceFiles="$(env.ASPIA_BIN_DIR)"?>
6+
<?if $(sys.BUILDARCH)="x86"?>
7+
<?define Minimum_Version="100"?>
8+
<?define Program_Files="ProgramFilesFolder"?>
9+
<?elseif $(sys.BUILDARCH)="x64"?>
10+
<?define Minimum_Version="200"?>
11+
<?define Program_Files="ProgramFiles64Folder"?>
12+
<?else?>
13+
<?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
14+
<?endif?>
615
</Include>

0 commit comments

Comments
 (0)