diff --git a/deployment/windows/wixSetup/Setup/build/Setup.sln b/deployment/windows/wixSetup/Setup/build/Setup.sln
deleted file mode 100644
index d48a3c9d..00000000
--- a/deployment/windows/wixSetup/Setup/build/Setup.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Setup", "Setup\Setup.vcxproj", "{A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Debug|x64.ActiveCfg = Debug|x64
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Debug|x64.Build.0 = Debug|x64
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Debug|x86.ActiveCfg = Debug|Win32
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Debug|x86.Build.0 = Debug|Win32
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Release|x64.ActiveCfg = Release|x64
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Release|x64.Build.0 = Release|x64
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Release|x86.ActiveCfg = Release|Win32
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}.Release|x86.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj b/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj
deleted file mode 100644
index b184699b..00000000
--- a/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
- {A9CADD4E-FCC2-43C0-BE60-8DC8962D1539}
- Win32Proj
- Setup
- 8.1
-
-
-
- Application
- true
- v140
- Unicode
-
-
- Application
- false
- v140
- true
- Unicode
-
-
- Application
- true
- v140
- Unicode
-
-
- Application
- false
- v140
- true
- Unicode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- ..\..\..\build
-
-
- true
- ..\..\..\build
-
-
- false
- ..\..\..\build
-
-
- false
- ..\..\..\build
-
-
-
-
-
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- ..\..\src;%(AdditionalIncludeDirectories)
-
-
- Console
- true
-
-
-
-
-
-
- Level3
- Disabled
- WIN64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- ..\..\src;%(AdditionalIncludeDirectories)
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
-
-
- MaxSpeed
- true
- true
- WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
- true
- true
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj.filters b/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj.filters
deleted file mode 100644
index 8fc25dbe..00000000
--- a/deployment/windows/wixSetup/Setup/build/Setup/Setup.vcxproj.filters
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/Setup/src/main.cpp b/deployment/windows/wixSetup/Setup/src/main.cpp
deleted file mode 100644
index f56f2f21..00000000
--- a/deployment/windows/wixSetup/Setup/src/main.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include
-#include
-
-int main()
-{
- HKEY hKey;
-#ifdef WIN64
- LONG lResult = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Coati Software OG\\Sourcetrail 64-bit\\sourcetrailAppData"), 0, KEY_READ, &hKey);
-#else
- LONG lResult = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Coati Software OG\\Sourcetrail\\sourcetrailAppData"), 0, KEY_READ, &hKey);
-#endif
- if (lResult == ERROR_SUCCESS)
- {
- std::cout << "Sourcetrail found" << std::endl;
- std::cout << "Performing upgrade" << std::endl;
- }
- else
- {
- std::cout << "Sourcetrail not found" << std::endl;
- std::cout << "Performing initial installation" << std::endl;
- }
-
- system("msiexec /i sourcetrail.msi");
-
- return 0;
-}
diff --git a/deployment/windows/wixSetup/build.sh b/deployment/windows/wixSetup/build.sh
index 03cd378b..687e04cb 100644
--- a/deployment/windows/wixSetup/build.sh
+++ b/deployment/windows/wixSetup/build.sh
@@ -24,7 +24,6 @@ rm -rf ../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
echo $"%windir%\system32\msiexec.exe /x {$PRODUCT_GUID}" >../../../bin/app/data/install/uninstall_wix_$WIN_ARCH.bat
-"devenv.com" Setup/build/Setup.sln //build "Release|$X_ARCH"
"devenv.com" CustomActions/CustomActions.sln //build "Release|$X_ARCH"
OUTPUT_DIR=bin/$WIN_ARCH
@@ -36,6 +35,5 @@ candle.exe -dProductVersion="$VERSION_STRING" -dProductGuid="$PRODUCT_GUID" -arc
light.exe -ext WixUIExtension build/sourcetrail.wixobj build/customActions.wixobj build/dialogShortcuts.wixobj build/installDir.wixobj build/appDataDir.wixobj -out build/sourcetrail.msi > build/linkLog.txt
cp -u -r build/sourcetrail.msi $OUTPUT_DIR
-cp -u -r build/Setup.exe $OUTPUT_DIR
cp -u -r lib/$WIN_ARCH/* $OUTPUT_DIR
cp -u -r readme.txt $OUTPUT_DIR
\ No newline at end of file
diff --git a/deployment/windows/wixSetup/readme.txt b/deployment/windows/wixSetup/readme.txt
index f803d909..424b4d44 100644
--- a/deployment/windows/wixSetup/readme.txt
+++ b/deployment/windows/wixSetup/readme.txt
@@ -2,7 +2,7 @@
||Sourcetrail Setup||
=====================
-To install Sourcetrail simply run 'Setup.exe'
+To install Sourcetrail simply run 'sourcetrail.msi'
-If you have a previous version installed, Setup.exe will attempt to upgrade.
-Your previous application specific settings will be maintained.
+Note: If you have a previous version installed, sourcetrail.msi will attempt
+to upgrade. Your previous application specific settings will be maintained.
diff --git a/src/lib_gui/platform_includes/includesWindows.h b/src/lib_gui/platform_includes/includesWindows.h
index f722da45..7e757c84 100644
--- a/src/lib_gui/platform_includes/includesWindows.h
+++ b/src/lib_gui/platform_includes/includesWindows.h
@@ -9,7 +9,7 @@
#include "utility/file/FileSystem.h"
#include "utility/ResourcePaths.h"
#include "utility/UserPaths.h"
-#include "utility/utilityApp.h"
+#include "utility/utility.h"
#include "platform_includes/deploy.h"