Skip to content

Commit 3c53278

Browse files
committed
Build - handle new config dir when building Windows installer
1 parent c6d2878 commit 3c53278

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

install/windows/install.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ xcopy /Y /I /R /E ..\..\app\server\native\ruby\bin app\server\native\ruby\bin
2828
xcopy /Y /I /R /E ..\..\app\server\native\ruby\lib app\server\native\ruby\lib
2929
xcopy /Y /I /R /E ..\..\app\server\native\ruby\share app\server\native\ruby\share
3030
xcopy /Y /I /R /E ..\..\app\server\native\ruby\ssl app\server\native\ruby\ssl
31+
xcopy /Y /I /R /E ..\..\app\config app\config
32+
3133
xcopy /Y ..\..\app\server\native\*.* app\server\native
3234

3335
xcopy /Y /I /R /E ..\..\app\server\ruby app\server\ruby

install/windows/wix/gen_msi.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cd %~dp0
22
cd ..
33
@echo "Generating msi"
4-
candle wix\sonic-pi.wxs etc.wxs gui.wxs server.wxs -ext WixUtilExtension -arch x64
5-
light sonic-pi.wixobj etc.wixobj gui.wixobj server.wixobj -ext WixUtilExtension -ext WixUIExtension -o wix\Sonic-Pi.msi -b etc -b app\gui -b app\server
4+
candle wix\sonic-pi.wxs etc.wxs gui.wxs server.wxs config.wxs -ext WixUtilExtension -arch x64
5+
light sonic-pi.wixobj etc.wixobj gui.wixobj server.wixobj config.wixobj -ext WixUtilExtension -ext WixUIExtension -o wix\Sonic-Pi.msi -b etc -b app\gui -b app\server -b app\config

install/windows/wix/gen_wix.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ cd ..
55
heat dir etc -gg -g1 -f -sfrag -dr SonicPi -cg ETC -out etc.wxs
66
heat dir app\gui -gg -g1 -v -t "wix\filter.xslt" -sreg -sfrag -dr AppDir -cg GUI -out gui.wxs
77
heat dir app\server -gg -g1 -sreg -sfrag -dr AppDir -cg SERVER -out server.wxs
8-
8+
heat dir app\config -gg -g1 -sreg -sfrag -dr AppDir -cg CONFIG -out config.wxs

install/windows/wix/sonic-pi.wxs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<ComponentGroupRef Id="ETC"/>
5151
<ComponentGroupRef Id="GUI"/>
5252
<ComponentGroupRef Id="SERVER"/>
53+
<ComponentGroupRef Id="CONFIG"/>
5354
<ComponentRef Id="SONIC_PI.EXE" />
5455
<ComponentRef Id="StartMenuShortcuts" />
5556
</Feature>

0 commit comments

Comments
 (0)