diff --git a/build_release_windows.ps1 b/build_release_windows.ps1 index 8c95a18..6291865 100644 --- a/build_release_windows.ps1 +++ b/build_release_windows.ps1 @@ -1,9 +1,9 @@ "Compiling resource file" -RC /fo res\application.res res\application.rc +RC /fo res\windows\application\application.res res\windows\application\application.rc "" "Compiling executable" -cargo rustc --release --features "ui" -- -C link-args="/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup res\application.res" +cargo rustc --release --features "ui" -- -C link-args="/SUBSYSTEM:WINDOWS /ENTRY:mainCRTStartup res\windows\application\application.res" "" "Creating output directory" @@ -12,18 +12,18 @@ Remove-Item -Recurse .\release\tmp\* "" "Copying to output directory" -Copy-Item .\target\release\polaris.exe .\release\tmp\ -Copy-Item .\res\libeay32.dll .\release\tmp\ -Copy-Item .\res\libeay32md.dll .\release\tmp\ -Copy-Item .\res\default_config.toml .\release\tmp\polaris.toml -Copy-Item .\web\ .\release\tmp\ -recurse -Copy-Item .\res\license.rtf .\release\tmp\ -Copy-Item .\res\banner.bmp .\release\tmp\ -Copy-Item .\res\dialog.bmp .\release\tmp\ +Copy-Item .\res\windows\libeay32.dll .\release\tmp\ +Copy-Item .\res\windows\libeay32md.dll .\release\tmp\ +Copy-Item .\res\windows\installer\license.rtf .\release\tmp\ +Copy-Item .\res\windows\installer\banner.bmp .\release\tmp\ +Copy-Item .\res\windows\installer\dialog.bmp .\release\tmp\ +Copy-Item .\target\release\polaris.exe .\release\tmp\ +Copy-Item .\res\default_config.toml .\release\tmp\polaris.toml +Copy-Item .\web\ .\release\tmp\ -recurse "" "Creating installer" -candle -wx -arch x64 -out .\release\tmp\installer.wixobj .\res\installer.wxs +candle -wx -arch x64 -out .\release\tmp\installer.wixobj .\res\windows\installer\installer.wxs light -wx -spdb -ext WixUIExtension -out .\release\Polaris_0.1.0.msi .\release\tmp\installer.wixobj "Cleaning up" diff --git a/res/application.manifest b/res/windows/application/application.manifest similarity index 100% rename from res/application.manifest rename to res/windows/application/application.manifest diff --git a/res/application.rc b/res/windows/application/application.rc similarity index 100% rename from res/application.rc rename to res/windows/application/application.rc diff --git a/res/icon_polaris_32.ico b/res/windows/application/icon_polaris_32.ico similarity index 100% rename from res/icon_polaris_32.ico rename to res/windows/application/icon_polaris_32.ico diff --git a/res/banner.bmp b/res/windows/installer/banner.bmp similarity index 100% rename from res/banner.bmp rename to res/windows/installer/banner.bmp diff --git a/res/dialog.bmp b/res/windows/installer/dialog.bmp similarity index 100% rename from res/dialog.bmp rename to res/windows/installer/dialog.bmp diff --git a/res/installer.wxs b/res/windows/installer/installer.wxs similarity index 100% rename from res/installer.wxs rename to res/windows/installer/installer.wxs diff --git a/res/license.rtf b/res/windows/installer/license.rtf similarity index 100% rename from res/license.rtf rename to res/windows/installer/license.rtf