Permalink
Browse files

Rename LuaPlus/src to LuaPlus/lua51-luaplus in preparation for additi…

…onal source directories
  • Loading branch information...
jjensen committed Sep 4, 2013
1 parent a686cd0 commit b80ba857c670834cdd61d56aa81e274b858d2108
Showing with 750 additions and 2,144 deletions.
  1. +7 −4 Jamfile.jam
  2. +12 −5 LUAPLUS.jamrules
  3. +1 −1 Samples/MinimalTestLib/MinimalTestLib.cpp
  4. +2 −2 Samples/MinimalTestLib/MinimalTestLib.jam
  5. +1 −1 Samples/TestClass/TestClass.cpp
  6. +2 −2 Samples/TestClass/TestClass.jam
  7. BIN Samples/TestLuaPlusAll/CompileMe.lc
  8. +0 −3 Samples/TestLuaPlusAll/CompileMe.lua
  9. +0 −1 Samples/TestLuaPlusAll/Jamfile.jam
  10. +0 −10 Samples/TestLuaPlusAll/ScriptArrayTest.lua
  11. +0 −5 Samples/TestLuaPlusAll/ScriptCallbackTest.lua
  12. +0 −2 Samples/TestLuaPlusAll/ScriptDumpTest.lua
  13. +0 −31 Samples/TestLuaPlusAll/ScriptSaveTest.lua
  14. +0 −57 Samples/TestLuaPlusAll/ScriptVectorDump.lua
  15. +0 −14 Samples/TestLuaPlusAll/ScriptVectorDump.out
  16. BIN Samples/TestLuaPlusAll/TestANSI.lua
  17. +0 −23 Samples/TestLuaPlusAll/TestLuaPlusAll.jam
  18. BIN Samples/TestLuaPlusAll/TestUnicode.lua
  19. +0 −61 Samples/TestLuaPlusAll/Timer.h
  20. BIN Samples/TestLuaPlusLib/CompileMe.lc
  21. +0 −3 Samples/TestLuaPlusLib/CompileMe.lua
  22. +0 −10 Samples/TestLuaPlusLib/ScriptArrayTest.lua
  23. +0 −5 Samples/TestLuaPlusLib/ScriptCallbackTest.lua
  24. +0 −2 Samples/TestLuaPlusLib/ScriptDumpTest.lua
  25. +0 −31 Samples/TestLuaPlusLib/ScriptSaveTest.lua
  26. +0 −57 Samples/TestLuaPlusLib/ScriptVectorDump.lua
  27. BIN Samples/TestLuaPlusLib/TestANSI.lua
  28. +0 −30 Samples/TestLuaPlusLib/TestLuaPlusLib.sln
  29. +0 −2 Samples/TestLuaPlusLib/TestLuaPlusLib.slnenv
  30. +0 −138 Samples/TestLuaPlusLib/TestLuaPlusLib.vcproj
  31. BIN Samples/TestLuaPlusLib/TestUnicode.lua
  32. +0 −61 Samples/TestLuaPlusLib/Timer.h
  33. +1 −1 Samples/TestScript/TestScript.cpp
  34. +2 −2 Samples/TestScript/TestScript.jam
  35. +6 −6 Samples/TestSuite/TestSuite.cpp
  36. +2 −2 Samples/TestSuite/TestSuite.jam
  37. +73 −0 Src/LuaPlus/Lua.jam
  38. +5 −5 Tools/Lua/LuaC/Jamfile.jam → Src/LuaPlus/LuaC.jam
  39. +2 −2 Src/LuaPlus/LuaPlusAddons.c
  40. +4 −4 Src/LuaPlus/LuaPlusCD.h
  41. +2 −2 Src/LuaPlus/LuaPlusInternal.h
  42. +62 −59 Src/LuaPlus/LuaPlusSharedLib.jam
  43. +65 −61 Src/LuaPlus/LuaPlusStaticLib.jam
  44. +1 −1 Src/LuaPlus/LuaState.inl
  45. +6 −0 Src/LuaPlus/LuaStateCD.h
  46. 0 Src/LuaPlus/{ → lua51-luaplus}/src/Makefile
  47. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lapi.c
  48. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lapi.h
  49. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lauxlib.c
  50. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lauxlib.h
  51. +1 −1 Src/LuaPlus/{ → lua51-luaplus}/src/lbaselib.c
  52. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lcode.c
  53. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lcode.h
  54. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ldblib.c
  55. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ldebug.c
  56. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ldebug.h
  57. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ldo.c
  58. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ldo.h
  59. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ldump.c
  60. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lfunc.c
  61. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lfunc.h
  62. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lgc.c
  63. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lgc.h
  64. 0 Src/LuaPlus/{ → lua51-luaplus}/src/linit.c
  65. 0 Src/LuaPlus/{ → lua51-luaplus}/src/liolib.c
  66. 0 Src/LuaPlus/{ → lua51-luaplus}/src/llex.c
  67. 0 Src/LuaPlus/{ → lua51-luaplus}/src/llex.h
  68. 0 Src/LuaPlus/{ → lua51-luaplus}/src/llimits.h
  69. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lmathlib.c
  70. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lmem.c
  71. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lmem.h
  72. 0 Src/LuaPlus/{ → lua51-luaplus}/src/loadlib.c
  73. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lobject.c
  74. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lobject.h
  75. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lopcodes.c
  76. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lopcodes.h
  77. 0 Src/LuaPlus/{ → lua51-luaplus}/src/loslib.c
  78. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lparser.c
  79. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lparser.h
  80. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lstate.c
  81. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lstate.h
  82. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lstring.c
  83. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lstring.h
  84. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lstrlib.c
  85. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ltable.c
  86. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ltable.h
  87. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ltablib.c
  88. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ltm.c
  89. 0 Src/LuaPlus/{ → lua51-luaplus}/src/ltm.h
  90. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lua.c
  91. +487 −487 Tools/Lua/Lua/Lua.cpp → Src/LuaPlus/lua51-luaplus/src/lua.cpp
  92. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lua.h
  93. +5 −3 Src/LuaPlus/{ → lua51-luaplus}/src/luac.c
  94. +1 −1 Src/LuaPlus/{ → lua51-luaplus}/src/luaconf.h
  95. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lualib.h
  96. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lundump.c
  97. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lundump.h
  98. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lvm.c
  99. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lvm.h
  100. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lzio.c
  101. 0 Src/LuaPlus/{ → lua51-luaplus}/src/lzio.h
  102. 0 Src/LuaPlus/{ → lua51-luaplus}/src/print.c
  103. +0 −248 Tools/Lua/Lua.sln
  104. +0 −2 Tools/Lua/Lua.slnenv
  105. +0 −193 Tools/Lua/Lua.xcodeproj/project.pbxproj
  106. +0 −69 Tools/Lua/Lua/Jamfile.jam
  107. +0 −203 Tools/Lua/LuaC/luac.c
  108. +0 −231 Tools/Lua/LuaC/print.c
View
@@ -5,19 +5,22 @@ SubDir LUAPLUS ;
Workspace LuaPlus :
lua
luac
- LuaPlusStatic
+ $(LUA_VERSION)-static
;
SubIncludeRelative Src LuaPlus : LuaPlusSharedLib ;
SubIncludeRelative Src LuaPlus : LuaPlusStaticLib ;
-SubIncludeRelative Tools Lua Lua ;
-SubIncludeRelative Tools Lua LuaC ;
+SubIncludeRelative Src LuaPlus : Lua ;
+SubIncludeRelative Src LuaPlus : LuaC ;
if $(OS) = NT
{
SubInclude LUAPLUS Src ManagedLuaPlus : ManagedLuaPlus ;
# SubInclude LUAPLUS Src ManagedLuaPlus : LuaPlusClrPure ;
- SubInclude LUAPLUS Src Lua51Proxy : Lua51Proxy ;
+
+ if $(LUA_VERSION) in lua51 lua51-luaplus {
+ SubInclude LUAPLUS Src Lua51Proxy : Lua51Proxy ;
+ }
SubInclude LUAPLUS Tools LuaPlusDebuggerAddin ;
Workspace LuaPlus :
View
@@ -1,3 +1,5 @@
+LUA_VERSION ?= lua51-luaplus ;
+
###############################################################################
# Set these if the user didn't use jam --workspace.
#ALL_LOCATE_TARGET ?= [ FSubDirPath LUAPLUS obj $(COMPILER.$(PLATFORM)) temp-$(PLATFORM)-$(CONFIG) ] ;
@@ -9,6 +11,9 @@ DEPCACHE ?= standard ;
#LUAPLUS_OUTPUT_DIRECTORY ?= [ FSubDirPath LUAPLUS bin.$(C.COMPILER).$(PLATFORM) ] ;
LUAPLUS_OUTPUT_DIRECTORY ?= $(LUAPLUS)/bin.$(C.COMPILER).$(PLATFORM) ;
+LUA_SOURCE_DIRECTORY_NAME = $(LUA_VERSION) ;
+LUAPLUS_INCLUDE_DIRECTORIES = $(LUAPLUS)/Src $(LUAPLUS)/Src/LuaPlus/$(LUA_SOURCE_DIRECTORY_NAME)/src ;
+
IncludeModule copyfile ;
NotFile download ;
@@ -36,7 +41,9 @@ rule LuaPlusFixUpTarget TARGET
###############################################################################
if $(OS) = NT {
- LUA_CDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/modules ;
+ if $(LUA_VERSION) in lua51-luaplus {
+ LUA_CDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/modules ;
+ }
LUA_LDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/lua ;
} else {
LUA_CDIR = $(LUAPLUS_OUTPUT_DIRECTORY)/lib/lua/5.1 ;
@@ -51,10 +58,10 @@ rule LuaPlus.CModule TARGET : OUTPUT_NAME : SOURCES : MODULES_SUBDIR {
Depends all : $(TARGET) ;
LuaPlusDefines $(TARGET) ;
- C.IncludeDirectories $(TARGET) : "$(LUAPLUS)/Src" "$(LUAPLUS)/Src/LuaPlus/src" ;
+ C.IncludeDirectories $(TARGET) : $(LUAPLUS_INCLUDE_DIRECTORIES) ;
if $(OS) != MACOSX && $(OS) != LINUX {
- C.LinkLibraries $(TARGET) : lua51 ;
+ C.LinkLibraries $(TARGET) : $(LUA_VERSION) ;
}
OUTPUT_NAME ?= $(TARGET) ;
@@ -94,10 +101,10 @@ rule Lua.CModule TARGET : OUTPUT_NAME : SOURCES : MODULES_SUBDIR {
Depends all : $(TARGET) ;
LuaPlusDefines $(TARGET) ;
- C.IncludeDirectories $(TARGET) : "$(LUAPLUS)/Src/LuaPlus/src" ;
+ C.IncludeDirectories $(TARGET) : $(LUAPLUS_INCLUDE_DIRECTORIES) ;
if $(OS) != MACOSX && $(OS) != LINUX {
- C.LinkLibraries $(TARGET) : lua51 ;
+ C.LinkLibraries $(TARGET) : $(LUA_VERSION) ;
}
OUTPUT_NAME ?= $(TARGET) ;
@@ -1,7 +1,7 @@
#include "LuaPlus/LuaPlus.h"
using namespace LuaPlus;
extern "C" {
-#include "LuaPlus/src/lualib.h"
+#include "lualib.h"
}
//#include <math.h>
//#include <assert.h>
@@ -13,8 +13,8 @@ local SRCS =
TestUnicode.lua
;
-C.IncludeDirectories MinimalTestLib : $(LUAPLUS)/Src ;
-C.LinkLibraries MinimalTestLib : LuaPlusStatic ;
+C.IncludeDirectories MinimalTestLib : $(LUAPLUS_INCLUDE_DIRECTORIES) ;
+C.LinkLibraries MinimalTestLib : $(LUA_VERSION)-static ;
C.Application MinimalTestLib : $(SRCS) ;
@@ -1,7 +1,7 @@
#include "LuaPlus/LuaPlus.h"
using namespace LuaPlus;
#include <string>
-#include "LuaPlus/src/lstate.h"
+#include "lstate.h"
namespace LPCD
{
@@ -11,8 +11,8 @@ local SRCS =
TestClass.cpp
;
-C.IncludeDirectories TestClass : $(LUAPLUS)/Src ;
-C.LinkLibraries TestClass : lua51 ;
+C.IncludeDirectories TestClass : $(LUAPLUS_INCLUDE_DIRECTORIES) ;
+C.LinkLibraries TestClass : $(LUA_VERSION) ;
C.Application TestClass : $(SRCS) ;
Binary file not shown.
@@ -1,3 +0,0 @@
-global = 10
-
-print("Hi")
@@ -1 +0,0 @@
-include TestLuaPlusAll.jam ;
@@ -1,10 +0,0 @@
-TestArray =
-{
- "String 1",
- 5,
- "String 2",
- "String 3",
- [1000] = 10.0,
-}
-
-
@@ -1,5 +0,0 @@
-Number = 5
-
-PrintNumber(Number)
-PrintNumber(Add(1, 2))
-
@@ -1,2 +0,0 @@
-Number = 5
-
@@ -1,31 +0,0 @@
-TestNumber = 5
-TestString = "Hello"
-
-TestTable =
-{
- Value1 = 5,
- Value2 = "Hi",
- Value3 = { [1] = 5, [100] = 50 },
- Value4 = { 1, 2, 3 },
- Value5 = { 1, 2, 3; VarA = 5, VarB = "String" },
-}
-
-NestedTableLevel1 =
-{
- Level2 =
- {
- Hi = "Hi",
- Level3 =
- {
- Hi = "Hi",
- Level4 =
- {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- }
- }
- }
-}
-
-TestTable2 = CopyTable(TestTable)
-TestTable2.Value5 = nil
-
@@ -1,57 +0,0 @@
-VectorMetaTable =
-{
- FormattedWrite = function(file, value, alphabetical, indentLevel,
- maxIndentLevel, writeAll, writeTablePointers)
- LuaFilePrint(file, "{ ")
-
- for index = 1, 1000000 do
- local obj = value[index]
- if not obj then
- break
- end
- if index ~= 1 then
- LuaFilePrint(file, ", ")
- end
- LuaFilePrint(file, "%.16g", obj)
- end
-
- LuaFilePrint(file, " }");
- end
-}
-
-MatrixMetaTable =
-{
- FormattedWrite = function(file, value, alphabetical, indentLevel,
- maxIndentLevel, writeAll, writeTablePointers)
- LuaFilePrint(file, "\n")
- LuaFileIndent(file, indentLevel)
- LuaFilePrint(file, "{\n")
- for i = 1, 4 do
- LuaFileIndent(file, indentLevel + 1)
- for j = 1, 4 do
- local obj = value[(i - 1) * 4 + j]
- LuaFilePrint(file, "%.16g, ", obj)
- end
- LuaFilePrint(file, "\n")
- end
- LuaFileIndent(file, indentLevel)
- LuaFilePrint(file, "}");
- end
-}
-
-Table =
-{
- Vec = { 0, 1, 2 },
- Mat =
- {
- 0, 1, 2, 3,
- 4, 5, 6, 7,
- 8, 9, 0, 1,
- 2, 3, 4, 5,
- },
-}
-
-setmetatable(Table.Vec, VectorMetaTable)
-setmetatable(Table.Mat, MatrixMetaTable)
-
-LuaDumpFile("ScriptVectorDump.out", "Table", Table, true)
@@ -1,14 +0,0 @@
-Table =
-{
- Mat =
- {
- 0, 1, 2, 3,
- 4, 5, 6, 7,
- 8, 9, 0, 1,
- 2, 3, 4, 5,
- },
- Vec = { 0, 1, 2 },
-}
-
-
-
Binary file not shown.
@@ -1,23 +0,0 @@
-{
-
-SubDir LUAPLUS Samples TestLuaPlusAll ;
-
-local SRCS =
- ../TestScript/TestScript.cpp
- ../TestScript/SimpleHeap.cpp
- ../TestScript/SimpleHeap.h
- ../../Src/LuaPlus/LuaPlusAll.cpp
- ScriptArrayTest.lua
- ScriptCallbackTest.lua
- ScriptDumpTest.lua
- ScriptSaveTest.lua
- ScriptVectorDump.lua
-;
-
-C.Defines TestLuaPlusAll : LUAPLUS_ALL ;
-C.IncludeDirectories TestLuaPlusAll : $(LUAPLUS)/Src ;
-C.ObjectC++Flags TestLuaPlusAll : LuaPlusAll.cpp : /P ;
-
-C.Application TestLuaPlusAll : $(SRCS) ;
-
-}
Binary file not shown.
@@ -1,61 +0,0 @@
-// This code is from the Workspace Whiz! source distribution.
-// Copyright 2000 Joshua C. Jensen
-#pragma once
-
-#include <windows.h>
-
-class Timer
-{
-public:
- Timer(void);
-
- void Reset(void);
- void Start(void);
- void Stop(void);
- double GetDuration(void) const;
- double GetMillisecs(void) const;
-
-protected:
- LARGE_INTEGER m_startTime;
- LONGLONG m_totalTime;
-
- LONGLONG m_frequency;
-};
-
-inline Timer::Timer(void) :
- m_totalTime(0)
-{
- LARGE_INTEGER liFrequency;
-
- QueryPerformanceFrequency(&liFrequency);
- m_frequency = liFrequency.QuadPart;
-
- m_totalTime = 0;
-}
-
-inline void Timer::Reset()
-{
- m_totalTime = 0;
-}
-
-inline void Timer::Start(void)
-{
- QueryPerformanceCounter(&m_startTime);
-}
-
-inline void Timer::Stop(void)
-{
- LARGE_INTEGER stopTime;
- QueryPerformanceCounter(&stopTime);
- m_totalTime += (stopTime.QuadPart - m_startTime.QuadPart);
-}
-
-inline double Timer::GetDuration(void) const
-{
- return (double)m_totalTime * 1000000.0 / m_frequency;
-}
-
-inline double Timer::GetMillisecs(void) const
-{
- return (double)m_totalTime * 1000000.0 / m_frequency / 1000.0;
-}
Binary file not shown.
@@ -1,3 +0,0 @@
-global = 10
-
-print("Hi")
@@ -1,10 +0,0 @@
-TestArray =
-{
- "String 1",
- 5,
- "String 2",
- "String 3",
- [1000] = 10.0,
-}
-
-
@@ -1,5 +0,0 @@
-Number = 5
-
-PrintNumber(Number)
-PrintNumber(Add(1, 2))
-
@@ -1,2 +0,0 @@
-Number = 5
-
@@ -1,31 +0,0 @@
-TestNumber = 5
-TestString = "Hello"
-
-TestTable =
-{
- Value1 = 5,
- Value2 = "Hi",
- Value3 = { [1] = 5, [100] = 50 },
- Value4 = { 1, 2, 3 },
- Value5 = { 1, 2, 3; VarA = 5, VarB = "String" },
-}
-
-NestedTableLevel1 =
-{
- Level2 =
- {
- Hi = "Hi",
- Level3 =
- {
- Hi = "Hi",
- Level4 =
- {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
- }
- }
- }
-}
-
-TestTable2 = CopyTable(TestTable)
-TestTable2.Value5 = nil
-
Oops, something went wrong.

0 comments on commit b80ba85

Please sign in to comment.