SharpKit
diff --git a/‎Compiler/CSharp.Tasks/make.cmd
Copy file name to clipboard
100755100644 b/‎Compiler/CSharp.Tasks/make.cmd
Copy file name to clipboard
100755100644
diff --git a/‎Compiler/Makefile
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎Compiler/Makefile
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎Compiler/make.cmd
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎Compiler/make.cmd
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎Compiler/skc5/make.cmd
Copy file name to clipboard
100755100644
+1-1Lines changed: 1 addition & 1 deletion b/‎Compiler/skc5/make.cmd
Copy file name to clipboard
100755100644
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Compiler/skc5/skc5.csproj
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎Compiler/skc5/skc5.csproj
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Installer/Installer/Installer.cs
Copy file name to clipboard
+80-54Lines changed: 80 additions & 54 deletions b/‎Installer/Installer/Installer.cs
Copy file name to clipboard
+80-54Lines changed: 80 additions & 54 deletions
diff --git a/‎Installer/Installer/Makefile
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎Installer/Installer/Makefile
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎Installer/Installer/Utils.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions b/‎Installer/Installer/Utils.cs
Copy file name to clipboard
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎Installer/Installer/make.cmd
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎Installer/Installer/make.cmd
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎Installer/Makefile
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎Installer/Makefile
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
@@ -0,0 +1,7 @@
+debug:
+	cd skc5 && $(MAKE)
+	cd CSharp.Tasks && $(MAKE)
+
+release:
+	cd skc5 && $(MAKE) release
+	cd CSharp.Tasks && $(MAKE) release
@@ -0,0 +1,11 @@
+@echo off
+cd /D %~dp0
+call ../scripts/set-variables
+
+cd skc5
+call make %1
+cd ..
+
+cd CSharp.Tasks
+call make %1
+cd ..
@@ -7,7 +7,7 @@ IF not "%1" == "release" (
 
 ) ELSE (
 
-%msbuild% /p:Configuration=Release skc5.csproj
+%msbuild% skc5.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
 
 )
 
@@ -58,8 +58,8 @@
       <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_5_Release\ICSharpCode.NRefactory.CSharp.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Cecil">
-      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\NRefactory\bin\Debug\Mono.Cecil.dll</HintPath>
-      <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\NRefactory\bin\net_4_0_Release\Mono.Cecil.dll</HintPath>
+      <HintPath Condition=" '$(Configuration)' == 'Debug'">..\..\external\cecil\bin\net_4_0_Debug\Mono.Cecil.dll</HintPath>
+      <HintPath Condition=" '$(Configuration)' == 'Release'">..\..\external\cecil\bin\net_4_0_Release\Mono.Cecil.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
 
@@ -22,9 +22,18 @@ namespace SharpKit.Installer
     class Installer
     {
 
-        public string ApplicationFolder { get; set; }
-        public string SharpKitNETFolder35 { get; set; }
-        public string SharpKitNETFolder40 { get; set; }
+        public string ApplicationFolder { get; set; } //Program Files (x86)/SharpKit/5
+        public string ApplicationCompilerFolder { get; set; } //Program Files (x86)/SharpKit/5/compiler
+        public string ApplicationDefsFolder { get; set; } //Program Files (x86)/SharpKit/5/defs
+
+        public string MSBuildFolder35 { get; set; }
+        public string MSBuildFolder40 { get; set; }
+        public string MSBuildFolder45 { get; set; }
+
+        public string MSBuildSharpKitFolder35 { get; set; }
+        public string MSBuildSharpKitFolder40 { get; set; }
+        public string MSBuildSharpKitFolder45 { get; set; }
+
         public string DocumentsFolder { get; set; }
         public string ProductVersion { get; set; }
         public string ProductType { get; set; }
@@ -34,8 +43,6 @@ class Installer
         public Guid UninstallGUID { get; set; }
         private char dsc = Path.DirectorySeparatorChar;
         private string InstallerNeedsMinVersion;
-        private string VS2013MSBuildPath { get; set; }
-        private string VS2013MSBuildPathSharpKit { get; set; }
 
         public string TemplateDirectoryVS2005 { get; set; }
         public string TemplateDirectoryVS2008 { get; set; }
@@ -49,22 +56,29 @@ class Installer
 
         public Installer()
         {
+            ApplicationFolder = Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + dsc + "SharpKit" + dsc + "5";
+            //ApplicationCompilerFolder = ApplicationFolder + dsc + "Compiler";
+            ApplicationCompilerFolder = ApplicationFolder;
+            ApplicationDefsFolder = ApplicationFolder + dsc + "Defs";
+
             if (Utils.IsUnix)
             {
-                SharpKitNETFolder35 = "/usr/lib/mono/3.5/SharpKit/5";
-                SharpKitNETFolder40 = "/usr/lib/mono/4.0/SharpKit/5";
+                MSBuildFolder35 = "/usr/lib/mono/3.5";
+                MSBuildFolder40 = "/usr/lib/mono/4.0";
+                MSBuildFolder45 = "/usr/lib/mono/4.5";
                 MonoDevelopPluginPath = "/usr/lib/monodevelop/AddIns/MonoDevelop.SharpKit";
             }
             else
             {
-                SharpKitNETFolder35 = Utils.GetFolderPath(Environment.SpecialFolder.Windows) + @"\Microsoft.NET\Framework\v3.5\SharpKit\5";
-                SharpKitNETFolder40 = Utils.GetFolderPath(Environment.SpecialFolder.Windows) + @"\Microsoft.NET\Framework\v4.0.30319\SharpKit\5";
+                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";
             }
-            ApplicationFolder = Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + dsc + "SharpKit" + dsc + "5";
-            DocumentsFolder = Utils.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+            MSBuildSharpKitFolder35 = Path.Combine(MSBuildFolder35, "SharpKit", "5");
+            MSBuildSharpKitFolder40 = Path.Combine(MSBuildFolder40, "SharpKit", "5");
+            MSBuildSharpKitFolder45 = Path.Combine(MSBuildFolder45, "SharpKit", "5");
 
-            VS2013MSBuildPath = @"C:\Program Files (x86)\MSBuild\12.0\bin";
-            VS2013MSBuildPathSharpKit = Path.Combine(VS2013MSBuildPath, @"SharpKit");
+            DocumentsFolder = Utils.GetFolderPath(Environment.SpecialFolder.MyDocuments);
 
             TemplateDirectoryVS2005 = Path.Combine(DocumentsFolder, @"Visual Studio 2005\Templates\ProjectTemplates\Visual C#\SharpKit");
             TemplateDirectoryVS2008 = Path.Combine(DocumentsFolder, @"Visual Studio 2008\Templates\ProjectTemplates\Visual C#\SharpKit");
@@ -185,6 +199,8 @@ private int GetVersionInteger(string version)
 
         public void Install()
         {
+            Uninstall();
+
             try
             {
                 Log(".NET Framework detected: " + Corex.Helpers.FrameworkVersion.Current.ToString());
@@ -198,29 +214,12 @@ public void Install()
                 using (var zip = GetZipArchive())
                 {
                     zip.ExtractDirectory(@"Files/Application", ApplicationFolder, Log);
-                    //zip.ExtractDirectory(@"Files/NET", SharpKitNETFolder35, Log);
-                    zip.ExtractDirectory(@"Files/NET", SharpKitNETFolder40, Log);
                     if (!Utils.IsUnix)
                     {
-                        //MSBuild has moved in VS2013, create symbolic link
-                        if (Directory.Exists(VS2013MSBuildPath))
-                        {
-                            if (Directory.Exists(VS2013MSBuildPathSharpKit))
-                            {
-                                Log("Removing old symbolic link: " + VS2013MSBuildPathSharpKit);
-                                Utils.UIDeleteDirectory(VS2013MSBuildPathSharpKit, false); //target is maybe not correct, so remove it
-                            }
-                            Log("Creating symbolic link: " + VS2013MSBuildPathSharpKit);
-                            if (!CreateSymbolicLink(VS2013MSBuildPathSharpKit, Path.Combine(SharpKitNETFolder40, ".."), 1))
-                            {
-                                Log("Error during creating symbolic link: " + GetLastError().ToString());
-                            }
-                        }
-
                         //zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2008, Log);
-                        zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2010, Log);
-                        zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2012, Log);
-                        zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2013, Log);
+                        //zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2010, Log);
+                        //zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2012, Log);
+                        //zip.ExtractDirectory(@"Files/Templates", TemplateDirectoryVS2013, Log);
                     }
 
                     if (Utils.IsUnix)
@@ -230,24 +229,32 @@ public void Install()
                         //TODO: zip.ExtractDirectory(@"Files/NET_Unix", SharpKitNETFolder40, Log);
                     }
                 }
+
+                CreateNETSymbolicLink(MSBuildFolder35, MSBuildSharpKitFolder35, ApplicationCompilerFolder);
+                CreateNETSymbolicLink(MSBuildFolder40, MSBuildSharpKitFolder40, ApplicationCompilerFolder);
+                CreateNETSymbolicLink(MSBuildFolder45, MSBuildSharpKitFolder45, ApplicationCompilerFolder);
+
+                CreateNETSymbolicLink(Path.Combine(TemplateDirectoryVS2010, ".."), TemplateDirectoryVS2010, Path.Combine(ApplicationFolder, "Templates"));
+                CreateNETSymbolicLink(Path.Combine(TemplateDirectoryVS2012, ".."), TemplateDirectoryVS2012, Path.Combine(ApplicationFolder, "Templates"));
+                CreateNETSymbolicLink(Path.Combine(TemplateDirectoryVS2013, ".."), TemplateDirectoryVS2013, Path.Combine(ApplicationFolder, "Templates"));
+
                 File.Copy(Utils.CurrentProcessFile, ApplicationFolder + dsc + "SharpKitSetup.exe", true);
 
                 if (Utils.IsUnix)
                 {
 
-                    CreateBashScript("skc", SharpKitNETFolder40 + "/skc5.exe");
+                    CreateBashScript("skc", ApplicationCompilerFolder + "/skc5.exe");
                     CreateBashScript("skc-setup", ApplicationFolder + "/SharpKitSetup.exe");
-                    CreateBashScript("skc-activation", ApplicationFolder + "/SharpKitActivation.exe");
+                    //CreateBashScript("skc-activation", ApplicationFolder + "/SharpKitActivation.exe");
 
                     Log("Set unix read permission");
                     Utils.GiveUnixDirectoryReadPermission(ApplicationFolder);
-                    Utils.GiveUnixDirectoryReadPermission(SharpKitNETFolder40);
                     Utils.GiveUnixDirectoryReadPermission(MonoDevelopPluginPath);
 
                     Log("Set unix execution permission");
-                    Process.Start("chmod", "+x " + SharpKitNETFolder40 + "/skc5.exe").WaitForExit();
+                    Process.Start("chmod", "+x " + ApplicationCompilerFolder + "/skc5.exe").WaitForExit();
                     Process.Start("chmod", "+x " + ApplicationFolder + "/SharpKitSetup.exe").WaitForExit();
-                    Process.Start("chmod", "+x " + ApplicationFolder + "/SharpKitActivation.exe").WaitForExit();
+                    //Process.Start("chmod", "+x " + ApplicationFolder + "/SharpKitActivation.exe").WaitForExit();
                 }
 
                 Log("Writing registry entries");
@@ -258,23 +265,22 @@ public void Install()
                     key.SetValue("ProductType", ProductType);
                 }
 
-                SetMachineKeyRegistryValue(@"Software\Microsoft\.NETFramework\AssemblyFolders\SharpKit5", "", Path.Combine(ApplicationFolder, @"Assemblies\v3.5"));
-                SetMachineKeyRegistryValue(@"Software\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx\SharpKit5", "", Path.Combine(ApplicationFolder, @"Assemblies\v3.5"));
-                SetMachineKeyRegistryValue(@"Software\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\SharpKit5", "", Path.Combine(ApplicationFolder, @"Assemblies\v4.0"));
-                SetMachineKeyRegistryValue(@"Software\Microsoft\Visual Studio\10.0\MSBuild\SafeImports", "SharpKit5", Path.Combine(WindowsFolder, @"Microsoft.NET\Framework\v3.5\SharpKit\5\SharpKit.Build.targets"));
-                SetMachineKeyRegistryValue(@"Software\Microsoft\Visual Studio\10.0\MSBuild\SafeImports", "SharpKit5", Path.Combine(WindowsFolder, @"Microsoft.NET\Framework\v4.0.30319\SharpKit\5\SharpKit.Build.targets"));
+                SetMachineKeyRegistryValue(@"Software\Microsoft\.NETFramework\AssemblyFolders\SharpKit5", "", ApplicationDefsFolder);
+                SetMachineKeyRegistryValue(@"Software\Microsoft\.NETFramework\v3.5\AssemblyFoldersEx\SharpKit5", "", ApplicationDefsFolder);
+                SetMachineKeyRegistryValue(@"Software\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\SharpKit5", "", ApplicationDefsFolder);
+                SetMachineKeyRegistryValue(@"Software\Microsoft\Visual Studio\10.0\MSBuild\SafeImports", "SharpKit5", Path.Combine(ApplicationCompilerFolder, "SharpKit.CSharp.targets"));
 
                 Log("Creating shortcuts");
                 if (Utils.IsUnix)
                 {
-                    CreateShortcutUnix("sharpkit-activate", "Activate SharpKit", ApplicationFolder + @"/SharpKitActivation.exe", "", "Activate SharpKit");
+                    //CreateShortcutUnix("sharpkit-activate", "Activate SharpKit", ApplicationFolder + @"/SharpKitActivation.exe", "", "Activate SharpKit");
                     CreateShortcutUnix("sharpkit-modify", "Modify SharpKit installation", ApplicationFolder + @"/SharpKitSetup.exe", "", "Modify SharpKit installation");
-                    CreateShortcutUnix("sharpkit-update", "Check for Sharpkit updates", SharpKitNETFolder40 + @"/skc5.exe", "/CheckForNewVersion", "Check for Updates");
+                    CreateShortcutUnix("sharpkit-update", "Check for Sharpkit updates", ApplicationCompilerFolder + @"/skc5.exe", "/CheckForNewVersion", "Check for Updates");
                 }
                 else
                 {
-                    CreateShortcutWin("Activate SharpKit", ApplicationFolder + @"\SharpKitActivation.exe", "", "Activate SharpKit");
-                    CreateShortcutWin("Check for a New Version", SharpKitNETFolder40 + @"\skc5.exe", "/CheckForNewVersion", "Check for Updates");
+                    //CreateShortcutWin("Activate SharpKit", ApplicationFolder + @"\SharpKitActivation.exe", "", "Activate SharpKit");
+                    CreateShortcutWin("Check for a New Version", ApplicationCompilerFolder + @"\skc5.exe", "/CheckForNewVersion", "Check for Updates");
                     CreateShortcutWin("Modify installation", ApplicationFolder + @"\SharpKitSetup.exe", "", "Modify installation");
                 }
 
@@ -296,6 +302,26 @@ public void Install()
                 OnFinished();
         }
 
+        void CreateNETSymbolicLink(string checkDir, string symbol, string target)
+        {
+            if (Directory.Exists(checkDir))
+            {
+                if (!Directory.Exists(Path.Combine(symbol, "..")))
+                    Directory.CreateDirectory(Path.Combine(symbol, ".."));
+
+                if (Directory.Exists(symbol))
+                {
+                    Log("Removing old symbolic link: " + symbol);
+                    Utils.UIDeleteDirectory(symbol, false); //target is maybe not correct, so remove it
+                }
+                Log("Creating symbolic link: " + symbol);
+                if (!CreateSymbolicLink(symbol, target, 1))
+                {
+                    Log("Error during creating symbolic link: " + GetLastError().ToString());
+                }
+            }
+        }
+
         [DllImport("kernel32.dll")]
         static extern bool CreateSymbolicLink(string lpSymlinkFileName, string lpTargetFileName, int dwFlags);
 
@@ -333,10 +359,10 @@ public void Uninstall()
                 EnsureInited();
                 UninstallService();
                 Log("Deleting files");
-                Utils.UIDeleteDirectory(VS2013MSBuildPathSharpKit);
+                Utils.UIDeleteDirectory(MSBuildSharpKitFolder45);
                 Utils.UIDeleteDirectory(ApplicationFolder);
-                Utils.UIDeleteDirectory(SharpKitNETFolder35);
-                Utils.UIDeleteDirectory(SharpKitNETFolder40);
+                Utils.UIDeleteDirectory(MSBuildSharpKitFolder35);
+                Utils.UIDeleteDirectory(MSBuildSharpKitFolder40);
                 if (!Utils.IsUnix)
                 {
                     Utils.UIDeleteDirectory(TemplateDirectoryVS2010);
@@ -513,7 +539,7 @@ private void InstallService()
         {
             if (Utils.IsUnix)
                 return;
-            var skc = Path.Combine(SharpKitNETFolder40, "skc5.exe");
+            var skc = Path.Combine(ApplicationCompilerFolder, "skc5.exe");
             Execute("Install SharpKit Windows Service", skc, "/service:reinstall");
         }
 
@@ -522,15 +548,15 @@ private void UninstallService()
             if (Utils.IsUnix)
                 return;
             StopService();
-            var skc = Path.Combine(SharpKitNETFolder40, "skc5.exe");
+            var skc = Path.Combine(ApplicationCompilerFolder, "skc5.exe");
             Execute("Install SharpKit Windows Service", skc, "/service:uninstall");
 
         }
 
         private void CreateNativeImage()
         {
             string ngen;
-            string skc = Path.Combine(SharpKitNETFolder40, "skc5.exe"); ;
+            string skc = Path.Combine(ApplicationCompilerFolder, "skc5.exe"); ;
             string args;
             if (Utils.IsUnix)
             {
@@ -549,7 +575,7 @@ used by your application.
             else
             {
                 ngen = Path.Combine(Utils.GetFolderPath(Environment.SpecialFolder.Windows), @"Microsoft.NET\Framework\v4.0.30319", "ngen.exe");
-                args = "install " + skc;
+                args = "install " + "\"" + skc + "\"";
             }
             Execute("CreateNativeImage", ngen, args);
         }
 
@@ -0,0 +1,5 @@
+debug:
+	xbuild skc5.csproj
+
+release:
+	xbuild /p:Configuration=Release
@@ -203,6 +203,11 @@ public static string GetFolderPath(Environment.SpecialFolder folder)
             }
         }
 
+        public static void UIDeleteDirectoryIfEmpty(string dir, bool recursive = true) {
+            if (Directory.GetFiles(dir).Length == 0 && Directory.GetDirectories(dir).Length == 0)
+                UIDeleteDirectory(dir);
+        }
+
         public static SuccessSkip UIDeleteDirectory(string dir, bool recursive = true)
         {
             if (string.IsNullOrEmpty(dir) || !Directory.Exists(dir))
 
@@ -0,0 +1,13 @@
+@cd /D %~dp0
+@call ../../scripts/set-variables
+
+IF not "%1" == "release" (
+
+%msbuild% Installer.csproj
+
+) ELSE (
+
+%msbuild% Installer.csproj /p:Configuration=Release
+
+)
+
@@ -0,0 +1,7 @@
+debug:
+	cd skc5 && $(MAKE)
+	cd CSharp.Tasks && $(MAKE)
+
+release:
+	cd skc5 && $(MAKE) release
+	cd CSharp.Tasks && $(MAKE) release
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ IF not "%1" == "release" (`
`7`	`7`
`8`	`8`	`) ELSE (`
`9`	`9`
`10`		`-%msbuild% /p:Configuration=Release skc5.csproj`
	`10`	`+%msbuild% skc5.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None`
`11`	`11`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,11 @@ public static string GetFolderPath(Environment.SpecialFolder folder)`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ public static void UIDeleteDirectoryIfEmpty(string dir, bool recursive = true) {`
	`207`	`+ if (Directory.GetFiles(dir).Length == 0 && Directory.GetDirectories(dir).Length == 0)`
	`208`	`+ UIDeleteDirectory(dir);`
	`209`	`+ }`
	`210`	`+`
`206`	`211`	`public static SuccessSkip UIDeleteDirectory(string dir, bool recursive = true)`
`207`	`212`	`{`
`208`	`213`	`if (string.IsNullOrEmpty(dir) \|\| !Directory.Exists(dir))`