PERFORCE change 84278 for review

[soc-andrew]

http://perforce.freebsd.org/chv.cgi?CH=84278

Change 84278 by soc-andrew at soc-andrew_serv on 2005/09/26 10:11:17

	Add the bsdinstaller Lua modules

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/dfui/common.c#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/dfui/dfui.c#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/dfui/progress.c#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/filename/filename.lua#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/pty/pty.c#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#2 edit
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/lua/Makefile#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/lua/Makefile.inc1#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/lua/app/Makefile#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/lua/dfui/Makefile#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/lua/filename/Makefile#1 add
.. //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/lua/pty/Makefile#1 add

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/dfui/common.c#2 (text+ko) ====

@@ -61,9 +61,15 @@
 #include <sysexits.h>
 #include <unistd.h>
 
+#if 0
 #include "lua50/lua.h"
 #include "lua50/lauxlib.h"
 #include "lua50/lualib.h"
+#else
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#endif
 
 #include "lua_dfui.h"
 

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/dfui/dfui.c#2 (text+ko) ====

@@ -60,9 +60,15 @@
 #include "dfui/lang.h"
 #include "dfui/system.h"
 
+#if 0
 #include "lua50/lua.h"
 #include "lua50/lauxlib.h"
 #include "lua50/lualib.h"
+#else
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#endif
 
 #include "lua_dfui.h"
 

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/dfui/progress.c#2 (text+ko) ====

@@ -57,9 +57,15 @@
 
 #include "dfui/dfui.h"
 
+#if 0
 #include "lua50/lua.h"
 #include "lua50/lauxlib.h"
 #include "lua50/lualib.h"
+#else
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#endif
 
 #include "lua_dfui.h"
 

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/filename/filename.lua#2 (text+ko) ====

@@ -2,7 +2,7 @@
 
 module("filename")
 
-local POSIX = require("posix")
+require("posix")
 
 --[[----------]]--
 --[[ FileName ]]--
@@ -110,7 +110,7 @@
 --
 
 FileName.is_dir = function(path)
-	local stat = POSIX.stat(path)
+	local stat = posix.stat(path)
 
 	if not stat then
 		return nil
@@ -120,17 +120,17 @@
 end
 
 FileName.is_file = function(path)
-	local stat = POSIX.stat(path)
+	local stat = posix.stat(path)
 
 	if not stat then
 		return nil
 	else
-		return stat.type == "regular"
+		return 	stat.type == "regular"
 	end
 end
 
 FileName.is_program = function(path)
-	local stat = POSIX.stat(path)
+	local stat = posix.stat(path)
 
 	if not stat then
 		return nil

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/lib/lua/pty/pty.c#2 (text+ko) ====

@@ -50,9 +50,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#if 0
 #include "lua50/lua.h"
 #include "lua50/lauxlib.h"
 #include "lua50/lualib.h"
+#else
+#include <lua.h>
+#include <lauxlib.h>
+#include <lualib.h>
+#endif
 
 #ifdef WEXITSTATUS
 #define WEXIT_TYPE int

==== //depot/projects/soc2005/bsdinstaller/src/lib/bsdinstaller/Makefile#2 (text+ko) ====

@@ -1,3 +1,3 @@
-SUBDIR=aura dfui installer
+SUBDIR=aura dfui installer lua
 
 .include <bsd.subdir.mk>