Merge branch 'development' into new_controls

Conflicts:
	PluginCore/PluginCore/Controls/RichToolTip.cs
	PluginCore/ScintillaNet/ScintillaControl.cs

CI/build.cmd

@@ -45,11 +45,11 @@ if %errorlevel% neq 0 goto :error
 :: Reset bin files
 git clean -f -x -d FlashDevelop\Bin\Debug
 
-:: Remove bad files
-del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
-del FlashDevelop\Bin\Debug\FlashDevelopx64.exe.config
-del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
+:: Remove unnecessary files
+rd "FlashDevelop\Bin\Debug\Tools\flexpmd" /s /q
+rd "FlashDevelop\Bin\Debug\Tools\flexlibs\frameworks\libs\player" /s /q
 for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
+del "FlashDevelop\Bin\Debug\StartPage\images\*.*" /q
 
 :: Copy distro files
 xcopy Distros\HaxeDevelop /s /e /y
@@ -71,6 +71,18 @@ msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
 
+:: Rename binaries
+ren FlashDevelop\Bin\Debug\FlashDevelop.exe HaxeDevelop.exe
+ren FlashDevelop\Bin\Debug\FlashDevelop64.exe HaxeDevelop64.exe
+ren FlashDevelop\Bin\Debug\FlashDevelop.exe.config HaxeDevelop.exe.config
+ren FlashDevelop\Bin\Debug\FlashDevelop64.exe.config HaxeDevelop64.exe.config
+
+: Remove files after build
+del "FlashDevelop\Bin\Debug\Plugins\CodeAnalyzer.dll" /q
+
+:: Check for build errors
+if %errorlevel% neq 0 goto :error
+
 :: Create the installer
 makensis FlashDevelop\Installer\Installer.nsi
 
@@ -81,7 +93,7 @@ if %errorlevel% neq 0 goto :error
 7z a -tzip FlashDevelop\Installer\Binary\HaxeDevelop.zip .\FlashDevelop\Bin\Debug\* -xr!.empty
 
 :: Done
-exit
+exit 0
 
 :error
 

CI/buildl.cmd

@@ -55,11 +55,11 @@ if %errorlevel% neq 0 goto :error
 :: Reset bin files
 git clean -f -x -d FlashDevelop\Bin\Debug
 
-:: Remove bad files
-del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
-del FlashDevelop\Bin\Debug\FlashDevelopx64.exe.config
-del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
+:: Remove unnecessary files
+rd "FlashDevelop\Bin\Debug\Tools\flexpmd" /s /q
+rd "FlashDevelop\Bin\Debug\Tools\flexlibs\frameworks\libs\player" /s /q
 for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
+del "FlashDevelop\Bin\Debug\StartPage\images\*.*" /q
 
 :: Copy distro files
 xcopy Distros\HaxeDevelop /s /e /y
@@ -81,6 +81,18 @@ msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
 :: Check for build errors
 if %errorlevel% neq 0 goto :error
 
+:: Rename binaries
+ren FlashDevelop\Bin\Debug\FlashDevelop.exe HaxeDevelop.exe
+ren FlashDevelop\Bin\Debug\FlashDevelop64.exe HaxeDevelop64.exe
+ren FlashDevelop\Bin\Debug\FlashDevelop.exe.config HaxeDevelop.exe.config
+ren FlashDevelop\Bin\Debug\FlashDevelop64.exe.config HaxeDevelop64.exe.config
+
+: Remove files after build
+del "FlashDevelop\Bin\Debug\Plugins\CodeAnalyzer.dll" /q
+
+:: Check for build errors
+if %errorlevel% neq 0 goto :error
+
 :: Create the installer
 makensis FlashDevelop\Installer\Installer.nsi
 
@@ -90,11 +102,14 @@ if %errorlevel% neq 0 goto :error
 :: Create the archive
 7z a -tzip FlashDevelop\Installer\Binary\HaxeDevelop.zip .\FlashDevelop\Bin\Debug\* -xr!.empty
 
-: finish
+:finish
+
+:: Revert distro changes with backup
+git stash save "Local CI Backup..."
 
 :: Done, Run FD
 start FlashDevelop\Installer\Binary\FlashDevelop.exe
-exit
+exit 0
 
 :error
 

CONTRIBUTING.md

@@ -1,10 +1,10 @@
 # AppMan entries
 
-If you want to add your plugin, theme or extension to AppMan, you need to do a pull request to the appman.xml file adding a new entry inside the FD5 comments. Requirements for the offered plugins, themes or extensions are:
+If you want to add your plugin, theme or extension to AppMan, you need to do a pull request to the `appman.xml` file adding a new entry inside the FD5 comments. Requirements for the offered plugins, themes or extensions are:
 
-* Code needs to be opensource and reviewable in a public repository
-* The item needs to be packaged into a FDZ file and provide a MD5 checksum for verification
-* The FDZ needs to extract the files to the user app data directory
+* Code needs to be open source and reviewable in a public repository
+* The item needs to be packaged into a `.fdz` file and provide a MD5 checksum for verification
+* The `.fdz` needs to extract the files to the automated plugin directory: `$(BaseDir)/Plugins`
 
 # Coding style
 
@@ -132,7 +132,7 @@ Point[] myPoints = new Point[]
 ##### Code example:
 
 ```c#
-import System;
+using System;
 
 namespace MyNameSpace
 {

Distros/HaxeDevelop/FlashDevelop/Bin/Debug/Docs/index.html

@@ -54,8 +54,8 @@ <h4>Components</h4>
 		</ul>
 
 		<h4>Licence</h4>
-		<p>Copyright (c) 2015 Haxe Foundation - HaxeDevelop.org</p>
-		<p>Portions copyright Philippe Elsass and all helpful contributors.</p>
+		<p>Copyright (c) 2016 Haxe Foundation - HaxeDevelop.org</p>
+		<p>Portions copyright Mika Palmu, Philippe Elsass and all helpful contributors.</p>
 		<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 		documentation files (the "Software"), to deal in the Software without restriction, including without limitation
 		the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and

Distros/HaxeDevelop/FlashDevelop/Bin/Debug/StartPage/javascript/startpage.js

@@ -4,7 +4,7 @@
 var rssFeedItemTemplate = "<h3 class=\"rssItemTitle\"><a href=\"javascript:window.external.ShowURL('{1}');\">{0}</a></h3><span class=\"rssItemContent\">{2}</span>";
 var projectItemTemplate = "<li onclick=\"javascript:window.external.OpenProject('{1}');\" title=\"{1} ({2})\">{0}</li>";
 var tooltipTextTemplate = "{0}<br /><b>" + getLocaleString("tooltipTextType") + "</b> {1}<br /><b>" + getLocaleString("tooltipTextCreated") + "</b> {2}<br /><b>" + getLocaleString("tooltipTextModified") + "</b> {3}";
-var versionAvailableTemplate = "<button onclick=\"window.open('{1}');\" class=\"button\"><b>{0}:</b> " + getLocaleString("downloadVersionHere") + "</button>";
+var versionAvailableTemplate = "<button onclick=\"javascript:document.location.href='{1}';\" class=\"button\"><b>{0}:</b> " + getLocaleString("downloadVersionHere") + "</button>";
 var versionOutOfDateTemplate = "<p>" + getLocaleString("yourVersionIsOutOfDate") + "</p>";
 var versionNotAvailableTemplate = "<p>" + getLocaleString("versionInfoNotAvailable") + "</p>";
 
@@ -113,7 +113,7 @@ function handleVersionInfo(text, status)
 	var html = "";
 	if (status == 200)
 	{
-		var info = text.split("\r\n");
+		var info = text.split(/[\r\n]+/g);
 		var version = decodeURIComponent(getUrlParameter("v"));
 		html = formatString(versionAvailableTemplate, info[0], info[1]);
 		if (version && ((info[0] < version) - (version < info[0])) == -1)
@@ -188,8 +188,8 @@ function handleXmlData(projectXml, rssUrl)
 {
 	if (rssUrl != null)
 	{
-		var fd3Url = "http://www.flashdevelop.org/latest.txt";
-		loadTextDocument(fd3Url, handleVersionInfo);
+		var hdUrl = "http://www.haxedevelop.org/latest.txt";
+		loadTextDocument(hdUrl, handleVersionInfo);
 		loadTextDocument(rssUrl, handleRssFeedXml);
 	}
 	var xml = parseXmlDocument(projectXml);

Distros/HaxeDevelop/FlashDevelop/Bin/Debug/Tools/appman/Config.xml

@@ -3,7 +3,7 @@
 	<!-- Distro directory name -->
 	<Name>HaxeDevelop</Name>
 	<!-- Exposed app list groups -->
-	<Groups>FD5,HD5</Groups>
+	<Groups>FD5,HD5,Haxelib</Groups>
 	<!-- Directory where the archives should be stored -->
 	<Archive>$(BaseDir)\Apps</Archive>
 	<!-- Entry config file, can be an URL or a file path -->