SharpKit
diff --git a/‎Compiler/CSharp.Tasks/CSharp.Tasks.csproj
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Compiler/CSharp.Tasks/CSharp.Tasks.csproj
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Installer/Installer.sln
Copy file name to clipboard
+18-15Lines changed: 18 additions & 15 deletions b/‎Installer/Installer.sln
Copy file name to clipboard
+18-15Lines changed: 18 additions & 15 deletions
diff --git a/‎Installer/Installer/Installer.cs
Copy file name to clipboard
+46-13Lines changed: 46 additions & 13 deletions b/‎Installer/Installer/Installer.cs
Copy file name to clipboard
+46-13Lines changed: 46 additions & 13 deletions
diff --git a/‎Installer/Installer/Installer.csproj
Copy file name to clipboard
+8-9Lines changed: 8 additions & 9 deletions b/‎Installer/Installer/Installer.csproj
Copy file name to clipboard
+8-9Lines changed: 8 additions & 9 deletions
diff --git a/‎Installer/Installer/Makefile
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Installer/Installer/Makefile
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Installer/Installer/Program.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/‎Installer/Installer/Program.cs
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎Installer/Installer/Utils.cs
Copy file name to clipboard
+17-1Lines changed: 17 additions & 1 deletion b/‎Installer/Installer/Utils.cs
Copy file name to clipboard
+17-1Lines changed: 17 additions & 1 deletion
diff --git a/‎Installer/Makefile
Copy file name to clipboard
+2-6Lines changed: 2 additions & 6 deletions b/‎Installer/Makefile
Copy file name to clipboard
+2-6Lines changed: 2 additions & 6 deletions
diff --git a/‎Installer/Packager/Builder/SetupBuilder.cs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎Installer/Packager/Builder/SetupBuilder.cs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Installer/Packager/Builder/SetupMaker.cs
Copy file name to clipboard
+10-3Lines changed: 10 additions & 3 deletions b/‎Installer/Packager/Builder/SetupMaker.cs
Copy file name to clipboard
+10-3Lines changed: 10 additions & 3 deletions
@@ -72,7 +72,7 @@ copy $(TargetDir)*.Tasks.dll $(ProjectDir)..\skc5\bin\</PostBuildEvent>
 mkdir -p $(ProjectDir)..\skc5\bin
 cp $(ProjectDir)*.targets $(ProjectDir)..\skc5\bin\
 cp $(ProjectDir)*.Tasks $(ProjectDir)..\skc5\bin\
-#cp $(ProjectDir)..\skc5\bin\SharpKit.CSharp.targets $(ProjectDir)..\skc5\bin\SharpKit.Build.targets
+cp $(ProjectDir)..\skc5\bin\SharpKit.CSharp.targets $(ProjectDir)..\skc5\bin\SharpKit.Build.targets
 cp $(TargetDir)*.Tasks.dll $(ProjectDir)..\skc5\bin\
     </PostBuildEvent>
   </PropertyGroup>
 
@@ -1,17 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 2012
 VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Installer", "Installer\Installer.csproj", "{EA0675B5-6803-425C-97FE-3C257BC6B902}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packager", "Packager\Packager.csproj", "{693DF473-3732-4845-BDDB-F441081FCB26}"
 EndProject
 Global
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -21,16 +17,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|x86.ActiveCfg = Debug|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|x86.Build.0 = Debug|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|Any CPU.ActiveCfg = Release|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|Mixed Platforms.Build.0 = Release|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|x86.ActiveCfg = Release|x86
-		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|x86.Build.0 = Release|x86
 		{693DF473-3732-4845-BDDB-F441081FCB26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{693DF473-3732-4845-BDDB-F441081FCB26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{693DF473-3732-4845-BDDB-F441081FCB26}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -41,6 +27,23 @@ Global
 		{693DF473-3732-4845-BDDB-F441081FCB26}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{693DF473-3732-4845-BDDB-F441081FCB26}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{693DF473-3732-4845-BDDB-F441081FCB26}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|x86.ActiveCfg = Debug|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Debug|x86.Build.0 = Debug|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|Any CPU.ActiveCfg = Release|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|Mixed Platforms.Build.0 = Release|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|x86.ActiveCfg = Release|x86
+		{EA0675B5-6803-425C-97FE-3C257BC6B902}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		StartupItem = Installer\Installer.csproj
+	EndGlobalSection
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 
@@ -50,6 +50,7 @@ class Installer
         public string TemplateDirectoryVS2012 { get; set; }
         public string TemplateDirectoryVS2013 { get; set; }
         public string MonoDevelopPluginPath { get; set; }
+        public string MonoDevelopSharpKitPluginPath { get; set; }
 
         private string WindowsFolder = Utils.GetFolderPath(Environment.SpecialFolder.Windows);
         private Dictionary<string, string> ConfigHash;
@@ -66,7 +67,8 @@ public Installer()
                 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";
+                MonoDevelopPluginPath = "/usr/lib/monodevelop/AddIns";
+                    MonoDevelopSharpKitPluginPath = Path.Combine(MonoDevelopPluginPath,"MonoDevelop.SharpKit");
             }
             else
             {
@@ -224,7 +226,7 @@ public void Install()
 
                     if (Utils.IsUnix)
                     {
-                        zip.ExtractDirectory(@"Files/MonoDevelopPlugin", MonoDevelopPluginPath, Log);
+                                //zip.ExtractDirectory(@"Files/MonoDevelopPlugin", MonoDevelopPluginPath, Log);
                         ////zip.ExtractDirectory(@"Files/NET_Unix", SharpKitNETFolder35, Log);
                         //TODO: zip.ExtractDirectory(@"Files/NET_Unix", SharpKitNETFolder40, Log);
                     }
@@ -234,9 +236,15 @@ public void Install()
                 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"));
+                if(!Utils.IsUnix){
+                CreateNETSymbolicLink(Utils.GetParentDir(TemplateDirectoryVS2010), TemplateDirectoryVS2010, Path.Combine(ApplicationFolder, "Templates"));
+                CreateNETSymbolicLink(Utils.GetParentDir(TemplateDirectoryVS2012), TemplateDirectoryVS2012, Path.Combine(ApplicationFolder, "Templates"));
+                CreateNETSymbolicLink(Utils.GetParentDir(TemplateDirectoryVS2013), TemplateDirectoryVS2013, Path.Combine(ApplicationFolder, "Templates"));
+                    }
+
+                if(Utils.IsUnix){
+                   CreateNETSymbolicLink(MonoDevelopPluginPath, MonoDevelopSharpKitPluginPath, Path.Combine(ApplicationFolder,"Integration","MonoDevelop"));
+                }
 
                 File.Copy(Utils.CurrentProcessFile, ApplicationFolder + dsc + "SharpKitSetup.exe", true);
 
@@ -248,12 +256,17 @@ public void Install()
                     //CreateBashScript("skc-activation", ApplicationFolder + "/SharpKitActivation.exe");
 
                     Log("Set unix read permission");
-                    Utils.GiveUnixDirectoryReadPermission(ApplicationFolder);
-                    Utils.GiveUnixDirectoryReadPermission(MonoDevelopPluginPath);
+                        //Utils.GiveUnixDirectoryReadPermission(ApplicationFolder);
+                        //Utils.GiveUnixDirectoryReadPermission(MonoDevelopSharpKitPluginPath);
+                        Process.Start("chmod", "-R ugo+rX " + Utils.GetParentDir(ApplicationFolder)).WaitForExit();
+
+                        Process.Start("chmod", "-R ugo+rX " + Utils.GetParentDir(Utils.GetParentDir(MSBuildSharpKitFolder35))).WaitForExit();
+                        Process.Start("chmod", "-R ugo+rX " + Utils.GetParentDir(Utils.GetParentDir(MSBuildSharpKitFolder40))).WaitForExit();
+                        Process.Start("chmod", "-R ugo+rX " + Utils.GetParentDir(Utils.GetParentDir(MSBuildSharpKitFolder45))).WaitForExit();
 
                     Log("Set unix execution permission");
-                    Process.Start("chmod", "+x " + ApplicationCompilerFolder + "/skc5.exe").WaitForExit();
-                    Process.Start("chmod", "+x " + ApplicationFolder + "/SharpKitSetup.exe").WaitForExit();
+                        Process.Start("chmod", "ugo+x " + ApplicationCompilerFolder + "/skc5.exe").WaitForExit();
+                        Process.Start("chmod", "ugo+x " + ApplicationFolder + "/SharpKitSetup.exe").WaitForExit();
                     //Process.Start("chmod", "+x " + ApplicationFolder + "/SharpKitActivation.exe").WaitForExit();
                 }
 
@@ -279,9 +292,11 @@ public void Install()
                 }
                 else
                 {
+                        #if WINNT
                     //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");
+                        #endif
                 }
 
                 if (!Utils.IsUnix)
@@ -306,22 +321,38 @@ 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(Utils.GetParentDir(symbol)))
+                        Directory.CreateDirectory(Utils.GetParentDir(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);
+                CreateLink(symbol, target);
+            }
+        }
+
+        void CreateLink(string symbol, string target){
+            Log("Creating symbolic link: " + symbol);
+            if (Utils.IsUnix)
+            {
+                    RunProcess("ln", "-s " + target + " " + symbol);
+            }
+            else
+            {
                 if (!CreateSymbolicLink(symbol, target, 1))
                 {
                     Log("Error during creating symbolic link: " + GetLastError().ToString());
                 }
             }
         }
 
+        void RunProcess(string app, string args){
+            Log(String.Format("Running: {0}, Args: {1}",app, args));
+            Process.Start(app, args).WaitForExit();
+        }
+
         [DllImport("kernel32.dll")]
         static extern bool CreateSymbolicLink(string lpSymlinkFileName, string lpTargetFileName, int dwFlags);
 
@@ -371,7 +402,7 @@ public void Uninstall()
                 }
                 else
                 {
-                    Utils.UIDeleteDirectory(MonoDevelopPluginPath);
+                        Utils.UIDeleteDirectory(MonoDevelopSharpKitPluginPath);
                 }
 
                 if (Utils.IsUnix)
@@ -477,6 +508,7 @@ private TZipArchive GetZipArchive()
             return new TZipArchive(ms);
         }
 
+        #if WINNT
         private void CreateShortcutWin(string name, string destFile, string arguments = "", string description = "")
         {
             var lnkFile = StartMenuDir + dsc + name + ".lnk";
@@ -492,6 +524,7 @@ private void CreateShortcutWin(string name, string destFile, string arguments =
             shortcut.WorkingDirectory = Path.GetDirectoryName(destFile); ;
             shortcut.Save();
         }
+        #endif
 
         private void CreateShortcutUnix(string fileName, string name, string destFile, string arguments = "", string description = "")
         {
 
@@ -3,8 +3,6 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA0675B5-6803-425C-97FE-3C257BC6B902}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -39,6 +37,8 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
+    <DefineConstants Condition=" '$(OS)' == 'Windows_NT' ">WINNT</DefineConstants>
+    <DefineConstants Condition=" '$(OS)' != 'Windows_NT' ">UNIX</DefineConstants>
     <ApplicationManifest>UAC.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
@@ -52,11 +52,6 @@
       <HintPath>..\..\external\corex\src\corex\bin\corex.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>res\ICSharpCode.SharpZipLib.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.ServiceProcess" />
@@ -68,6 +63,10 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>res\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Dialog.cs" />
@@ -131,7 +130,7 @@
     <None Include="res\ICSharpCode.SharpZipLib.dll" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="IWshRuntimeLibrary">
+    <COMReference Condition=" '$(OS)' == 'Windows_NT' " Include="IWshRuntimeLibrary">
       <Guid>{F935DC20-1CF0-11D0-ADB9-00C04FD58A0B}</Guid>
       <VersionMajor>1</VersionMajor>
       <VersionMinor>0</VersionMinor>
@@ -141,7 +140,7 @@
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <Private>False</Private>
     </COMReference>
-    <COMReference Include="Shell32">
+    <COMReference Condition=" '$(OS)' == 'Windows_NT' " Include="Shell32">
       <Guid>{50A7E9B0-70EF-11D1-B75A-00A0C90564FE}</Guid>
       <VersionMajor>1</VersionMajor>
       <VersionMinor>0</VersionMinor>
 
@@ -1,5 +1,5 @@
 debug:
-	xbuild skc5.csproj
+	xbuild
 
 release:
 	xbuild /p:Configuration=Release
@@ -86,6 +86,15 @@ public static void Main2()
                 }
             }
 
+            #if UNIX
+            if (!Utils.IsUnix)
+            {
+                MessageBox.Show("This installer was compiled on an unix system. Installation on windows is not supported.", "Not supported", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Application.Exit();
+                return;
+            }
+            #endif
+
             //MessageBox.Show(string.Format("currProcessPath: {0}\nProgramFilesX86Path: {1}\nProgramFilesPath: {2}", Utils.CurrentProcessFile.ToLower(), Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86).ToLower(), Utils.GetFolderPath(Environment.SpecialFolder.ProgramFiles).ToLower()));
 
             if (Utils.CurrentProcessFile.ToLower().Contains(Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86).ToLower()))
 
@@ -52,6 +52,22 @@ public static bool RootRestart()
         [DllImport("libc")]
         public static extern uint getuid();
 
+        public static string CorrectPathSeparator(string path){
+            if (IsUnix)
+                return path.Replace("\\", "/");
+            else
+                return path.Replace("/", "\\");
+        }
+
+        public static string GetParentDir(string dir){
+            dir = CorrectPathSeparator(dir);
+            if(dir.EndsWith(Path.DirectorySeparatorChar.ToString())) dir=dir.Substring(0,dir.Length-1);
+            var idx = dir.LastIndexOf(Path.DirectorySeparatorChar);
+            if (idx <= 0)
+                throw new Exception("Could not get parent: " + dir);
+            return dir.Substring(0, idx);
+        }
+
         private static bool isUnixRoot
         {
             get
@@ -74,7 +90,7 @@ public static void GiveUnixDirectoryReadPermission(string dir)
 
         public static void GiveUnixFileReadPermission(string file)
         {
-            Process.Start("chmod", "+r " + file).WaitForExit();
+            Process.Start("chmod", "ugo+r " + file).WaitForExit();
         }
 
         private static string _CurrentProcessFile;
 
@@ -1,7 +1,3 @@
-debug:
-	cd skc5 && $(MAKE)
-	cd CSharp.Tasks && $(MAKE)
-
 release:
-	cd skc5 && $(MAKE) release
-	cd CSharp.Tasks && $(MAKE) release
+	cd Packager && $(MAKE) release
+	./Packager/bin/Packager.exe
@@ -74,8 +74,8 @@ void CreateZip()
 
         void CreateExe()
         {
-            File.Copy(ZipPath, Path.Combine(InstallerProjectDir, "res\\" + Path.GetFileName(ZipPath)), true);
-            File.Copy(ConfigPath, Path.Combine(InstallerProjectDir, "res\\" + Path.GetFileName(ConfigPath)), true);
+            File.Copy(ZipPath, Path.Combine(InstallerProjectDir, "res", Path.GetFileName(ZipPath)), true);
+            File.Copy(ConfigPath, Path.Combine(InstallerProjectDir, "res", Path.GetFileName(ConfigPath)), true);
             //Program.BuildProject(SkSlnFilename, "Release", "Installer");
             System.Diagnostics.Process.Start(Path.Combine(InstallerProjectDir, "make"), "release");
             Console.WriteLine("creating executable");
 
@@ -17,6 +17,8 @@ class SetupMaker
         public string TempDir { get; set; }
         public string InstallerProjectDir { get; set; }
 
+        private char dsc = Path.DirectorySeparatorChar;
+
         public SetupMaker()
         {
             TempDir = Path.Combine(Path.GetTempPath(), "SharpKitInstaller") + Path.DirectorySeparatorChar;
@@ -25,8 +27,8 @@ public SetupMaker()
                 if (Directory.Exists(TempDir)) Directory.Delete(TempDir, true);
             }
             catch { }
-            TempBinDir = TempDir + @"bin\";
-            TempZipDir = TempDir + @"zip\";
+            TempBinDir = TempDir + @"bin"+dsc;
+            TempZipDir = TempDir + @"zip"+dsc;
         }
 
         public void Run()
@@ -41,11 +43,15 @@ public void Run()
 
         void AddFile(string source, string target)
         {
+            source = Utils.CorrectPathSeparator(source);
+            target = Utils.CorrectPathSeparator(target);
             Files.Add(new FileMapping { Source = source, Target = target });
         }
 
         void AddDirectory(string source, string target, string filter = "")
         {
+            source = Utils.CorrectPathSeparator(source);
+            target = Utils.CorrectPathSeparator(target);
             if (filter == "") filter = "*";
             foreach (var file in System.IO.Directory.GetFiles(source, filter))
             {
@@ -113,7 +119,8 @@ private void PrepareFolder()
             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.*");
-            AddFile(GitRoot + @"Integration\VisualStudio\ProjectTemplates\SharpKit 5 Web Application.zip", @"Files\Application\Templates\");
+            AddFile(GitRoot + @"Integration\VisualStudio\ProjectTemplates\SharpKit 5 Web Application.zip", @"Files\Application\Integration\VisualStudio\Templates\");
+            AddDirectory(GitRoot + @"Integration\MonoDevelop\bin", @"Files\Application\Integration\MonoDevelop\");
 
             foreach (var file in Files)
             {
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,15 @@ public static void Main2()`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ #if UNIX`
	`90`	`+ if (!Utils.IsUnix)`
	`91`	`+ {`
	`92`	`+ MessageBox.Show("This installer was compiled on an unix system. Installation on windows is not supported.", "Not supported", MessageBoxButtons.OK, MessageBoxIcon.Error);`
	`93`	`+ Application.Exit();`
	`94`	`+ return;`
	`95`	`+ }`
	`96`	`+ #endif`
	`97`	`+`
`89`	`98`	`//MessageBox.Show(string.Format("currProcessPath: {0}\nProgramFilesX86Path: {1}\nProgramFilesPath: {2}", Utils.CurrentProcessFile.ToLower(), Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86).ToLower(), Utils.GetFolderPath(Environment.SpecialFolder.ProgramFiles).ToLower()));`
`90`	`99`
`91`	`100`	`if (Utils.CurrentProcessFile.ToLower().Contains(Utils.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86).ToLower()))`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ class SetupMaker`
`17`	`17`	`public string TempDir { get; set; }`
`18`	`18`	`public string InstallerProjectDir { get; set; }`
`19`	`19`
	`20`	`+ private char dsc = Path.DirectorySeparatorChar;`
	`21`	`+`
`20`	`22`	`public SetupMaker()`
`21`	`23`	`{`
`22`	`24`	`TempDir = Path.Combine(Path.GetTempPath(), "SharpKitInstaller") + Path.DirectorySeparatorChar;`
`@@ -25,8 +27,8 @@ public SetupMaker()`
`25`	`27`	`if (Directory.Exists(TempDir)) Directory.Delete(TempDir, true);`
`26`	`28`	`}`
`27`	`29`	`catch { }`
`28`		`- TempBinDir = TempDir + @"bin\";`
`29`		`- TempZipDir = TempDir + @"zip\";`
	`30`	`+ TempBinDir = TempDir + @"bin"+dsc;`
	`31`	`+ TempZipDir = TempDir + @"zip"+dsc;`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`public void Run()`
`@@ -41,11 +43,15 @@ public void Run()`
`41`	`43`
`42`	`44`	`void AddFile(string source, string target)`
`43`	`45`	`{`
	`46`	`+ source = Utils.CorrectPathSeparator(source);`
	`47`	`+ target = Utils.CorrectPathSeparator(target);`
`44`	`48`	`Files.Add(new FileMapping { Source = source, Target = target });`
`45`	`49`	`}`
`46`	`50`
`47`	`51`	`void AddDirectory(string source, string target, string filter = "")`
`48`	`52`	`{`
	`53`	`+ source = Utils.CorrectPathSeparator(source);`
	`54`	`+ target = Utils.CorrectPathSeparator(target);`
`49`	`55`	`if (filter == "") filter = "*";`
`50`	`56`	`foreach (var file in System.IO.Directory.GetFiles(source, filter))`
`51`	`57`	`{`
`@@ -113,7 +119,8 @@ private void PrepareFolder()`
`113`	`119`	`AddDirectory(GitRoot + @"SDK\Defs\bin", @"Files\Application\Defs\");`
`114`	`120`	`AddDirectory(GitRoot + @"SDK\Frameworks\JsClr\bin", @"Files\Application\Frameworks\JsClr\bin\", "SharpKit.JsClr.*");`
`115`	`121`	`AddDirectory(GitRoot + @"SDK\Frameworks\JsClr\res", @"Files\Application\Frameworks\JsClr\res\","jsclr.*");`
`116`		`- AddFile(GitRoot + @"Integration\VisualStudio\ProjectTemplates\SharpKit 5 Web Application.zip", @"Files\Application\Templates\");`
	`122`	`+ AddFile(GitRoot + @"Integration\VisualStudio\ProjectTemplates\SharpKit 5 Web Application.zip", @"Files\Application\Integration\VisualStudio\Templates\");`
	`123`	`+ AddDirectory(GitRoot + @"Integration\MonoDevelop\bin", @"Files\Application\Integration\MonoDevelop\");`
`117`	`124`
`118`	`125`	`foreach (var file in Files)`
`119`	`126`	`{`