Skip to content

Commit 5ecb0c5

Browse files
committed
Installer - tweak windows installer scripts
1 parent f2a1954 commit 5ecb0c5

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

install/windows/install.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ mkdir app
1616
rmdir /S /Q etc
1717
mkdir etc
1818

19-
xcopy /Y /I /R /E ..\..\app\build\gui\qt\Release app\gui\qt\build\Release
20-
xcopy /Y /I /R /E ..\..\app\gui\qt\theme app\gui\qt\theme
21-
xcopy /Y /I /R /E ..\..\app\gui\qt\lang app\gui\qt\lang
19+
xcopy /Y /I /R /E ..\..\app\build\gui\Release app\gui\build\Release
20+
xcopy /Y /I /R /E ..\..\app\gui\theme app\gui\theme
21+
xcopy /Y /I /R /E ..\..\app\gui\lang app\gui\lang
2222
xcopy /Y /I /R /E ..\..\etc etc\
2323

2424
xcopy /Y /I /R /E ..\..\app\server\beam\tau\_build app\server\beam\tau\_build

install/windows/wix/sonic-pi-beta.wxs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:firewall="http://schemas.microsoft.com/wix/FirewallExtension">
33

4-
<Product Id="*" Name="Sonic Pi BETA" Language="1033" Version="3.3.0" Manufacturer="Sonic Pi" UpgradeCode="ECA5D03B-CEBD-4672-BE1A-176CBCBA4429">
4+
<Product Id="*" Name="Sonic Pi BETA" Language="1033" Version="4.6.0" Manufacturer="Sonic Pi" UpgradeCode="ECA5D03B-CEBD-4672-BE1A-176CBCBA4429">
55
<Package Description="Sonic Pi Installer" Comments="Sonic Pi Installer" Platform="x64" InstallScope="perMachine" InstallerVersion="301" Compressed="yes" />
66
<Property Id="REINSTALLMODE" Value="amus"/>
77
<Property Id="MSIFASTINSTALL" Value="1" />
@@ -22,13 +22,11 @@
2222
<Directory Id="SonicPi" Name="Sonic Pi BETA">
2323
<Directory Id="AppDir" Name="app">
2424
<Directory Id="GUI" Name="gui">
25-
<Directory Id="QT" Name="qt">
26-
<Directory Id="BUILD" Name="build">
27-
<Directory Id="RELEASE" Name="Release">
28-
<Component Id="SONIC_PI.EXE" DiskId="1" Guid="BA4C72F9-C198-436A-B1E2-B2DF8EC65960">
29-
<File Id="SONIC_PI.EXE" Name="sonic-pi.exe" Source="SourceDir\app\gui\qt\build\Release\sonic-pi.exe" />
30-
</Component>
31-
</Directory>
25+
<Directory Id="BUILD" Name="build">
26+
<Directory Id="RELEASE" Name="Release">
27+
<Component Id="SONIC_PI.EXE" DiskId="1" Guid="BA4C72F9-C198-436A-B1E2-B2DF8EC65960">
28+
<File Id="SONIC_PI.EXE" Name="sonic-pi.exe" Source="SourceDir\app\gui\build\Release\sonic-pi.exe" />
29+
</Component>
3230
</Directory>
3331
</Directory>
3432
</Directory>

install/windows/wix/sonic-pi.wxs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:firewall="http://schemas.microsoft.com/wix/FirewallExtension">
33

4-
<Product Id="*" Name="Sonic Pi" Language="1033" Version="3.3.0" Manufacturer="Sonic Pi" UpgradeCode="ECA5D03B-CEBD-4672-A0A2-176CBCBA4429">
4+
<Product Id="*" Name="Sonic Pi" Language="1033" Version="4.6.0" Manufacturer="Sonic Pi" UpgradeCode="ECA5D03B-CEBD-4672-A0A2-176CBCBA4429">
55
<Package Description="Sonic Pi Installer" Comments="Sonic Pi Installer" Platform="x64" InstallScope="perMachine" InstallerVersion="301" Compressed="yes" />
66
<Property Id="REINSTALLMODE" Value="amus"/>
77
<Property Id="MSIFASTINSTALL" Value="1" />
@@ -22,13 +22,11 @@
2222
<Directory Id="SonicPi" Name="Sonic Pi">
2323
<Directory Id="AppDir" Name="app">
2424
<Directory Id="GUI" Name="gui">
25-
<Directory Id="QT" Name="qt">
26-
<Directory Id="BUILD" Name="build">
27-
<Directory Id="RELEASE" Name="Release">
28-
<Component Id="SONIC_PI.EXE" DiskId="1" Guid="BA4C72F9-C198-436A-B1E2-B2DF8EC65960">
29-
<File Id="SONIC_PI.EXE" Name="sonic-pi.exe" Source="SourceDir\app\gui\qt\build\Release\sonic-pi.exe" />
30-
</Component>
31-
</Directory>
25+
<Directory Id="BUILD" Name="build">
26+
<Directory Id="RELEASE" Name="Release">
27+
<Component Id="SONIC_PI.EXE" DiskId="1" Guid="BA4C72F9-C198-436A-B1E2-B2DF8EC65960">
28+
<File Id="SONIC_PI.EXE" Name="sonic-pi.exe" Source="SourceDir\app\gui\build\Release\sonic-pi.exe" />
29+
</Component>
3230
</Directory>
3331
</Directory>
3432
</Directory>

0 commit comments

Comments
 (0)