Moved installation to C:\Program Files (x86)\MSBuild

Sebastian Loncar · Sebastian Loncar · commit ce573c1d5037 · 2014-08-08T13:42:41.000+02:00
diff --git a/Installer/Installer/Installer.cs b/Installer/Installer/Installer.cs
@@ -34,6 +34,8 @@ class Installer
         public string MSBuildSharpKitFolder40 { get; set; }
         public string MSBuildSharpKitFolder45 { get; set; }
 
+        //public string MSBuildExtensionPath { get; set; }
+
         public string DocumentsFolder { get; set; }
         public string ProductVersion { get; set; }
         public string ProductType { get; set; }
@@ -57,9 +59,13 @@ class Installer
 
         public Installer()
         {
-            ApplicationFolder = Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + dsc + "SharpKit" + dsc + "5";
-            //ApplicationCompilerFolder = ApplicationFolder + dsc + "Compiler";
-            ApplicationCompilerFolder = ApplicationFolder;
+            if (Utils.IsUnix)
+                ApplicationFolder = "/usr/lib/mono/xbuild/SharpKit/5";
+            else
+                ApplicationFolder = Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + dsc + "MSBuild" + dsc + "SharpKit" + dsc + "5";
+
+            ApplicationCompilerFolder = ApplicationFolder + dsc + "Compiler";
+            //ApplicationCompilerFolder = ApplicationFolder;
             ApplicationDefsFolder = ApplicationFolder + dsc + "Defs";
 
             if (Utils.IsUnix)
@@ -69,12 +75,14 @@ public Installer()
                 MSBuildFolder45 = "/usr/lib/mono/4.5";
                 MonoDevelopPluginPath = "/usr/lib/monodevelop/AddIns";
                 MonoDevelopSharpKitPluginPath = Path.Combine(MonoDevelopPluginPath, "MonoDevelop.SharpKit");
+                //MSBuildExtensionPath = "/usr/lib/mono/xbuild";
             }
             else
             {
                 MSBuildFolder35 = Utils.GetFolderPath(Environment.SpecialFolder.Windows) + @"\Microsoft.NET\Framework\v3.5";
                 MSBuildFolder40 = Utils.GetFolderPath(Environment.SpecialFolder.Windows) + @"\Microsoft.NET\Framework\v4.0.30319";
-                MSBuildFolder45 = @"C:\Program Files (x86)\MSBuild\12.0\bin";
+                MSBuildFolder45 = Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + @"\MSBuild\12.0\bin";
+                //MSBuildExtensionPath = Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + dsc + "MSBuild";
             }
             MSBuildSharpKitFolder35 = Path.Combine(MSBuildFolder35, "SharpKit", "5");
             MSBuildSharpKitFolder40 = Path.Combine(MSBuildFolder40, "SharpKit", "5");
@@ -398,6 +406,10 @@ public void Uninstall()
                 Utils.UIDeleteDirectory(ApplicationFolder);
                 Utils.UIDeleteDirectory(MSBuildSharpKitFolder35);
                 Utils.UIDeleteDirectory(MSBuildSharpKitFolder40);
+
+                //old program file dir from depricated setup location
+                Utils.UIDeleteDirectory(Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + dsc + "SharpKit" + dsc + "5");
+
                 if (!Utils.IsUnix)
                 {
                     Utils.UIDeleteDirectory(TemplateDirectoryVS2010);
diff --git a/Installer/Packager/Builder/SetupMaker.cs b/Installer/Packager/Builder/SetupMaker.cs
@@ -114,8 +114,8 @@ private void PrepareFolder()
             ////    file.Target = ParamHelper.Eval(file.Target, Vars);
             ////}
 
-            AddDirectory(GitRoot + @"Compiler\skc5\bin", @"Files\Application\");
-            AddDirectory(GitRoot + @"Compiler\CSharp.Tasks\bin", @"Files\Application\");
+            AddDirectory(GitRoot + @"Compiler\skc5\bin", @"Files\Application\Compiler\");
+            AddDirectory(GitRoot + @"Compiler\CSharp.Tasks\bin", @"Files\Application\Compiler\");
             AddDirectory(GitRoot + @"SDK\Defs\bin", @"Files\Application\Defs\");
             AddDirectory(GitRoot + @"SDK\Frameworks\JsClr\bin", @"Files\Application\Frameworks\JsClr\bin\", "SharpKit.JsClr.*");
             AddDirectory(GitRoot + @"SDK\Frameworks\JsClr\res", @"Files\Application\Frameworks\JsClr\res\", "jsclr.*");
diff --git a/SDK b/SDK
@@ -1 +1 @@
-Subproject commit 7d6115980207a14ebba8c9fa2ab8f7c8f8427651
+Subproject commit ba88c3789df2034e2f882caa16dba0b8720717fe
