From owner-p4-projects@FreeBSD.ORG Mon Sep 26 10:12:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FCE216A421; Mon, 26 Sep 2005 10:12:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 238AA16A41F for ; Mon, 26 Sep 2005 10:12:03 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8A0443D48 for ; Mon, 26 Sep 2005 10:12:02 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8QAC2xe076553 for ; Mon, 26 Sep 2005 10:12:02 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8QAC2gl076550 for perforce@freebsd.org; Mon, 26 Sep 2005 10:12:02 GMT (envelope-from soc-andrew@freebsd.org) Date: Mon, 26 Sep 2005 10:12:02 GMT Message-Id: <200509261012.j8QAC2gl076550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 84278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Sep 2005 10:12:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=84278 Change 84278 by soc-andrew@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 #include +#if 0 #include "lua50/lua.h" #include "lua50/lauxlib.h" #include "lua50/lualib.h" +#else +#include +#include +#include +#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 +#include +#include +#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 +#include +#include +#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 #include +#if 0 #include "lua50/lua.h" #include "lua50/lauxlib.h" #include "lua50/lualib.h" +#else +#include +#include +#include +#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