Skip to content

Commit bd1f6e0

Browse files
NeverbirthNeverbirth
committed
Merge branch 'development' into new_controls
2 parents 8002a7b + a7fa7dd commit bd1f6e0

File tree

41 files changed

+221
-344
lines changed

Some content is hidden

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

41 files changed

+221
-344
lines changed

‎CI/build.cmd

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ set PATH=%PATH%;C:\Program Files\7-Zip\
1212
if %errorlevel% neq 0 goto :error
1313

1414
:: Build the PluginCore
15-
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
15+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="AnyCPU" /t:Rebuild
1616

1717
:: Check for build errors
1818
if %errorlevel% neq 0 goto :error
1919

2020
:: Extract version from HEAD
2121
call SetVersion.bat
2222

23-
:: Build the solution
23+
:: Build the solutions
24+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
25+
ping -n 5 127.0.0.1 > nul
2426
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
2527

2628
:: Check for build errors
@@ -45,22 +47,25 @@ git clean -f -x -d FlashDevelop\Bin\Debug
4547

4648
:: Remove bad files
4749
del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
50+
del FlashDevelop\Bin\Debug\FlashDevelopx64.exe.config
4851
del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
4952
for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
5053

5154
:: Copy distro files
5255
xcopy Distros\HaxeDevelop /s /e /y
5356

5457
:: Build the PluginCore
55-
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
58+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="AnyCPU" /t:Rebuild
5659

5760
:: Check for build errors
5861
if %errorlevel% neq 0 goto :error
5962

6063
:: Extract version from HEAD
6164
call SetVersion.bat
6265

63-
:: Build the solution
66+
:: Build the solutions
67+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
68+
ping -n 5 127.0.0.1 > nul
6469
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
6570

6671
:: Check for build errors

‎CI/buildl.cmd

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,17 @@ del FlashDevelop\Installer\Binary\*.zip /Q
2222
if %errorlevel% neq 0 goto :error
2323

2424
:: Build the PluginCore
25-
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
25+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="AnyCPU" /t:Rebuild
2626

2727
:: Check for build errors
2828
if %errorlevel% neq 0 goto :error
2929

3030
:: Extract version from HEAD
3131
call SetVersion.bat
3232

33-
:: Build the solution
33+
:: Build the solutions
34+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
35+
ping -n 5 127.0.0.1 > nul
3436
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
3537

3638
:: Check for build errors
@@ -55,22 +57,25 @@ git clean -f -x -d FlashDevelop\Bin\Debug
5557

5658
:: Remove bad files
5759
del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
60+
del FlashDevelop\Bin\Debug\FlashDevelopx64.exe.config
5861
del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
5962
for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
6063

6164
:: Copy distro files
6265
xcopy Distros\HaxeDevelop /s /e /y
6366

6467
:: Build the PluginCore
65-
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform=x86 /t:Rebuild
68+
msbuild PluginCore\PluginCore.csproj /p:Configuration=Release /p:Platform="AnyCPU" /t:Rebuild
6669

6770
:: Check for build errors
6871
if %errorlevel% neq 0 goto :error
6972

7073
:: Extract version from HEAD
7174
call SetVersion.bat
7275

73-
:: Build the solution
76+
:: Build the solutions
77+
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform="Any CPU" /t:Rebuild
78+
ping -n 5 127.0.0.1 > nul
7479
msbuild FlashDevelop.sln /p:Configuration=Release /p:Platform=x86 /t:Rebuild
7580

7681
:: Check for build errors

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/HaxeDevelop.exe.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<runtime>
4+
<disableCachingBindingFailures enabled="1" />
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<probing privatePath="Plugins" />
7+
</assemblyBinding>
8+
</runtime>
9+
<startup>
10+
<supportedRuntime version="v2.0.50727 "/>
11+
</startup>
12+
<appSettings>
13+
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
14+
</appSettings>
15+
</configuration>

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/HaxeDevelopx64.exe.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<runtime>
4+
<disableCachingBindingFailures enabled="1" />
5+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
6+
<probing privatePath="Plugins" />
7+
</assemblyBinding>
8+
</runtime>
9+
<startup>
10+
<supportedRuntime version="v2.0.50727 "/>
11+
</startup>
12+
<appSettings>
13+
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
14+
</appSettings>
15+
</configuration>

‎Distros/HaxeDevelop/FlashDevelop/FlashDevelop.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
<Optimize>true</Optimize>
7070
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7171
</PropertyGroup>
72+
<PropertyGroup>
73+
<RunPostBuildEvent>Always</RunPostBuildEvent>
74+
</PropertyGroup>
7275
<ItemGroup>
7376
<Reference Include="Scripting, Version=2.7.0.0, Culture=neutral, PublicKeyToken=70fcc3d18c749033, processorArchitecture=x86">
7477
<SpecificVersion>False</SpecificVersion>
@@ -220,7 +223,7 @@
220223
<ItemGroup>
221224
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
222225
<Visible>False</Visible>
223-
<ProductName>Microsoft .NET Framework 4 %28x86 und x64%29</ProductName>
226+
<ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
224227
<Install>true</Install>
225228
</BootstrapperPackage>
226229
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -242,6 +245,9 @@
242245
<ItemGroup>
243246
<EmbeddedResource Include="Resources\BookmarkIcon.png" />
244247
</ItemGroup>
248+
<ItemGroup>
249+
<EmbeddedResource Include="Resources\SnippetVars.ko_KR.txt" />
250+
</ItemGroup>
245251
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
246252
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
247253
Other similar extension points exist, see Microsoft.Common.targets.
@@ -253,8 +259,12 @@
253259
<PropertyGroup>
254260
<PreBuildEvent>"$(SolutionDir)\SetVersion.bat" "$(SolutionDir)"</PreBuildEvent>
255261
</PropertyGroup>
256-
<PropertyGroup>
257-
<PostBuildEvent>
258-
</PostBuildEvent>
262+
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
263+
<PreBuildEvent>"$(SolutionDir)\SetVersion.bat" "$(SolutionDir)" &amp;&amp; ^
264+
IF EXIST "$(TargetPath)" move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)x86$(TargetExt)"</PreBuildEvent>
265+
</PropertyGroup>
266+
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
267+
<PostBuildEvent>IF EXIST "$(TargetPath)" move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)x64$(TargetExt)"&amp;&amp; ^
268+
IF EXIST "$(TargetDir)$(TargetName)x86$(TargetExt)" move /Y "$(TargetDir)$(TargetName)x86$(TargetExt)" "$(TargetPath)"</PostBuildEvent>
259269
</PropertyGroup>
260270
</Project>

‎Distros/HaxeDevelop/FlashDevelop/Installer/Config.nsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Define distro config
22
!define DIST_NAME "HaxeDevelop"
33
!define DIST_COMP "HaxeDevelop.org"
4-
!define DIST_COPY "HaxeDevelop.org 2005-2015"
4+
!define DIST_COPY "HaxeDevelop.org 2005-2016"
55
!define DIST_README "http://www.haxedevelop.org"
66
!define DIST_COMMUNITY "http://www.haxedevelop.org/community/"
77
!define DIST_DOCS "http://www.haxedevelop.org";

‎External/Plugins/AS2Context/AS2Context.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48-
<DebugType>pdbonly</DebugType>
48+
<DebugType>none</DebugType>
4949
<Optimize>true</Optimize>
5050
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
5151
<DefineConstants>TRACE</DefineConstants>

‎External/Plugins/AS3Context/AS3Context.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48-
<DebugType>pdbonly</DebugType>
48+
<DebugType>none</DebugType>
4949
<Optimize>true</Optimize>
5050
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
5151
<DefineConstants>TRACE</DefineConstants>

‎External/Plugins/ASClassWizard/ASClassWizard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48-
<DebugType>pdbonly</DebugType>
48+
<DebugType>none</DebugType>
4949
<Optimize>true</Optimize>
5050
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
5151
<DefineConstants>TRACE</DefineConstants>

‎External/Plugins/ASCompletion/ASCompletion.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48-
<DebugType>pdbonly</DebugType>
48+
<DebugType>none</DebugType>
4949
<Optimize>true</Optimize>
5050
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
5151
<DefineConstants>DEBUG;TRACE</DefineConstants>
5252
<ErrorReport>prompt</ErrorReport>
5353
<WarningLevel>4</WarningLevel>
54-
<DebugSymbols>true</DebugSymbols>
54+
<DebugSymbols>false</DebugSymbols>
5555
</PropertyGroup>
5656
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
5757
<PlatformTarget>x86</PlatformTarget>

0 commit comments

Comments
 (0)