Commit 4fa2ac00 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Bumped KeraLua (WP8 fixes) + build .bats.

parent b46fed03
Subproject commit d310fed28bda8c6c59a0d9fd5893e1a0d8dbde7f Subproject commit 473390653b2a1f222bff56c720cb08c8a536475a
...@@ -46,7 +46,7 @@ namespace NLua.Exceptions ...@@ -46,7 +46,7 @@ namespace NLua.Exceptions
/// <summary> /// <summary>
/// The position in the script where the exception was triggered. /// The position in the script where the exception was triggered.
/// </summary> /// </summary>
#if SILVERLIGHT #if SILVERLIGHT && !WINDOWS_PHONE
public string Source { get { return source; } } public string Source { get { return source; } }
#else #else
public override string Source { get { return source; } } public override string Source { get { return source; } }
......
...@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeraLua.WPSL8", "Core\KeraL ...@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeraLua.WPSL8", "Core\KeraL
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua52", "Core\KeraLua\external\lua\wpsl8_build\lua\lua52\lua52.vcxproj", "{ABD36435-56AD-4940-B51A-10AEECA46C01}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua52", "Core\KeraLua\external\lua\wpsl8_build\lua\lua52\lua52.vcxproj", "{ABD36435-56AD-4940-B51A-10AEECA46C01}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest.WPSL8", "NLuaTest.WPSL8\NLuaTest.WPSL8.csproj", "{0AF57940-43F8-492B-9684-0369259C990B}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -91,34 +89,6 @@ Global ...@@ -91,34 +89,6 @@ Global
{ABD36435-56AD-4940-B51A-10AEECA46C01}.Release|x64.ActiveCfg = Release|Win32 {ABD36435-56AD-4940-B51A-10AEECA46C01}.Release|x64.ActiveCfg = Release|Win32
{ABD36435-56AD-4940-B51A-10AEECA46C01}.Release|x86.ActiveCfg = Release|Win32 {ABD36435-56AD-4940-B51A-10AEECA46C01}.Release|x86.ActiveCfg = Release|Win32
{ABD36435-56AD-4940-B51A-10AEECA46C01}.Release|x86.Build.0 = Release|Win32 {ABD36435-56AD-4940-B51A-10AEECA46C01}.Release|x86.Build.0 = Release|Win32
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Any CPU.ActiveCfg = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|ARM.ActiveCfg = Debug|ARM
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|ARM.Build.0 = Debug|ARM
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|ARM.Deploy.0 = Debug|ARM
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Win32.ActiveCfg = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Win32.Build.0 = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|Win32.Deploy.0 = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|x64.ActiveCfg = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|x86.ActiveCfg = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|x86.Build.0 = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Debug|x86.Deploy.0 = Debug|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Any CPU.ActiveCfg = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|ARM.ActiveCfg = Release|ARM
{0AF57940-43F8-492B-9684-0369259C990B}.Release|ARM.Build.0 = Release|ARM
{0AF57940-43F8-492B-9684-0369259C990B}.Release|ARM.Deploy.0 = Release|ARM
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Mixed Platforms.Build.0 = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Mixed Platforms.Deploy.0 = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Win32.ActiveCfg = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Win32.Build.0 = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|Win32.Deploy.0 = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|x64.ActiveCfg = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|x86.ActiveCfg = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|x86.Build.0 = Release|x86
{0AF57940-43F8-492B-9684-0369259C990B}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
msbuild NLua.WP8.sln /p:Configuration=Release /p:Platform="ARM"
erase tests\*.dll
cd Core\KeraLua
call Makefile.Win64.bat
msbuild KeraLua.WP8.sln /p:Configuration=Release /p:DefineConstants=WSTRING /p:Platform="Any CPU"
cd ..\..
xcopy Core\KeraLua\external\lua\win64\bin64\*.dll tests\*.dll
msbuild NLua.Net45.sln /p:Configuration=Release /p:DefineConstants="WSTRING;LUA_CORE;CATCH_EXCEPTIONS" /p:Platform="Any CPU"
cd tests/
nunit-console NLuaTest.dll /xml=$1
cd ..
msbuild NLua.WP8.sln /p:Configuration=Release /p:Platform="Win32"
msbuild NLua.WPSL8.sln /p:Configuration=Release /p:DefineConstants="WSTRING;LUA_CORE;CATCH_EXCEPTIONS" /p:Platform="ARM"
msbuild NLua.WPSL8.sln /p:Configuration=Release /p:Platform="ARM"
msbuild NLua.WPSL8.sln /p:Configuration=Release /p:Platform="Win32"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment