Build lua library directly from the lua submodule instead of obtainin…

…g it from aerospike-client-c-dependencies in Visual Studio.
aerospike · Oct 11, 2023 · cd6e55f · cd6e55f
1 parent 87c0726
commit cd6e55f
Show file tree

Hide file tree

Showing 50 changed files with 329 additions and 75 deletions.
diff --git a/vs/aerospike-test/aerospike-test.vcxproj b/vs/aerospike-test/aerospike-test.vcxproj
@@ -291,12 +291,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets" Condition="Exists('..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets')" />
+    <Import Project="..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets" Condition="Exists('..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets'))" />
+    <Error Condition="!Exists('..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets'))" />
   </Target>
 </Project>
diff --git a/vs/aerospike-test/packages.config b/vs/aerospike-test/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="aerospike-client-c-dependencies" version="1.0.1" targetFramework="native" />
+  <package id="aerospike-client-c-dependencies" version="1.0.2" targetFramework="native" />
 </packages>
diff --git a/vs/aerospike/aerospike.vcxproj b/vs/aerospike/aerospike.vcxproj
@@ -152,7 +152,7 @@
     <IncludePath>..\..\src\include;..\..\modules\common\src\include;..\..\modules\mod-lua\src\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug libuv|x64'">
-    <IncludePath>..\..\src\include;..\..\modules\common\src\include;..\..\modules\mod-lua\src\include;$(IncludePath)</IncludePath>
+    <IncludePath>..\..\src\include;..\..\modules\common\src\include;..\..\modules\mod-lua\src\include;..\..\modules\lua;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug nodejs|x64'">
     <IncludePath>..\..\src\include;..\..\modules\common\src\include;..\..\modules\mod-lua\src\include;$(IncludePath)</IncludePath>
@@ -332,6 +332,34 @@
     <ClInclude Include="..\..\modules\common\src\include\citrusleaf\cf_queue.h" />
     <ClInclude Include="..\..\modules\common\src\include\citrusleaf\cf_random.h" />
     <ClInclude Include="..\..\modules\common\src\include\citrusleaf\cf_rchash.h" />
+    <ClInclude Include="..\..\modules\lua\lapi.h" />
+    <ClInclude Include="..\..\modules\lua\lauxlib.h" />
+    <ClInclude Include="..\..\modules\lua\lcode.h" />
+    <ClInclude Include="..\..\modules\lua\lctype.h" />
+    <ClInclude Include="..\..\modules\lua\ldebug.h" />
+    <ClInclude Include="..\..\modules\lua\ldo.h" />
+    <ClInclude Include="..\..\modules\lua\lfunc.h" />
+    <ClInclude Include="..\..\modules\lua\lgc.h" />
+    <ClInclude Include="..\..\modules\lua\ljumptab.h" />
+    <ClInclude Include="..\..\modules\lua\llex.h" />
+    <ClInclude Include="..\..\modules\lua\llimits.h" />
+    <ClInclude Include="..\..\modules\lua\lmem.h" />
+    <ClInclude Include="..\..\modules\lua\lobject.h" />
+    <ClInclude Include="..\..\modules\lua\lopcodes.h" />
+    <ClInclude Include="..\..\modules\lua\lopnames.h" />
+    <ClInclude Include="..\..\modules\lua\lparser.h" />
+    <ClInclude Include="..\..\modules\lua\lprefix.h" />
+    <ClInclude Include="..\..\modules\lua\lstate.h" />
+    <ClInclude Include="..\..\modules\lua\lstring.h" />
+    <ClInclude Include="..\..\modules\lua\ltable.h" />
+    <ClInclude Include="..\..\modules\lua\ltests.h" />
+    <ClInclude Include="..\..\modules\lua\ltm.h" />
+    <ClInclude Include="..\..\modules\lua\lua.h" />
+    <ClInclude Include="..\..\modules\lua\luaconf.h" />
+    <ClInclude Include="..\..\modules\lua\lualib.h" />
+    <ClInclude Include="..\..\modules\lua\lundump.h" />
+    <ClInclude Include="..\..\modules\lua\lvm.h" />
+    <ClInclude Include="..\..\modules\lua\lzio.h" />
     <ClInclude Include="..\..\src\include\aerospike\aerospike.h" />
     <ClInclude Include="..\..\src\include\aerospike\aerospike_batch.h" />
     <ClInclude Include="..\..\src\include\aerospike\aerospike_index.h" />
@@ -440,6 +468,40 @@
     <ClCompile Include="..\..\modules\common\src\main\citrusleaf\cf_ll.c" />
     <ClCompile Include="..\..\modules\common\src\main\citrusleaf\cf_queue.c" />
     <ClCompile Include="..\..\modules\common\src\main\citrusleaf\cf_random.c" />
+    <ClCompile Include="..\..\modules\lua\lapi.c" />
+    <ClCompile Include="..\..\modules\lua\lauxlib.c" />
+    <ClCompile Include="..\..\modules\lua\lbaselib.c" />
+    <ClCompile Include="..\..\modules\lua\lcode.c" />
+    <ClCompile Include="..\..\modules\lua\lcorolib.c" />
+    <ClCompile Include="..\..\modules\lua\lctype.c" />
+    <ClCompile Include="..\..\modules\lua\ldblib.c" />
+    <ClCompile Include="..\..\modules\lua\ldebug.c" />
+    <ClCompile Include="..\..\modules\lua\ldo.c" />
+    <ClCompile Include="..\..\modules\lua\ldump.c" />
+    <ClCompile Include="..\..\modules\lua\lfunc.c" />
+    <ClCompile Include="..\..\modules\lua\lgc.c" />
+    <ClCompile Include="..\..\modules\lua\linit.c" />
+    <ClCompile Include="..\..\modules\lua\liolib.c" />
+    <ClCompile Include="..\..\modules\lua\llex.c" />
+    <ClCompile Include="..\..\modules\lua\lmathlib.c" />
+    <ClCompile Include="..\..\modules\lua\lmem.c" />
+    <ClCompile Include="..\..\modules\lua\loadlib.c" />
+    <ClCompile Include="..\..\modules\lua\lobject.c" />
+    <ClCompile Include="..\..\modules\lua\lopcodes.c" />
+    <ClCompile Include="..\..\modules\lua\loslib.c" />
+    <ClCompile Include="..\..\modules\lua\lparser.c" />
+    <ClCompile Include="..\..\modules\lua\lstate.c" />
+    <ClCompile Include="..\..\modules\lua\lstring.c" />
+    <ClCompile Include="..\..\modules\lua\lstrlib.c" />
+    <ClCompile Include="..\..\modules\lua\ltable.c" />
+    <ClCompile Include="..\..\modules\lua\ltablib.c" />
+    <ClCompile Include="..\..\modules\lua\ltests.c" />
+    <ClCompile Include="..\..\modules\lua\ltm.c" />
+    <ClCompile Include="..\..\modules\lua\lua.c" />
+    <ClCompile Include="..\..\modules\lua\lundump.c" />
+    <ClCompile Include="..\..\modules\lua\lutf8lib.c" />
+    <ClCompile Include="..\..\modules\lua\lvm.c" />
+    <ClCompile Include="..\..\modules\lua\lzio.c" />
     <ClCompile Include="..\..\modules\mod-lua\src\main\internal.c" />
     <ClCompile Include="..\..\modules\mod-lua\src\main\mod_lua.c" />
     <ClCompile Include="..\..\modules\mod-lua\src\main\mod_lua_aerospike.c" />
@@ -513,12 +575,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(PackagesPath)\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets" Condition="Exists('$(PackagesPath)\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets')" />
+    <Import Project="..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets" Condition="Exists('..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('$(PackagesPath)\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(PackagesPath)\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets'))" />
+    <Error Condition="!Exists('..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets'))" />
   </Target>
 </Project>
diff --git a/vs/aerospike/aerospike.vcxproj.filters b/vs/aerospike/aerospike.vcxproj.filters
@@ -34,6 +34,12 @@
     <Filter Include="Source Files\mod-lua">
       <UniqueIdentifier>{a5ec2876-755e-4e48-a853-7a10c271fcbc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\lua">
+      <UniqueIdentifier>{ebc519ab-6c78-43e7-bf69-d67a07529449}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\lua">
+      <UniqueIdentifier>{60b7698e-9072-4cb2-bf4c-b4490f325143}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\include\aerospike\aerospike.h">
@@ -405,6 +411,90 @@
     <ClInclude Include="..\..\modules\common\src\include\aerospike\as_arch.h">
       <Filter>Header Files\common\aerospike</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lapi.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lauxlib.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lcode.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lctype.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\ldebug.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\ldo.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lfunc.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lgc.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\ljumptab.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\llex.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\llimits.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lmem.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lobject.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lopcodes.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lopnames.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lparser.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lprefix.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lstate.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lstring.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\ltable.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\ltests.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\ltm.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lua.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\luaconf.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lualib.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lundump.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lvm.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\lua\lzio.h">
+      <Filter>Header Files\lua</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\main\aerospike\_bin.c">
@@ -749,6 +839,108 @@
     <ClCompile Include="..\..\modules\common\src\main\aerospike\as_orderedmap.c">
       <Filter>Source Files\common\aerospike</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lapi.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lauxlib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lbaselib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lcode.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lcorolib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lctype.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ldblib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ldebug.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ldo.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ldump.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lfunc.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lgc.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\linit.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\liolib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\llex.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lmathlib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lmem.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\loadlib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lobject.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lopcodes.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\loslib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lparser.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lstate.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lstring.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lstrlib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ltable.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ltablib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ltests.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\ltm.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lua.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lundump.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lutf8lib.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lvm.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\lua\lzio.c">
+      <Filter>Source Files\lua</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

diff --git a/vs/aerospike/packages.config b/vs/aerospike/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="aerospike-client-c-dependencies" version="1.0.1" targetFramework="native" />
+  <package id="aerospike-client-c-dependencies" version="1.0.2" targetFramework="native" />
 </packages>
diff --git a/vs/examples/append/append.vcxproj b/vs/examples/append/append.vcxproj
@@ -237,12 +237,12 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets" Condition="Exists('..\..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets')" />
+    <Import Project="..\..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets" Condition="Exists('..\..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\aerospike-client-c-dependencies.1.0.1\build\native\aerospike-client-c-dependencies.targets'))" />
+    <Error Condition="!Exists('..\..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\aerospike-client-c-dependencies.1.0.2\build\native\aerospike-client-c-dependencies.targets'))" />
   </Target>
 </Project>
diff --git a/vs/examples/append/packages.config b/vs/examples/append/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="aerospike-client-c-dependencies" version="1.0.1" targetFramework="native" />
+  <package id="aerospike-client-c-dependencies" version="1.0.2" targetFramework="native" />
 </packages>