Skip to content

Commit ecf24f3

Browse files
dail8859dail8859
committed
Appveyor updates
*crosses fingers*
1 parent f59b04f commit ecf24f3

File tree

4 files changed

+51
-44
lines changed

4 files changed

+51
-44
lines changed

‎appveyor.yml‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,62 @@ version: 0.9.0.{build}
22
image: Visual Studio 2017
33

44
platform:
5-
- x64
6-
- Win32
5+
- x64
6+
- Win32
77

88
configuration:
9-
- Release
10-
- Debug
9+
- Release
10+
- Debug
1111

1212
install:
13-
- if "%platform%"=="x64" set archi=amd64
14-
- if "%platform%"=="Win32" set archi=x86
15-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
13+
- if "%platform%"=="x64" set archi=amd64
14+
- if "%platform%"=="x64" set build_platform=x64
15+
16+
- if "%platform%"=="Win32" set archi=x86
17+
- if "%platform%"=="Win32" set build_platform=Win32
18+
19+
- call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
1620

1721
build:
18-
parallel: true
19-
verbosity: minimal
22+
parallel: true
23+
verbosity: minimal
2024

2125
build_script:
22-
- cd "%APPVEYOR_BUILD_FOLDER%"
23-
- msbuild LuaScript.sln /p:configuration="%configuration%" /p:platform="%platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
26+
- cd "%APPVEYOR_BUILD_FOLDER%"
27+
- msbuild LuaScript.sln /p:Configuration="%configuration%" /p:Platform="%build_platform%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
2428

2529
after_build:
26-
- cd "%APPVEYOR_BUILD_FOLDER%"
27-
- ps: >-
28-
29-
Push-AppveyorArtifact "bin\$($env:CONFIGURATION)_$($env:PLATFORM)\LuaScript.dll" -FileName LuaScript.dll
30-
31-
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") {
32-
if ($env:PLATFORM -eq "x64"){
33-
$ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
34-
7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\bin\$($env:CONFIGURATION)_$($env:PLATFORM)\*.dll"
35-
}
36-
if ($env:PLATFORM -eq "Win32"){
37-
$ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME).zip"
38-
7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\bin\$($env:CONFIGURATION)_$($env:PLATFORM)\*.dll"
39-
}
30+
- cd "%APPVEYOR_BUILD_FOLDER%"
31+
- ps: >-
32+
33+
$BuildPath = "$($env:APPVEYOR_BUILD_FOLDER)\bin\$($env:CONFIGURATION)_$($env:BUILD_PLATFORM)"
34+
35+
Push-AppveyorArtifact "$($BuildPath)\LuaScript.dll" -FileName LuaScript.dll
36+
37+
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") {
38+
mkdir LuaScript
39+
Move-Item -Path "$($BuildPath)\LuaScript.dll" -Destination .\LuaScript
40+
if ($env:BUILD_PLATFORM -eq "x64"){
41+
$ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
42+
}
43+
if ($env:BUILD_PLATFORM -eq "Win32"){
44+
$ZipFileName = "LuaScript_$($env:APPVEYOR_REPO_TAG_NAME).zip"
4045
}
46+
7z a $ZipFileName .\LuaScript
47+
}
4148
4249
artifacts:
4350
- path: LuaScript*.zip
4451
name: releases
4552

4653
deploy:
47-
provider: GitHub
48-
auth_token:
49-
secure: qrw+nu8dQKFLG+lNmky6buHsvHFwlibAai0r0aJ3MYbyBniONVxvgnmyx37bPh44
50-
artifact: releases
51-
draft: true
52-
prerelease: false
53-
force_update: true
54-
on:
55-
appveyor_repo_tag: true
56-
configuration: Release
54+
provider: GitHub
55+
auth_token:
56+
secure: qrw+nu8dQKFLG+lNmky6buHsvHFwlibAai0r0aJ3MYbyBniONVxvgnmyx37bPh44
57+
artifact: releases
58+
draft: true
59+
prerelease: false
60+
force_update: true
61+
on:
62+
appveyor_repo_tag: true
63+
configuration: Release

‎src/Lua.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>StaticLibrary</ConfigurationType>
3030
<CharacterSet>Unicode</CharacterSet>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v140_xp</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<CharacterSet>Unicode</CharacterSet>
36-
<PlatformToolset>v141</PlatformToolset>
36+
<PlatformToolset>v140_xp</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3939
<ConfigurationType>StaticLibrary</ConfigurationType>
4040
<CharacterSet>Unicode</CharacterSet>
41-
<PlatformToolset>v141</PlatformToolset>
41+
<PlatformToolset>v140_xp</PlatformToolset>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>
4646
<CharacterSet>Unicode</CharacterSet>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v140_xp</PlatformToolset>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎src/LuaScript.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ extern "C" __declspec(dllexport) void beNotified(SCNotification *notifyCode) {
305305
int styleStart = 0;
306306
if (endStyled > 0) styleStart = styler.StyleAt(endStyled - 1);
307307
styler.SetCodePage(wEditor.Call(SCI_GETCODEPAGE));
308-
LuaExtension::Instance().OnStyle(endStyled, notifyCode->position - endStyled, styleStart, &styler);
308+
LuaExtension::Instance().OnStyle(endStyled, static_cast<int>(notifyCode->position) - endStyled, styleStart, &styler);
309309
styler.Flush();
310310
break;
311311
}

‎src/LuaScript.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,23 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<CharacterSet>Unicode</CharacterSet>
31-
<PlatformToolset>v141</PlatformToolset>
31+
<PlatformToolset>v140_xp</PlatformToolset>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>DynamicLibrary</ConfigurationType>
3535
<CharacterSet>Unicode</CharacterSet>
36-
<PlatformToolset>v141</PlatformToolset>
36+
<PlatformToolset>v140_xp</PlatformToolset>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3939
<ConfigurationType>DynamicLibrary</ConfigurationType>
4040
<CharacterSet>Unicode</CharacterSet>
41-
<PlatformToolset>v141</PlatformToolset>
41+
<PlatformToolset>v140_xp</PlatformToolset>
4242
<WholeProgramOptimization>true</WholeProgramOptimization>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4545
<ConfigurationType>DynamicLibrary</ConfigurationType>
4646
<CharacterSet>Unicode</CharacterSet>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v140_xp</PlatformToolset>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)