FS-10980: [mod_lua] Update lua version to 5.3.4 and move it to pre-compiled binaries...

diff --git a/Freeswitch.2015.sln b/Freeswitch.2015.sln
index 6587c691a3ebc6bd4dba3b9c444a7583aec09ebd..0e3b1fb7fbafff19ac1a52de771cf1d84b687fd3 100644 (file)
--- a/Freeswitch.2015.sln
+++ b/Freeswitch.2015.sln
@@ -616,10 +616,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download tiff", "libs\win32
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_http_cache", "src\mod\applications\mod_http_cache\mod_http_cache.vcxproj", "{87933C2D-0159-46F7-B326-E1B6E982C21E}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua52", "libs\win32\lua\lua.2015.vcxproj", "{4F990563-6DFB-45C3-B083-1938C6D7FFA4}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download lua", "libs\win32\Download lua.2015.vcxproj", "{45CD36EE-0AF3-4387-8790-4F11E928299D}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download g722_1", "libs\win32\Download g722_1.2015.vcxproj", "{36603FE1-253F-4C2C-AAB6-12927A626135}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download iLBC", "libs\win32\Download iLBC.2015.vcxproj", "{53AADA60-DF12-46FF-BF94-566BBF849336}"\r
@@ -2818,30 +2814,6 @@ Global
                {87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|Win32.Build.0 = Release|Win32\r
                {87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|x64.ActiveCfg = Release|x64\r
                {87933C2D-0159-46F7-B326-E1B6E982C21E}.Release|x64.Build.0 = Release|x64\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|Win32.ActiveCfg = Release|Win32\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|Win32.Build.0 = Release|Win32\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|x64.ActiveCfg = Release|x64\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.All|x64.Build.0 = Release|x64\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|Win32.Build.0 = Debug|Win32\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|x64.ActiveCfg = Debug|x64\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Debug|x64.Build.0 = Debug|x64\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|Win32.ActiveCfg = Release|Win32\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|Win32.Build.0 = Release|Win32\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|x64.ActiveCfg = Release|x64\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4}.Release|x64.Build.0 = Release|x64\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.All|Win32.ActiveCfg = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.All|Win32.Build.0 = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.All|x64.ActiveCfg = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.All|x64.Build.0 = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|Win32.Build.0 = Debug|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|x64.ActiveCfg = Debug|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Debug|x64.Build.0 = Debug|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|Win32.ActiveCfg = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|Win32.Build.0 = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|x64.ActiveCfg = Release|Win32\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D}.Release|x64.Build.0 = Release|Win32\r
                {36603FE1-253F-4C2C-AAB6-12927A626135}.All|Win32.ActiveCfg = Release|Win32\r
                {36603FE1-253F-4C2C-AAB6-12927A626135}.All|Win32.Build.0 = Release|Win32\r
                {36603FE1-253F-4C2C-AAB6-12927A626135}.All|x64.ActiveCfg = Release|Win32\r
@@ -3267,8 +3239,6 @@ Global
                {6D1BC01C-3F97-4C08-8A45-69C9B94281AA} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {583D8CEA-4171-4493-9025-B63265F408D8} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {87933C2D-0159-46F7-B326-E1B6E982C21E} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}\r
-               {4F990563-6DFB-45C3-B083-1938C6D7FFA4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}\r
-               {45CD36EE-0AF3-4387-8790-4F11E928299D} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {36603FE1-253F-4C2C-AAB6-12927A626135} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {53AADA60-DF12-46FF-BF94-566BBF849336} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r
                {46502007-0D94-47AC-A640-C2B5EEA98333} = {C120A020-773F-4EA3-923F-B67AF28B750D}\r

diff --git a/libs/.gitignore b/libs/.gitignore
index 376e537633346e7f1c791cf7c25f4ac516b263de..79dbc2ca7a6b04da006023577e5fa03e67452e7b 100644 (file)
--- a/libs/.gitignore
+++ b/libs/.gitignore
@@ -846,3 +846,5 @@ zlib-*/
 zlib-*
 libpq-*/
 libpq-*
+lua-*/
+lua-*

diff --git a/libs/win32/Download lua.2015.vcxproj b/libs/win32/Download lua.2015.vcxproj
deleted file mode 100644 (file)
index ff8763b..0000000
--- a/libs/win32/Download lua.2015.vcxproj
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>Download lua</ProjectName>
-    <RootNamespace>Download lua</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{45CD36EE-0AF3-4387-8790-4F11E928299D}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(SolutionDir)\w32\extdll.props" />
-  <Import Project="..\..\w32\lua.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(PlatformName)\lua\$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(PlatformName)\lua\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <BuildLog>
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
-    </BuildLog>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <BuildLog>
-      <Path>$(IntDir)BuildLog $(ProjectName).htm</Path>
-    </BuildLog>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="cleancount">
-      <FileType>Document</FileType>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading lua.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(SolutionDir)libs\lua-$(LuaVersion)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lua-$(LuaVersion).tar.gz "$(SolutionDir)libs"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)libs\lua-$(LuaVersion);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading lua.</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(SolutionDir)libs\lua-$(LuaVersion)" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/lua-$(LuaVersion).tar.gz "$(SolutionDir)libs"
-</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)libs\lua-$(LuaVersion);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/libs/win32/lua/lua.2015.vcxproj b/libs/win32/lua/lua.2015.vcxproj
deleted file mode 100644 (file)
index ab57b9d..0000000
--- a/libs/win32/lua/lua.2015.vcxproj
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>lua52</ProjectName>
-    <RootNamespace>lua55</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{4F990563-6DFB-45C3-B083-1938C6D7FFA4}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(SolutionDir)w32\lua.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)w32\extdll.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)w32\extdll.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableSpecificWarnings>4127; 4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <DisableSpecificWarnings>4127; 4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>false</EnablePREfast>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableSpecificWarnings>4127; 4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_WIN32;LUA_BUILD_AS_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <DisableSpecificWarnings>4127; 4505;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(LuaDir)\lapi.c" />
-    <ClCompile Include="$(LuaDir)\lauxlib.c" />
-    <ClCompile Include="$(LuaDir)\lbaselib.c" />
-    <ClCompile Include="$(LuaDir)\lbitlib.c" />
-    <ClCompile Include="$(LuaDir)\lcode.c" />
-    <ClCompile Include="$(LuaDir)\lcorolib.c" />
-    <ClCompile Include="$(LuaDir)\lctype.c" />
-    <ClCompile Include="$(LuaDir)\ldblib.c" />
-    <ClCompile Include="$(LuaDir)\ldebug.c" />
-    <ClCompile Include="$(LuaDir)\ldo.c" />
-    <ClCompile Include="$(LuaDir)\ldump.c" />
-    <ClCompile Include="$(LuaDir)\lfunc.c" />
-    <ClCompile Include="$(LuaDir)\lgc.c" />
-    <ClCompile Include="$(LuaDir)\linit.c" />
-    <ClCompile Include="$(LuaDir)\liolib.c" />
-    <ClCompile Include="$(LuaDir)\llex.c" />
-    <ClCompile Include="$(LuaDir)\lmathlib.c" />
-    <ClCompile Include="$(LuaDir)\lmem.c" />
-    <ClCompile Include="$(LuaDir)\loadlib.c" />
-    <ClCompile Include="$(LuaDir)\lobject.c" />
-    <ClCompile Include="$(LuaDir)\lopcodes.c" />
-    <ClCompile Include="$(LuaDir)\loslib.c" />
-    <ClCompile Include="$(LuaDir)\lparser.c" />
-    <ClCompile Include="$(LuaDir)\lstate.c" />
-    <ClCompile Include="$(LuaDir)\lstring.c" />
-    <ClCompile Include="$(LuaDir)\lstrlib.c" />
-    <ClCompile Include="$(LuaDir)\ltable.c" />
-    <ClCompile Include="$(LuaDir)\ltablib.c" />
-    <ClCompile Include="$(LuaDir)\ltm.c" />
-    <ClCompile Include="$(LuaDir)\lundump.c" />
-    <ClCompile Include="$(LuaDir)\lvm.c" />
-    <ClCompile Include="$(LuaDir)\lzio.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(LuaDir)\lapi.h" />
-    <ClInclude Include="$(LuaDir)\lauxlib.h" />
-    <ClInclude Include="$(LuaDir)\lcode.h" />
-    <ClInclude Include="$(LuaDir)\lctype.h" />
-    <ClInclude Include="$(LuaDir)\ldebug.h" />
-    <ClInclude Include="$(LuaDir)\ldo.h" />
-    <ClInclude Include="$(LuaDir)\lfunc.h" />
-    <ClInclude Include="$(LuaDir)\lgc.h" />
-    <ClInclude Include="$(LuaDir)\llex.h" />
-    <ClInclude Include="$(LuaDir)\llimits.h" />
-    <ClInclude Include="$(LuaDir)\lmem.h" />
-    <ClInclude Include="$(LuaDir)\lobject.h" />
-    <ClInclude Include="$(LuaDir)\lopcodes.h" />
-    <ClInclude Include="$(LuaDir)\lparser.h" />
-    <ClInclude Include="$(LuaDir)\lstate.h" />
-    <ClInclude Include="$(LuaDir)\lstring.h" />
-    <ClInclude Include="$(LuaDir)\ltable.h" />
-    <ClInclude Include="$(LuaDir)\ltm.h" />
-    <ClInclude Include="$(LuaDir)\lua.h" />
-    <ClInclude Include="$(LuaDir)\lua.hpp" />
-    <ClInclude Include="$(LuaDir)\luaconf.h" />
-    <ClInclude Include="$(LuaDir)\lualib.h" />
-    <ClInclude Include="$(LuaDir)\lundump.h" />
-    <ClInclude Include="$(LuaDir)\lvm.h" />
-    <ClInclude Include="$(LuaDir)\lzio.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="$(LuaDir)\lua.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Download lua.2015.vcxproj">
-      <Project>{45cd36ee-0af3-4387-8790-4f11e928299d}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

diff --git a/src/mod/languages/mod_lua/mod_lua.2015.vcxproj b/src/mod/languages/mod_lua/mod_lua.2015.vcxproj
index 51f8b4d9218910f6fbc9d6a2b4417210712d9385..ba4e217fb609c794caf0838b782f5dddc7a46fe0 100644 (file)
--- a/src/mod/languages/mod_lua/mod_lua.2015.vcxproj
+++ b/src/mod/languages/mod_lua/mod_lua.2015.vcxproj
@@ -25,7 +25,7 @@
     <Keyword>Win32Proj</Keyword>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <Import Project="$(SolutionDir)w32\lua.props"/>\r
+  <Import Project="$(SolutionDir)w32\lua.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
     <ConfigurationType>DynamicLibrary</ConfigurationType>\r
     <CharacterSet>MultiByte</CharacterSet>\r
@@ -155,10 +155,6 @@
       <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r
-    <ProjectReference Include="$(SolutionDir)libs\win32\lua\lua.2015.vcxproj">\r
-      <Project>{4F990563-6DFB-45C3-B083-1938C6D7FFA4}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/w32/lua-version.props b/w32/lua-version.props
index cb39a1bfb7dae098f21c7f1e3039dd01c14d9846..c01dae59b03855791f09c718b6d41affd2b01230 100644 (file)
--- a/w32/lua-version.props
+++ b/w32/lua-version.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <LuaVersion>5.2.4</LuaVersion>
+    <LuaVersion>5.3.4</LuaVersion>
   </PropertyGroup>
   <PropertyGroup>
     <LuaVersionImported>true</LuaVersionImported>

diff --git a/w32/lua.props b/w32/lua.props
index 7589e5617479112eac3a76b46c5e02d4e2133fab..72dc22600078df0f85b064472e8d420436abe4f6 100644 (file)
--- a/w32/lua.props
+++ b/w32/lua.props
@@ -2,14 +2,70 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
     <Import Project="lua-version.props" Condition=" '$(LuaVersionImported)' == '' "/>
+    <Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <LuaLibDir>$(SolutionDir)libs\lua-$(LuaVersion)</LuaLibDir>
-    <LuaDir>$(LuaLibDir)\src</LuaDir>
   </PropertyGroup>
+
+  <!-- 
+       Download Target.
+       Name must be unique. 
+       By design, targets are executed only once per project.
+       
+       Usage:
+       
+       package: URI
+
+       expectfileordirectory: Skips the download and extraction if exists
+
+       outputfolder: Folder to store a downloaded file. 
+                     By default "$(BaseDir)libs", if empty
+
+       outputfilename: If not empty, overrides filename from URI.
+                       .exe files don't get extracted
+
+       extractto: Folder to extract an archive to
+   -->
+
+  <Target Name="luaBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
+      <DownloadPackageTask 
+           package="http://files.freeswitch.org/windows/packages/lua/$(luaVersion)/lua-$(luaVersion)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
+           expectfileordirectory="$(LuaLibDir)\binaries\$(Platform)\$(Configuration)\lua53.dll" 
+           outputfolder=""
+           outputfilename="" 
+           extractto="$(BaseDir)libs\"
+      />
+  </Target> 
+  <Target Name="luaHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">  
+      <DownloadPackageTask 
+           package="http://files.freeswitch.org/windows/packages/lua/$(luaVersion)/lua-$(luaVersion)-headers.zip"
+           expectfileordirectory="$(LuaLibDir)\include\lua.h" 
+           outputfolder=""
+           outputfilename="" 
+           extractto="$(BaseDir)libs\"
+      />
+  </Target> 
+
+  <Target Name="luacopyTarget" BeforeTargets="CustomBuild" DependsOnTargets="luaBinariesDownloadTarget">  
+        <Message Text="Copying lua libraries to the freeswitch output folder." Importance="High" />
+        <ItemGroup>  
+             <luaFiles Include="$(LuaLibDir)\binaries\$(Platform)\$(Configuration)\*.dll"/>  
+        </ItemGroup>  
+        <Copy Condition="!exists('$(BaseDir)\$(Platform)\$(Configuration)\lua53.dll')"
+            SourceFiles="@(luaFiles)"  
+            DestinationFiles="@(luaFiles->'$(BaseDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)')"  
+        />  
+  </Target>   
+
+
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(LuaLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(LuaLibDir)\binaries\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua53.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
 </Project>
\ No newline at end of file