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

…onal source directories

Jamfile.jam

@@ -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 :

LUAPLUS.jamrules

@@ -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) ;

Samples/MinimalTestLib/MinimalTestLib.cpp

@@ -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>

Samples/MinimalTestLib/MinimalTestLib.jam

@@ -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) ;
 

Samples/TestClass/TestClass.cpp

@@ -1,7 +1,7 @@
 #include "LuaPlus/LuaPlus.h"
 using namespace LuaPlus;
 #include <string>
-#include "LuaPlus/src/lstate.h"
+#include "lstate.h"
 
 namespace LPCD
 {

Samples/TestClass/TestClass.jam

@@ -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) ;