From 83c65e718f94f8940fa653a2218cbe2d61ec79ee Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Thu, 26 Feb 2015 12:09:30 -0800 Subject: [PATCH] Rename wix-installer/ -> installer/ --- scripts/windows/build-installer.ps1 | 8 ++++---- .../{wix-installer => installer}/!ReadMe.txt | 0 .../windows/{wix-installer => installer}/.gitignore | 0 .../{wix-installer => installer}/MeteorSetup.sln | 0 .../WiXBalExtension/.gitignore | 0 .../WiXBalExtension/BalExtensionExt.sln | 0 .../WiXBalExtension/LICENSE.TXT | 0 .../WiXBalExtension/build.bat | 0 .../WiXBalExtension/inc/Version.proj | 0 .../WiXBalExtension/inc/WixDistribution.cs | 0 .../WiXBalExtension/inc/WixDistribution.h | 0 .../WiXBalExtension/inc/wix.rc | 0 .../WiXBalExtension/inc/wixver.cs | 0 .../WiXBalExtension/inc/wixver.h | 0 .../WiXBalExtension/wixext/BalCompiler.cs | 0 .../WiXBalExtension/wixext/BalExtension.cs | 0 .../wixext/BalPreprocessorExtension.cs | 0 .../wixext/Properties/AssemblyInfo.cs | 0 .../wixext/WixBalExtensionExt.csproj | 0 .../WiXBalExtension/wixext/Xsd/bal.xsd | 0 .../WiXBalExtension/wixext/data/messages.xml | 0 .../WiXBalExtension/wixext/data/tables.xml | 0 .../WiXBalExtension/wixlib/BalExtension.wixproj | 0 .../WiXBalExtension/wixlib/BalExtension.wxs | 0 .../WiXBalExtension/wixlib/wixstdba.wxs | 0 .../WiXBalExtension/wixlib/wixstdba_platform.wxi | 0 .../WiXBalExtension/wixlib/wixstdba_x86.wxs | 0 .../WiXBalExtension/wixstdba/JSON.cpp | 0 .../WiXBalExtension/wixstdba/JSON.h | 0 .../WiXBalExtension/wixstdba/JSONValue.cpp | 0 .../WiXBalExtension/wixstdba/JSONValue.h | 0 .../wixstdba/Resources/Hyperlink2Theme.xml | 0 .../wixstdba/Resources/HyperlinkTheme.wxl | 0 .../wixstdba/Resources/HyperlinkTheme.xml | 0 .../WiXBalExtension/wixstdba/Resources/LogoSide.png | Bin .../wixstdba/Resources/LoremIpsumLicense.rtf | Bin .../WiXBalExtension/wixstdba/Resources/RtfTheme.wxl | 0 .../WiXBalExtension/wixstdba/Resources/RtfTheme.xml | 0 .../WiXBalExtension/wixstdba/Resources/logo.png | Bin .../wixstdba/WixStandardBootstrapperApplication.cpp | 0 .../WiXBalExtension/wixstdba/precomp.h | 0 .../WiXBalExtension/wixstdba/resource.h | 0 .../WiXBalExtension/wixstdba/wixstdba.cpp | 0 .../WiXBalExtension/wixstdba/wixstdba.def | 0 .../WiXBalExtension/wixstdba/wixstdba.rc | 0 .../WiXBalExtension/wixstdba/wixstdba.vcxproj | 0 .../wixstdba/wixstdba.vcxproj.filters | 0 .../WiXHelper/.gitignore | 0 .../WiXHelper/CustomAction.cpp | 0 .../WiXHelper/CustomAction.def | 0 .../WiXHelper/WiXHelper.vcxproj | 0 .../WiXHelper/WiXHelper.vcxproj.filters | 0 .../WiXHelper/stdafx.cpp | 0 .../{wix-installer => installer}/WiXHelper/stdafx.h | 0 .../WiXHelper/targetver.h | 0 .../WiXInstaller/.gitignore | 0 .../WiXInstaller/Configuration.wxi_ | 0 .../WiXInstaller/MSIPackage.wixproj | 0 .../WiXInstaller/Meteor_Bundle.wxs | 0 .../WiXInstaller/Meteor_Product.wxs | 0 .../WiXInstaller/Resources/Background - Copy.png | Bin .../WiXInstaller/Resources/Background.png | Bin .../WiXInstaller/Resources/License.htm | 0 .../WiXInstaller/Resources/License.rtf | Bin .../WiXInstaller/Resources/LogoSide.png | Bin .../WiXInstaller/Resources/Product.ico | Bin .../WiXInstaller/Resources/Theme_Meteor.wxl | 0 .../WiXInstaller/Resources/Theme_Meteor.xml | 0 .../WiXInstaller/Resources/TopHeader.png | Bin .../WiXInstaller/Resources/dummy.file | 0 .../WiXInstaller/Resources/meteor-logo.png | Bin .../WiXInstaller/SetupPackage.wixproj | 0 .../WiXSDK/inc/BalBaseBootstrapperApplication.h | 0 .../WiXSDK/inc/IBootstrapperApplication.h | 0 .../WiXSDK/inc/IBootstrapperBAFunction.h | 0 .../WiXSDK/inc/IBootstrapperEngine.h | 0 .../WiXSDK/inc/aclutil.h | 0 .../WiXSDK/inc/apuputil.h | 0 .../WiXSDK/inc/atomutil.h | 0 .../WiXSDK/inc/balcondition.h | 0 .../WiXSDK/inc/balinfo.h | 0 .../WiXSDK/inc/balretry.h | 0 .../WiXSDK/inc/balutil.h | 0 .../WiXSDK/inc/buffutil.h | 0 .../WiXSDK/inc/cabcutil.h | 0 .../WiXSDK/inc/cabutil.h | 0 .../WiXSDK/inc/certutil.h | 0 .../WiXSDK/inc/conutil.h | 0 .../WiXSDK/inc/cryputil.h | 0 .../WiXSDK/inc/custommsierrors.h | 0 .../WiXSDK/inc/dictutil.h | 0 .../WiXSDK/inc/dirutil.h | 0 .../{wix-installer => installer}/WiXSDK/inc/dutil.h | 0 .../WiXSDK/inc/eseutil.h | 0 .../WiXSDK/inc/fileutil.h | 0 .../WiXSDK/inc/gdiputil.h | 0 .../WiXSDK/inc/iis7util.h | 0 .../WiXSDK/inc/inetutil.h | 0 .../WiXSDK/inc/iniutil.h | 0 .../WiXSDK/inc/jsonutil.h | 0 .../WiXSDK/inc/locutil.h | 0 .../WiXSDK/inc/logutil.h | 0 .../WiXSDK/inc/memutil.h | 0 .../WiXSDK/inc/metautil.h | 0 .../WiXSDK/inc/osutil.h | 0 .../WiXSDK/inc/pathutil.h | 0 .../WiXSDK/inc/perfutil.h | 0 .../WiXSDK/inc/polcutil.h | 0 .../WiXSDK/inc/procutil.h | 0 .../WiXSDK/inc/regutil.h | 0 .../WiXSDK/inc/resrutil.h | 0 .../WiXSDK/inc/reswutil.h | 0 .../WiXSDK/inc/rexutil.h | 0 .../WiXSDK/inc/rmutil.h | 0 .../WiXSDK/inc/rssutil.h | 0 .../WiXSDK/inc/sceutil.h | 0 .../WiXSDK/inc/shelutil.h | 0 .../WiXSDK/inc/sqlutil.h | 0 .../WiXSDK/inc/srputil.h | 0 .../WiXSDK/inc/strutil.h | 0 .../WiXSDK/inc/svcutil.h | 0 .../WiXSDK/inc/thmutil.h | 0 .../WiXSDK/inc/timeutil.h | 0 .../WiXSDK/inc/uriutil.h | 0 .../WiXSDK/inc/userutil.h | 0 .../WiXSDK/inc/wcalog.h | 0 .../WiXSDK/inc/wcautil.h | 0 .../WiXSDK/inc/wcawow64.h | 0 .../WiXSDK/inc/wcawrapquery.h | 0 .../WiXSDK/inc/wiutil.h | 0 .../WiXSDK/inc/wuautil.h | 0 .../WiXSDK/inc/xmlutil.h | 0 .../WiXSDK/vs2010/lib/x86/balutil.lib | Bin .../WiXSDK/vs2010/lib/x86/deputil.lib | Bin .../WiXSDK/vs2010/lib/x86/dutil.lib | Bin .../WiXSDK/vs2010/lib/x86/wcautil.lib | Bin .../WiXSDK/vs2012/lib/x86/balutil.lib | Bin .../WiXSDK/vs2012/lib/x86/deputil.lib | Bin .../WiXSDK/vs2012/lib/x86/dutil.lib | Bin .../WiXSDK/vs2012/lib/x86/wcautil.lib | Bin .../WiXSDK/vs2013/lib/x86/balutil.lib | Bin .../WiXSDK/vs2013/lib/x86/deputil.lib | Bin .../WiXSDK/vs2013/lib/x86/dutil.lib | Bin .../WiXSDK/vs2013/lib/x86/wcautil.lib | Bin .../windows/{wix-installer => installer}/build.bat | 0 145 files changed, 4 insertions(+), 4 deletions(-) rename scripts/windows/{wix-installer => installer}/!ReadMe.txt (100%) rename scripts/windows/{wix-installer => installer}/.gitignore (100%) rename scripts/windows/{wix-installer => installer}/MeteorSetup.sln (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/.gitignore (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/BalExtensionExt.sln (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/LICENSE.TXT (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/build.bat (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/inc/Version.proj (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/inc/WixDistribution.cs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/inc/WixDistribution.h (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/inc/wix.rc (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/inc/wixver.cs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/inc/wixver.h (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/BalCompiler.cs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/BalExtension.cs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/BalPreprocessorExtension.cs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/Properties/AssemblyInfo.cs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/WixBalExtensionExt.csproj (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/Xsd/bal.xsd (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/data/messages.xml (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixext/data/tables.xml (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixlib/BalExtension.wixproj (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixlib/BalExtension.wxs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixlib/wixstdba.wxs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixlib/wixstdba_platform.wxi (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixlib/wixstdba_x86.wxs (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/JSON.cpp (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/JSON.h (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/JSONValue.cpp (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/JSONValue.h (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/LogoSide.png (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/RtfTheme.xml (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/Resources/logo.png (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/precomp.h (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/resource.h (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/wixstdba.cpp (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/wixstdba.def (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/wixstdba.rc (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/wixstdba.vcxproj (100%) rename scripts/windows/{wix-installer => installer}/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/.gitignore (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/CustomAction.cpp (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/CustomAction.def (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/WiXHelper.vcxproj (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/WiXHelper.vcxproj.filters (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/stdafx.cpp (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/stdafx.h (100%) rename scripts/windows/{wix-installer => installer}/WiXHelper/targetver.h (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/.gitignore (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Configuration.wxi_ (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/MSIPackage.wixproj (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Meteor_Bundle.wxs (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Meteor_Product.wxs (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/Background - Copy.png (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/Background.png (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/License.htm (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/License.rtf (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/LogoSide.png (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/Product.ico (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/Theme_Meteor.wxl (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/Theme_Meteor.xml (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/TopHeader.png (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/dummy.file (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/Resources/meteor-logo.png (100%) rename scripts/windows/{wix-installer => installer}/WiXInstaller/SetupPackage.wixproj (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/BalBaseBootstrapperApplication.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/IBootstrapperApplication.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/IBootstrapperBAFunction.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/IBootstrapperEngine.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/aclutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/apuputil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/atomutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/balcondition.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/balinfo.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/balretry.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/balutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/buffutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/cabcutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/cabutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/certutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/conutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/cryputil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/custommsierrors.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/dictutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/dirutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/dutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/eseutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/fileutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/gdiputil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/iis7util.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/inetutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/iniutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/jsonutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/locutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/logutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/memutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/metautil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/osutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/pathutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/perfutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/polcutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/procutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/regutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/resrutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/reswutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/rexutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/rmutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/rssutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/sceutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/shelutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/sqlutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/srputil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/strutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/svcutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/thmutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/timeutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/uriutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/userutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/wcalog.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/wcautil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/wcawow64.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/wcawrapquery.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/wiutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/wuautil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/inc/xmlutil.h (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2010/lib/x86/balutil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2010/lib/x86/deputil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2010/lib/x86/dutil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2010/lib/x86/wcautil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2012/lib/x86/balutil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2012/lib/x86/deputil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2012/lib/x86/dutil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2012/lib/x86/wcautil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2013/lib/x86/balutil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2013/lib/x86/deputil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2013/lib/x86/dutil.lib (100%) rename scripts/windows/{wix-installer => installer}/WiXSDK/vs2013/lib/x86/wcautil.lib (100%) rename scripts/windows/{wix-installer => installer}/build.bat (100%) diff --git a/scripts/windows/build-installer.ps1 b/scripts/windows/build-installer.ps1 index dd2dd796d1..12e346c7fe 100644 --- a/scripts/windows/build-installer.ps1 +++ b/scripts/windows/build-installer.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = "Stop" $script_path = (split-path -parent $MyInvocation.MyCommand.Definition) + "\" -$conf_path = $script_path + "wix-installer\WiXInstaller\Configuration.wxi" +$conf_path = $script_path + "installer\WiXInstaller\Configuration.wxi" If ($Args.Count -ne 1) { echo "Usage:" @@ -25,13 +25,13 @@ $semverVersion = $version.Split("@")[-1] echo "Downloading binary dependencies: 7za" $7za_url = "https://s3.amazonaws.com/meteor-windows/build-deps/7za.exe" $client = new-object System.Net.WebClient -$client.DownloadFile($7za_url, $script_path + "wix-installer\WiXInstaller\Resources\7za.exe") +$client.DownloadFile($7za_url, $script_path + "installer\WiXInstaller\Resources\7za.exe") -Push-Location wix-installer +Push-Location installer Invoke-Expression ("cmd /c build.bat") Pop-Location -move-item ($script_path + "wix-installer\Release\Setup_Meteor.exe") ($script_path + "InstallMeteor.exe") +move-item ($script_path + "installer\Release\Setup_Meteor.exe") ($script_path + "InstallMeteor.exe") echo "Clean up" rm $conf_path diff --git a/scripts/windows/wix-installer/!ReadMe.txt b/scripts/windows/installer/!ReadMe.txt similarity index 100% rename from scripts/windows/wix-installer/!ReadMe.txt rename to scripts/windows/installer/!ReadMe.txt diff --git a/scripts/windows/wix-installer/.gitignore b/scripts/windows/installer/.gitignore similarity index 100% rename from scripts/windows/wix-installer/.gitignore rename to scripts/windows/installer/.gitignore diff --git a/scripts/windows/wix-installer/MeteorSetup.sln b/scripts/windows/installer/MeteorSetup.sln similarity index 100% rename from scripts/windows/wix-installer/MeteorSetup.sln rename to scripts/windows/installer/MeteorSetup.sln diff --git a/scripts/windows/wix-installer/WiXBalExtension/.gitignore b/scripts/windows/installer/WiXBalExtension/.gitignore similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/.gitignore rename to scripts/windows/installer/WiXBalExtension/.gitignore diff --git a/scripts/windows/wix-installer/WiXBalExtension/BalExtensionExt.sln b/scripts/windows/installer/WiXBalExtension/BalExtensionExt.sln similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/BalExtensionExt.sln rename to scripts/windows/installer/WiXBalExtension/BalExtensionExt.sln diff --git a/scripts/windows/wix-installer/WiXBalExtension/LICENSE.TXT b/scripts/windows/installer/WiXBalExtension/LICENSE.TXT similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/LICENSE.TXT rename to scripts/windows/installer/WiXBalExtension/LICENSE.TXT diff --git a/scripts/windows/wix-installer/WiXBalExtension/build.bat b/scripts/windows/installer/WiXBalExtension/build.bat similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/build.bat rename to scripts/windows/installer/WiXBalExtension/build.bat diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/Version.proj b/scripts/windows/installer/WiXBalExtension/inc/Version.proj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/Version.proj rename to scripts/windows/installer/WiXBalExtension/inc/Version.proj diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.cs b/scripts/windows/installer/WiXBalExtension/inc/WixDistribution.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.cs rename to scripts/windows/installer/WiXBalExtension/inc/WixDistribution.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.h b/scripts/windows/installer/WiXBalExtension/inc/WixDistribution.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/WixDistribution.h rename to scripts/windows/installer/WiXBalExtension/inc/WixDistribution.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/wix.rc b/scripts/windows/installer/WiXBalExtension/inc/wix.rc similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/wix.rc rename to scripts/windows/installer/WiXBalExtension/inc/wix.rc diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/wixver.cs b/scripts/windows/installer/WiXBalExtension/inc/wixver.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/wixver.cs rename to scripts/windows/installer/WiXBalExtension/inc/wixver.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/inc/wixver.h b/scripts/windows/installer/WiXBalExtension/inc/wixver.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/inc/wixver.h rename to scripts/windows/installer/WiXBalExtension/inc/wixver.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/BalCompiler.cs b/scripts/windows/installer/WiXBalExtension/wixext/BalCompiler.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/BalCompiler.cs rename to scripts/windows/installer/WiXBalExtension/wixext/BalCompiler.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/BalExtension.cs b/scripts/windows/installer/WiXBalExtension/wixext/BalExtension.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/BalExtension.cs rename to scripts/windows/installer/WiXBalExtension/wixext/BalExtension.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs b/scripts/windows/installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs rename to scripts/windows/installer/WiXBalExtension/wixext/BalPreprocessorExtension.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs b/scripts/windows/installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs rename to scripts/windows/installer/WiXBalExtension/wixext/Properties/AssemblyInfo.cs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj b/scripts/windows/installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj rename to scripts/windows/installer/WiXBalExtension/wixext/WixBalExtensionExt.csproj diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/Xsd/bal.xsd b/scripts/windows/installer/WiXBalExtension/wixext/Xsd/bal.xsd similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/Xsd/bal.xsd rename to scripts/windows/installer/WiXBalExtension/wixext/Xsd/bal.xsd diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/data/messages.xml b/scripts/windows/installer/WiXBalExtension/wixext/data/messages.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/data/messages.xml rename to scripts/windows/installer/WiXBalExtension/wixext/data/messages.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixext/data/tables.xml b/scripts/windows/installer/WiXBalExtension/wixext/data/tables.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixext/data/tables.xml rename to scripts/windows/installer/WiXBalExtension/wixext/data/tables.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wixproj b/scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wixproj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wixproj rename to scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wixproj diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wxs b/scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/BalExtension.wxs rename to scripts/windows/installer/WiXBalExtension/wixlib/BalExtension.wxs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba.wxs b/scripts/windows/installer/WiXBalExtension/wixlib/wixstdba.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba.wxs rename to scripts/windows/installer/WiXBalExtension/wixlib/wixstdba.wxs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_platform.wxi b/scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_platform.wxi similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_platform.wxi rename to scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_platform.wxi diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_x86.wxs b/scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_x86.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixlib/wixstdba_x86.wxs rename to scripts/windows/installer/WiXBalExtension/wixlib/wixstdba_x86.wxs diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/JSON.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSON.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.h b/scripts/windows/installer/WiXBalExtension/wixstdba/JSON.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSON.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSON.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.h b/scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/JSONValue.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/JSONValue.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/Hyperlink2Theme.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.wxl diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/HyperlinkTheme.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LogoSide.png b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LogoSide.png similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LogoSide.png rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LogoSide.png diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/LoremIpsumLicense.rtf diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.wxl diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/RtfTheme.xml diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/logo.png b/scripts/windows/installer/WiXBalExtension/wixstdba/Resources/logo.png similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/Resources/logo.png rename to scripts/windows/installer/WiXBalExtension/wixstdba/Resources/logo.png diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/WixStandardBootstrapperApplication.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/precomp.h b/scripts/windows/installer/WiXBalExtension/wixstdba/precomp.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/precomp.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/precomp.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/resource.h b/scripts/windows/installer/WiXBalExtension/wixstdba/resource.h similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/resource.h rename to scripts/windows/installer/WiXBalExtension/wixstdba/resource.h diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.cpp b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.cpp rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.cpp diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.def b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.def similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.def rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.def diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.rc b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.rc similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.rc rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.rc diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj diff --git a/scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters b/scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters similarity index 100% rename from scripts/windows/wix-installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters rename to scripts/windows/installer/WiXBalExtension/wixstdba/wixstdba.vcxproj.filters diff --git a/scripts/windows/wix-installer/WiXHelper/.gitignore b/scripts/windows/installer/WiXHelper/.gitignore similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/.gitignore rename to scripts/windows/installer/WiXHelper/.gitignore diff --git a/scripts/windows/wix-installer/WiXHelper/CustomAction.cpp b/scripts/windows/installer/WiXHelper/CustomAction.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/CustomAction.cpp rename to scripts/windows/installer/WiXHelper/CustomAction.cpp diff --git a/scripts/windows/wix-installer/WiXHelper/CustomAction.def b/scripts/windows/installer/WiXHelper/CustomAction.def similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/CustomAction.def rename to scripts/windows/installer/WiXHelper/CustomAction.def diff --git a/scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj b/scripts/windows/installer/WiXHelper/WiXHelper.vcxproj similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj rename to scripts/windows/installer/WiXHelper/WiXHelper.vcxproj diff --git a/scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj.filters b/scripts/windows/installer/WiXHelper/WiXHelper.vcxproj.filters similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/WiXHelper.vcxproj.filters rename to scripts/windows/installer/WiXHelper/WiXHelper.vcxproj.filters diff --git a/scripts/windows/wix-installer/WiXHelper/stdafx.cpp b/scripts/windows/installer/WiXHelper/stdafx.cpp similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/stdafx.cpp rename to scripts/windows/installer/WiXHelper/stdafx.cpp diff --git a/scripts/windows/wix-installer/WiXHelper/stdafx.h b/scripts/windows/installer/WiXHelper/stdafx.h similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/stdafx.h rename to scripts/windows/installer/WiXHelper/stdafx.h diff --git a/scripts/windows/wix-installer/WiXHelper/targetver.h b/scripts/windows/installer/WiXHelper/targetver.h similarity index 100% rename from scripts/windows/wix-installer/WiXHelper/targetver.h rename to scripts/windows/installer/WiXHelper/targetver.h diff --git a/scripts/windows/wix-installer/WiXInstaller/.gitignore b/scripts/windows/installer/WiXInstaller/.gitignore similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/.gitignore rename to scripts/windows/installer/WiXInstaller/.gitignore diff --git a/scripts/windows/wix-installer/WiXInstaller/Configuration.wxi_ b/scripts/windows/installer/WiXInstaller/Configuration.wxi_ similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Configuration.wxi_ rename to scripts/windows/installer/WiXInstaller/Configuration.wxi_ diff --git a/scripts/windows/wix-installer/WiXInstaller/MSIPackage.wixproj b/scripts/windows/installer/WiXInstaller/MSIPackage.wixproj similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/MSIPackage.wixproj rename to scripts/windows/installer/WiXInstaller/MSIPackage.wixproj diff --git a/scripts/windows/wix-installer/WiXInstaller/Meteor_Bundle.wxs b/scripts/windows/installer/WiXInstaller/Meteor_Bundle.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Meteor_Bundle.wxs rename to scripts/windows/installer/WiXInstaller/Meteor_Bundle.wxs diff --git a/scripts/windows/wix-installer/WiXInstaller/Meteor_Product.wxs b/scripts/windows/installer/WiXInstaller/Meteor_Product.wxs similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Meteor_Product.wxs rename to scripts/windows/installer/WiXInstaller/Meteor_Product.wxs diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Background - Copy.png b/scripts/windows/installer/WiXInstaller/Resources/Background - Copy.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Background - Copy.png rename to scripts/windows/installer/WiXInstaller/Resources/Background - Copy.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Background.png b/scripts/windows/installer/WiXInstaller/Resources/Background.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Background.png rename to scripts/windows/installer/WiXInstaller/Resources/Background.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/License.htm b/scripts/windows/installer/WiXInstaller/Resources/License.htm similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/License.htm rename to scripts/windows/installer/WiXInstaller/Resources/License.htm diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/License.rtf b/scripts/windows/installer/WiXInstaller/Resources/License.rtf similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/License.rtf rename to scripts/windows/installer/WiXInstaller/Resources/License.rtf diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/LogoSide.png b/scripts/windows/installer/WiXInstaller/Resources/LogoSide.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/LogoSide.png rename to scripts/windows/installer/WiXInstaller/Resources/LogoSide.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Product.ico b/scripts/windows/installer/WiXInstaller/Resources/Product.ico similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Product.ico rename to scripts/windows/installer/WiXInstaller/Resources/Product.ico diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.wxl b/scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.wxl similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.wxl rename to scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.wxl diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.xml b/scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.xml similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/Theme_Meteor.xml rename to scripts/windows/installer/WiXInstaller/Resources/Theme_Meteor.xml diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/TopHeader.png b/scripts/windows/installer/WiXInstaller/Resources/TopHeader.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/TopHeader.png rename to scripts/windows/installer/WiXInstaller/Resources/TopHeader.png diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/dummy.file b/scripts/windows/installer/WiXInstaller/Resources/dummy.file similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/dummy.file rename to scripts/windows/installer/WiXInstaller/Resources/dummy.file diff --git a/scripts/windows/wix-installer/WiXInstaller/Resources/meteor-logo.png b/scripts/windows/installer/WiXInstaller/Resources/meteor-logo.png similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/Resources/meteor-logo.png rename to scripts/windows/installer/WiXInstaller/Resources/meteor-logo.png diff --git a/scripts/windows/wix-installer/WiXInstaller/SetupPackage.wixproj b/scripts/windows/installer/WiXInstaller/SetupPackage.wixproj similarity index 100% rename from scripts/windows/wix-installer/WiXInstaller/SetupPackage.wixproj rename to scripts/windows/installer/WiXInstaller/SetupPackage.wixproj diff --git a/scripts/windows/wix-installer/WiXSDK/inc/BalBaseBootstrapperApplication.h b/scripts/windows/installer/WiXSDK/inc/BalBaseBootstrapperApplication.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/BalBaseBootstrapperApplication.h rename to scripts/windows/installer/WiXSDK/inc/BalBaseBootstrapperApplication.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperApplication.h b/scripts/windows/installer/WiXSDK/inc/IBootstrapperApplication.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperApplication.h rename to scripts/windows/installer/WiXSDK/inc/IBootstrapperApplication.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperBAFunction.h b/scripts/windows/installer/WiXSDK/inc/IBootstrapperBAFunction.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperBAFunction.h rename to scripts/windows/installer/WiXSDK/inc/IBootstrapperBAFunction.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperEngine.h b/scripts/windows/installer/WiXSDK/inc/IBootstrapperEngine.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/IBootstrapperEngine.h rename to scripts/windows/installer/WiXSDK/inc/IBootstrapperEngine.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/aclutil.h b/scripts/windows/installer/WiXSDK/inc/aclutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/aclutil.h rename to scripts/windows/installer/WiXSDK/inc/aclutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/apuputil.h b/scripts/windows/installer/WiXSDK/inc/apuputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/apuputil.h rename to scripts/windows/installer/WiXSDK/inc/apuputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/atomutil.h b/scripts/windows/installer/WiXSDK/inc/atomutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/atomutil.h rename to scripts/windows/installer/WiXSDK/inc/atomutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balcondition.h b/scripts/windows/installer/WiXSDK/inc/balcondition.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balcondition.h rename to scripts/windows/installer/WiXSDK/inc/balcondition.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balinfo.h b/scripts/windows/installer/WiXSDK/inc/balinfo.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balinfo.h rename to scripts/windows/installer/WiXSDK/inc/balinfo.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balretry.h b/scripts/windows/installer/WiXSDK/inc/balretry.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balretry.h rename to scripts/windows/installer/WiXSDK/inc/balretry.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/balutil.h b/scripts/windows/installer/WiXSDK/inc/balutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/balutil.h rename to scripts/windows/installer/WiXSDK/inc/balutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/buffutil.h b/scripts/windows/installer/WiXSDK/inc/buffutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/buffutil.h rename to scripts/windows/installer/WiXSDK/inc/buffutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/cabcutil.h b/scripts/windows/installer/WiXSDK/inc/cabcutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/cabcutil.h rename to scripts/windows/installer/WiXSDK/inc/cabcutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/cabutil.h b/scripts/windows/installer/WiXSDK/inc/cabutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/cabutil.h rename to scripts/windows/installer/WiXSDK/inc/cabutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/certutil.h b/scripts/windows/installer/WiXSDK/inc/certutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/certutil.h rename to scripts/windows/installer/WiXSDK/inc/certutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/conutil.h b/scripts/windows/installer/WiXSDK/inc/conutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/conutil.h rename to scripts/windows/installer/WiXSDK/inc/conutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/cryputil.h b/scripts/windows/installer/WiXSDK/inc/cryputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/cryputil.h rename to scripts/windows/installer/WiXSDK/inc/cryputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/custommsierrors.h b/scripts/windows/installer/WiXSDK/inc/custommsierrors.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/custommsierrors.h rename to scripts/windows/installer/WiXSDK/inc/custommsierrors.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/dictutil.h b/scripts/windows/installer/WiXSDK/inc/dictutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/dictutil.h rename to scripts/windows/installer/WiXSDK/inc/dictutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/dirutil.h b/scripts/windows/installer/WiXSDK/inc/dirutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/dirutil.h rename to scripts/windows/installer/WiXSDK/inc/dirutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/dutil.h b/scripts/windows/installer/WiXSDK/inc/dutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/dutil.h rename to scripts/windows/installer/WiXSDK/inc/dutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/eseutil.h b/scripts/windows/installer/WiXSDK/inc/eseutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/eseutil.h rename to scripts/windows/installer/WiXSDK/inc/eseutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/fileutil.h b/scripts/windows/installer/WiXSDK/inc/fileutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/fileutil.h rename to scripts/windows/installer/WiXSDK/inc/fileutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/gdiputil.h b/scripts/windows/installer/WiXSDK/inc/gdiputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/gdiputil.h rename to scripts/windows/installer/WiXSDK/inc/gdiputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/iis7util.h b/scripts/windows/installer/WiXSDK/inc/iis7util.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/iis7util.h rename to scripts/windows/installer/WiXSDK/inc/iis7util.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/inetutil.h b/scripts/windows/installer/WiXSDK/inc/inetutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/inetutil.h rename to scripts/windows/installer/WiXSDK/inc/inetutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/iniutil.h b/scripts/windows/installer/WiXSDK/inc/iniutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/iniutil.h rename to scripts/windows/installer/WiXSDK/inc/iniutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/jsonutil.h b/scripts/windows/installer/WiXSDK/inc/jsonutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/jsonutil.h rename to scripts/windows/installer/WiXSDK/inc/jsonutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/locutil.h b/scripts/windows/installer/WiXSDK/inc/locutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/locutil.h rename to scripts/windows/installer/WiXSDK/inc/locutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/logutil.h b/scripts/windows/installer/WiXSDK/inc/logutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/logutil.h rename to scripts/windows/installer/WiXSDK/inc/logutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/memutil.h b/scripts/windows/installer/WiXSDK/inc/memutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/memutil.h rename to scripts/windows/installer/WiXSDK/inc/memutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/metautil.h b/scripts/windows/installer/WiXSDK/inc/metautil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/metautil.h rename to scripts/windows/installer/WiXSDK/inc/metautil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/osutil.h b/scripts/windows/installer/WiXSDK/inc/osutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/osutil.h rename to scripts/windows/installer/WiXSDK/inc/osutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/pathutil.h b/scripts/windows/installer/WiXSDK/inc/pathutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/pathutil.h rename to scripts/windows/installer/WiXSDK/inc/pathutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/perfutil.h b/scripts/windows/installer/WiXSDK/inc/perfutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/perfutil.h rename to scripts/windows/installer/WiXSDK/inc/perfutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/polcutil.h b/scripts/windows/installer/WiXSDK/inc/polcutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/polcutil.h rename to scripts/windows/installer/WiXSDK/inc/polcutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/procutil.h b/scripts/windows/installer/WiXSDK/inc/procutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/procutil.h rename to scripts/windows/installer/WiXSDK/inc/procutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/regutil.h b/scripts/windows/installer/WiXSDK/inc/regutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/regutil.h rename to scripts/windows/installer/WiXSDK/inc/regutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/resrutil.h b/scripts/windows/installer/WiXSDK/inc/resrutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/resrutil.h rename to scripts/windows/installer/WiXSDK/inc/resrutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/reswutil.h b/scripts/windows/installer/WiXSDK/inc/reswutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/reswutil.h rename to scripts/windows/installer/WiXSDK/inc/reswutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/rexutil.h b/scripts/windows/installer/WiXSDK/inc/rexutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/rexutil.h rename to scripts/windows/installer/WiXSDK/inc/rexutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/rmutil.h b/scripts/windows/installer/WiXSDK/inc/rmutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/rmutil.h rename to scripts/windows/installer/WiXSDK/inc/rmutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/rssutil.h b/scripts/windows/installer/WiXSDK/inc/rssutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/rssutil.h rename to scripts/windows/installer/WiXSDK/inc/rssutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/sceutil.h b/scripts/windows/installer/WiXSDK/inc/sceutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/sceutil.h rename to scripts/windows/installer/WiXSDK/inc/sceutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/shelutil.h b/scripts/windows/installer/WiXSDK/inc/shelutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/shelutil.h rename to scripts/windows/installer/WiXSDK/inc/shelutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/sqlutil.h b/scripts/windows/installer/WiXSDK/inc/sqlutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/sqlutil.h rename to scripts/windows/installer/WiXSDK/inc/sqlutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/srputil.h b/scripts/windows/installer/WiXSDK/inc/srputil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/srputil.h rename to scripts/windows/installer/WiXSDK/inc/srputil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/strutil.h b/scripts/windows/installer/WiXSDK/inc/strutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/strutil.h rename to scripts/windows/installer/WiXSDK/inc/strutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/svcutil.h b/scripts/windows/installer/WiXSDK/inc/svcutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/svcutil.h rename to scripts/windows/installer/WiXSDK/inc/svcutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/thmutil.h b/scripts/windows/installer/WiXSDK/inc/thmutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/thmutil.h rename to scripts/windows/installer/WiXSDK/inc/thmutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/timeutil.h b/scripts/windows/installer/WiXSDK/inc/timeutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/timeutil.h rename to scripts/windows/installer/WiXSDK/inc/timeutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/uriutil.h b/scripts/windows/installer/WiXSDK/inc/uriutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/uriutil.h rename to scripts/windows/installer/WiXSDK/inc/uriutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/userutil.h b/scripts/windows/installer/WiXSDK/inc/userutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/userutil.h rename to scripts/windows/installer/WiXSDK/inc/userutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcalog.h b/scripts/windows/installer/WiXSDK/inc/wcalog.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcalog.h rename to scripts/windows/installer/WiXSDK/inc/wcalog.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcautil.h b/scripts/windows/installer/WiXSDK/inc/wcautil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcautil.h rename to scripts/windows/installer/WiXSDK/inc/wcautil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcawow64.h b/scripts/windows/installer/WiXSDK/inc/wcawow64.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcawow64.h rename to scripts/windows/installer/WiXSDK/inc/wcawow64.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wcawrapquery.h b/scripts/windows/installer/WiXSDK/inc/wcawrapquery.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wcawrapquery.h rename to scripts/windows/installer/WiXSDK/inc/wcawrapquery.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wiutil.h b/scripts/windows/installer/WiXSDK/inc/wiutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wiutil.h rename to scripts/windows/installer/WiXSDK/inc/wiutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/wuautil.h b/scripts/windows/installer/WiXSDK/inc/wuautil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/wuautil.h rename to scripts/windows/installer/WiXSDK/inc/wuautil.h diff --git a/scripts/windows/wix-installer/WiXSDK/inc/xmlutil.h b/scripts/windows/installer/WiXSDK/inc/xmlutil.h similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/inc/xmlutil.h rename to scripts/windows/installer/WiXSDK/inc/xmlutil.h diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/balutil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/balutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/balutil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/balutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/deputil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/deputil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/deputil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/deputil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/dutil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/dutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/dutil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/dutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/wcautil.lib b/scripts/windows/installer/WiXSDK/vs2010/lib/x86/wcautil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2010/lib/x86/wcautil.lib rename to scripts/windows/installer/WiXSDK/vs2010/lib/x86/wcautil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/balutil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/balutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/balutil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/balutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/deputil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/deputil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/deputil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/deputil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/dutil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/dutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/dutil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/dutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/wcautil.lib b/scripts/windows/installer/WiXSDK/vs2012/lib/x86/wcautil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2012/lib/x86/wcautil.lib rename to scripts/windows/installer/WiXSDK/vs2012/lib/x86/wcautil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/balutil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/balutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/balutil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/balutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/deputil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/deputil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/deputil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/deputil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/dutil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/dutil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/dutil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/dutil.lib diff --git a/scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/wcautil.lib b/scripts/windows/installer/WiXSDK/vs2013/lib/x86/wcautil.lib similarity index 100% rename from scripts/windows/wix-installer/WiXSDK/vs2013/lib/x86/wcautil.lib rename to scripts/windows/installer/WiXSDK/vs2013/lib/x86/wcautil.lib diff --git a/scripts/windows/wix-installer/build.bat b/scripts/windows/installer/build.bat similarity index 100% rename from scripts/windows/wix-installer/build.bat rename to scripts/windows/installer/build.bat