Skip to content

Commit b7b1863

Browse files
wise0704wise0704
committed
Merge branch 'development' of https://github.com/fdorg/flashdevelop into ShortcutDialog
# Conflicts: # FlashDevelop/Dialogs/ShortcutDialog.cs
2 parents 8973a5d + 5aa9cd4 commit b7b1863

File tree

350 files changed

+15977
-841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+15977
-841
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ PluginCore/Bin
2424
/FlashDevelop/Bin/Debug/Exceptions.log
2525
/FlashDevelop/Bin/Debug/Tools/fdbuild/fdbuild.exe
2626
FlashDevelop/Bin/Debug/Settings/Themes/CURRENT
27+
packages/

‎CI/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Coming soon...

‎CI/build.cmd

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ set PATH=%PATH%;C:\Program Files (x86)\Git\bin\
66
set PATH=%PATH%;C:\Program Files (x86)\NSIS
77
set PATH=%PATH%;C:\Program Files\7-Zip\
88

9-
:: Reset bin files
10-
git clean -f -x -d FlashDevelop\Bin\Debug
9+
:flashdevelop
1110

1211
:: Check for build errors
1312
if %errorlevel% neq 0 goto :error
1413

1514
:: Build the PluginCore
16-
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86
15+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
1716

1817
:: Check for build errors
1918
if %errorlevel% neq 0 goto :error
@@ -22,7 +21,7 @@ if %errorlevel% neq 0 goto :error
2221
call SetVersion.bat
2322

2423
:: Build the solution
25-
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86
24+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
2625

2726
:: Check for build errors
2827
if %errorlevel% neq 0 goto :error
@@ -39,8 +38,46 @@ if %errorlevel% neq 0 goto :error
3938
:: Check for 7zip errors
4039
if %errorlevel% neq 0 goto :error
4140

41+
:haxedevelop
42+
43+
:: Reset bin files
44+
git clean -f -x -d FlashDevelop\Bin\Debug
45+
46+
:: Remove bad files
47+
del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
48+
del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
49+
for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
50+
51+
:: Copy distro files
52+
xcopy Distros\HaxeDevelop /s /e /y
53+
54+
:: Build the PluginCore
55+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
56+
57+
:: Check for build errors
58+
if %errorlevel% neq 0 goto :error
59+
60+
:: Extract version from HEAD
61+
call SetVersion.bat
62+
63+
:: Build the solution
64+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
65+
66+
:: Check for build errors
67+
if %errorlevel% neq 0 goto :error
68+
69+
:: Create the installer
70+
makensis FlashDevelop\Installer\Installer.nsi
71+
72+
:: Check for nsis errors
73+
if %errorlevel% neq 0 goto :error
74+
75+
:: Create the archive
76+
7z a -tzip FlashDevelop\Installer\Binary\HaxeDevelop.zip .\FlashDevelop\Bin\Debug\* -xr!.empty
77+
4278
:: Done
4379
exit
4480

4581
:error
82+
4683
exit -1

‎CI/buildl.cmd

Lines changed: 46 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ set PATH=%PATH%;C:\Program Files (x86)\NSIS
1111
:: Need path up
1212
cd ..
1313

14+
:flashdevelop
15+
1416
:: Reset bin files
1517
git clean -f -x -d FlashDevelop\Bin\Debug
18+
del FlashDevelop\Installer\Binary\*.exe /Q
19+
del FlashDevelop\Installer\Binary\*.zip /Q
1620

1721
:: Check for build errors
1822
if %errorlevel% neq 0 goto :error
@@ -38,16 +42,55 @@ makensis FlashDevelop\Installer\Installer.nsi
3842
:: Check for nsis errors
3943
if %errorlevel% neq 0 goto :error
4044

41-
:: Delete old and create an new archive
42-
del FlashDevelop\Installer\Binary\FlashDevelop.zip
45+
:: Create the archive
4346
7z a -tzip FlashDevelop\Installer\Binary\FlashDevelop.zip .\FlashDevelop\Bin\Debug\* -xr!.empty
4447

4548
:: Check for 7zip errors
4649
if %errorlevel% neq 0 goto :error
4750

48-
:: Done
51+
:haxedevelop
52+
53+
:: Reset bin files
54+
git clean -f -x -d FlashDevelop\Bin\Debug
55+
56+
:: Remove bad files
57+
del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
58+
del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
59+
for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
60+
61+
:: Copy distro files
62+
xcopy Distros\HaxeDevelop /s /e /y
63+
64+
:: Build the PluginCore
65+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
66+
67+
:: Check for build errors
68+
if %errorlevel% neq 0 goto :error
69+
70+
:: Extract version from HEAD
71+
call SetVersion.bat
72+
73+
:: Build the solution
74+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
75+
76+
:: Check for build errors
77+
if %errorlevel% neq 0 goto :error
78+
79+
:: Create the installer
80+
makensis FlashDevelop\Installer\Installer.nsi
81+
82+
:: Check for nsis errors
83+
if %errorlevel% neq 0 goto :error
84+
85+
:: Create the archive
86+
7z a -tzip FlashDevelop\Installer\Binary\HaxeDevelop.zip .\FlashDevelop\Bin\Debug\* -xr!.empty
87+
88+
: finish
89+
90+
:: Done, Run FD
4991
start FlashDevelop\Installer\Binary\FlashDevelop.exe
5092
exit
5193

5294
:error
95+
5396
exit -1

‎CI/deploy.ps1

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Param (
1313
$projectBuildNumber
1414
)
1515

16+
$fd = $false;
17+
$hd = $false;
1618
$login = $variables["SecureLogin"]
1719
$pass = $variables["SecurePass"]
1820

@@ -21,6 +23,8 @@ foreach($artifact in $artifacts.values)
2123
Write-Output "Upload artifact: $($artifact.name)"
2224
$ext = [System.IO.Path]::GetExtension($artifact.name)
2325
$name = [System.IO.Path]::GetFileNameWithoutExtension($artifact.name)
26+
IF ($name -match "FlashDevelop") { $fd = $true; }
27+
IF ($name -match "HaxeDevelop") { $hd = $true; }
2428
IF ($ext -eq ".xml")
2529
{
2630
# Upload appman.xml file
@@ -38,4 +42,11 @@ $date = Get-Date
3842
$file = [System.IO.Path]::GetTempFileName()
3943
$data = "Build: $projectVersion`r`nTime: " + $date.ToUniversalTime() + " GMT"
4044
$data | Set-Content $file
41-
ncftpput.exe -u "$login" -p "$pass" -C ftp.flashdevelop.org "$file" "downloads/builds/FlashDevelop-$env:APPVEYOR_REPO_BRANCH.txt";
45+
IF ($fd)
46+
{
47+
ncftpput.exe -u "$login" -p "$pass" -C ftp.flashdevelop.org "$file" "downloads/builds/FlashDevelop-$env:APPVEYOR_REPO_BRANCH.txt";
48+
}
49+
IF ($hd)
50+
{
51+
ncftpput.exe -u "$login" -p "$pass" -C ftp.flashdevelop.org "$file" "downloads/builds/HaxeDevelop-$env:APPVEYOR_REPO_BRANCH.txt";
52+
}

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

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
3+
<head>
4+
<title>HaxeDevelop</title>
5+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6+
<link href="styles.css" rel="stylesheet" type="text/css" title="styles" media="all" />
7+
</head>
8+
<body>
9+
<div id="header">
10+
<div class="innerContent">
11+
<img src="../StartPage/images/haxedevelop.gif" alt="HaxeDevelop" height=120 />
12+
</div>
13+
</div>
14+
15+
<div id="content">
16+
<div class="innerContent">
17+
18+
<h4>Description</h4>
19+
<p>HaxeDevelop is a highly customizable lightweight script editor with extended support for class
20+
based languages. Altought the program is designed mostly for Haxe, other languages can
21+
be implemented quite easily too. HaxeDevelop requires the Microsoft.NET 3.5 Framework. You can support us by
22+
<a href="http://www.flashdevelop.org/wikidocs/index.php?title=FlashDevelop:Site_support">donating for the project via PayPal</a>. Any donation, even 1$, is good for the project. Code contributions are also welcome.</p>
23+
<p>You can find more info about HaxeDevelop from the project website <a href="http://www.haxedevelop.org/">www.haxedevelop.org</a>.
24+
25+
<p><em>HaxeDevelop is a custom distribution of <a href="http://www.flashdevelop.org/">FlashDevelop</a>.</em></p>
26+
27+
<h4>Used Icons</h4>
28+
<p>Current smooth HaxeDevelop icons are free icons downloaded from <a href="http://www.famfamfam.com/lab/icons/silk/">
29+
famfamfam.com</a>, <a href="http://www.visualpharm.com/free_icons.html">visualfarm.com</a> and <a href="http://www.fatcow.com/free-icons">fatcow.com</a>.
30+
The icons are released under Creative Commons Attribution 2.5 and 3 Licenses. Some of the used icons are modified from the original ones.</p>
31+
32+
<h4>Used Tools</h4>
33+
<p>HaxeDevelop includes few third party tools by default. The listed tools are copyright of their respective owners.</p>
34+
<ul>
35+
<li>SwfOp library by <a href="http://www.kruesch.de/">Florian Kruesch</a> (code library)</li>
36+
<li>AS2API documentation tool by <a href="http://www.badgers-in-foil.co.uk/projects/as2api/">David Holroyd</a> (console application)</li>
37+
<li>Motion-Twin ActionScript Compiler by <a href="http://www.mtasc.org/">Motion-Twin</a> (console application)</li>
38+
<li>Swfmill XML/SWF processor by <a href="http://swfmill.org/">Daniel Fischer</a> (console application)</li>
39+
<li>Flex PMD tool by <a href="http://opensource.adobe.com/wiki/display/flexpmd/FlexPMD">Adobe Systems Inc.</a> (console application)</li>
40+
</ul>
41+
42+
<h4>Components</h4>
43+
<p>HaxeDevelop is programmed with C# and it includes misc. modified and unmodified components. DockPanel
44+
Suite is used for docking windows and ScintillaNET wrapper is used for providing the Scintilla editor control for C#.
45+
The listed components are copyright of their respective owners.</p>
46+
<ul>
47+
<li><a href="#">Flex SDK port by Robert Nelson</a></li>
48+
<li><a href="http://sourceforge.net/projects/dockpanelsuite/">DockPanel Suite by Weifen Luo</a></li>
49+
<li><a href="http://www.scintilla.org/">Scintilla component by Neil Hodgson</a></li>
50+
<li><a href="http://scintillanet.codeplex.com/">Scintilla.NET wrapper by Garrett Serack</a></li>
51+
<li><a href="http://sourceforge.net/projects/treeviewadv/">Aga controls by Andrey Gliznetsov</a></li>
52+
<li><a href="http://www.csscript.net/">CSScriptLibrary by Oleg Shilo</a></li>
53+
<li><a href="http://www.icsharpcode.net/">SharpZipLib by ISharpCode</a></li>
54+
</ul>
55+
56+
<h4>Licence</h4>
57+
<p>Copyright (c) 2015 Haxe Foundation - HaxeDevelop.org</p>
58+
<p>Portions copyright Philippe Elsass and all helpful contributors.</p>
59+
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
60+
documentation files (the "Software"), to deal in the Software without restriction, including without limitation
61+
the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
62+
to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
63+
<p>The above copyright notice and this permission notice shall be included in all copies or portions of the Software.</p>
64+
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
65+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
66+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
67+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
68+
</div>
69+
</div>
70+
71+
72+
</body>
73+
</html>

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/Docs/styles.css

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
body, html
2+
{
3+
font-size:14px;
4+
font-family:"Segoe UI", "Trebuchet MS", Georgia, Arial, sans-serif;
5+
padding:0;
6+
margin:0;
7+
}
8+
h4
9+
{
10+
font-size: 24px;
11+
}
12+
ul
13+
{
14+
margin: 0px;
15+
padding: 0px;
16+
margin-left: 3px;
17+
}
18+
a
19+
{
20+
color:#257fc2;
21+
text-decoration:none;
22+
}
23+
24+
a:hover
25+
{
26+
color:#257fc2;
27+
text-decoration:underline;
28+
}
29+
#header
30+
{
31+
width: 100%;
32+
text-align:center;
33+
background:#257fc2 url('../StartPage/images/pattern.png') center top;
34+
margin:0;
35+
}
36+
#header h3
37+
{
38+
color: #eea21a;
39+
}
40+
#header h3 img
41+
{
42+
margin-right: 5px;
43+
margin-bottom: -3px;
44+
}
45+
.innerContent
46+
{
47+
padding: 20px;
48+
}
49+
#content
50+
{
51+
width: 100%;
52+
}
53+
#content ul
54+
{
55+
padding: 5px;
56+
padding-bottom: 0px;
57+
padding-left: 15px;
58+
}
59+
#footer
60+
{
61+
width: 100%;
62+
border-top: 1px dotted grey;
63+
padding-top: 11px;
64+
margin-top: 11px;
65+
}

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/FirstRun.fdb

4.97 KB
Binary file not shown.

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/StartPage/images/haxedevelop.gif

2.8 KB
Loading

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/StartPage/images/pattern.png

1.01 KB
Loading

0 commit comments

Comments
 (0)