From 61f1b4aa0f7e87a3f3e1de0bef6e64c5dee21138 Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Sun, 27 Feb 2022 19:21:37 +0100 Subject: deep_test tweaks --- deep_test/deep_test.vcxproj | 168 ++++++++++++++++++++++++++++++++++++--- deep_test/deep_test.vcxproj.user | 27 ++++++- deep_test/deeptest.lua | 4 +- 3 files changed, 186 insertions(+), 13 deletions(-) diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj index 9f3adac..6612de7 100644 --- a/deep_test/deep_test.vcxproj +++ b/deep_test/deep_test.vcxproj @@ -9,6 +9,14 @@ Debug 5.1 x64 + + Debug 5.2 + Win32 + + + Debug 5.2 + x64 + Debug 5.3 Win32 @@ -21,6 +29,14 @@ Debug 5.4 x64 + + Debug LuaJIT 2.0.5 + Win32 + + + Debug LuaJIT 2.0.5 + x64 + Debug LuaJIT 2.1.0-beta3 Win32 @@ -69,12 +85,24 @@ v142 MultiByte + + DynamicLibrary + true + v142 + MultiByte + DynamicLibrary true v142 MultiByte + + DynamicLibrary + true + v142 + MultiByte + DynamicLibrary true @@ -107,12 +135,24 @@ v142 MultiByte + + DynamicLibrary + true + v142 + MultiByte + DynamicLibrary true v142 MultiByte + + DynamicLibrary + true + v142 + MultiByte + DynamicLibrary true @@ -144,9 +184,15 @@ + + + + + + @@ -162,9 +208,15 @@ + + + + + + @@ -185,11 +237,21 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + + .dll + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + + .dll + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ @@ -205,11 +267,21 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + + .dll + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + + .dll + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ @@ -279,8 +351,8 @@ $(IntDir)$(TargetName).pdb - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\ - Copy to framework + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua53\bin\$(Platform)\Debug\ + Lua 5.3 lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -297,8 +369,26 @@ $(IntDir)$(TargetName).pdb - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\ - Copy to framework + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\ + Copy to Lua 5.2 + + + lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)..\Lua52\bin\$(Platform)\Debug + + + + + Level3 + Disabled + true + true + $(SolutionDir)..\Lua51\include;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + + + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\ + Copy to Lua 5.2 lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -313,9 +403,10 @@ true $(SolutionDir)..\LuaJIT-2.1.0-beta3\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform)\lanes\ + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform)\ Copy to LuaJIT2 @@ -323,6 +414,25 @@ $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform);%(AdditionalLibraryDirectories) + + + Level3 + Disabled + true + true + $(SolutionDir)..\LuaJIT-2.0.5\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform)\lanes\ + Copy to LuaJIT2 + + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories) + + Level3 @@ -352,8 +462,8 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\ - Copy to framework + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua53\bin\$(Platform)\Debug\ + Lua 5.3 lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -371,8 +481,27 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\ - Copy to framework + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\ + Copy to Lua 5.2 + + + lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)..\Lua52\bin\$(Platform)\Debug + + + + + Level3 + Disabled + true + true + $(SolutionDir)..\Lua51\include;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\ + Copy to Lua 5.2 lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -390,7 +519,7 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform)\lanes\ + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform)\ Copy to LuaJIT2 @@ -398,6 +527,25 @@ $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform);%(AdditionalLibraryDirectories) + + + Level3 + Disabled + true + true + $(SolutionDir)..\LuaJIT-2.0.5\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories) + $(IntDir)$(TargetName).pdb + _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.1.0-beta3\bin\$(Platform)\lanes\ + Copy to LuaJIT2 + + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories) + + Level3 diff --git a/deep_test/deep_test.vcxproj.user b/deep_test/deep_test.vcxproj.user index 1c5be4b..374b6b1 100644 --- a/deep_test/deep_test.vcxproj.user +++ b/deep_test/deep_test.vcxproj.user @@ -7,7 +7,13 @@ $(SolutionDir)Lanes\lanes\deep_test\ - $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua51.exe + $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\lua51.exe + WindowsLocalDebugger + -i + $(SolutionDir)Lanes\lanes\deep_test\ + + + $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua52.exe WindowsLocalDebugger -i $(SolutionDir)Lanes\lanes\deep_test\ @@ -18,6 +24,12 @@ -i $(SolutionDir)Lanes\lanes\deep_test\ + + $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\luajit.exe + WindowsLocalDebugger + -i + $(SolutionDir)Lanes\lanes\deep_test\ + $(SolutionDir)..\framework\lua54.exe WindowsLocalDebugger @@ -42,6 +54,12 @@ -i $(SolutionDir)Lanes\lanes\deep_test\ + + $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\luajit.exe + WindowsLocalDebugger + -i + $(SolutionDir)Lanes\lanes\deep_test\ + $(SolutionDir)Lanes\lanes\deep_test\ WindowsLocalDebugger @@ -50,7 +68,12 @@ $(SolutionDir)Lanes\lanes\deep_test\ WindowsLocalDebugger - $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua51.exe + $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\lua51.exe + + + $(SolutionDir)Lanes\lanes\deep_test\ + WindowsLocalDebugger + $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua52.exe $(SolutionDir)Lanes\lanes\deep_test\ diff --git a/deep_test/deeptest.lua b/deep_test/deeptest.lua index cbd08de..ec62b1e 100644 --- a/deep_test/deeptest.lua +++ b/deep_test/deeptest.lua @@ -29,7 +29,7 @@ local printDeep = function( prefix_, obj_, t_) end if t_ then for k, v in pairs( t_) do - print( k, v) + print( "t["..tostring(k).."]", v) end end print() @@ -72,6 +72,8 @@ local performTest = function( obj_) printDeep( "in lane, as arguments:", arg_, t_) -- read contents inside lane: obj_ and t by upvalue printDeep( "in lane, as upvalues:", obj_, t) + -- read contents inside lane: in linda + printDeep( "in lane, from linda:", l:get("key", 2)) return arg_, t_ end ) -- cgit v1.2.3-55-g6feb