[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12456] branches/pynodes: * some after-merge cleaning.
Nathan Letwory
jesterking at letwory.net
Fri Nov 2 16:13:32 CET 2007
Revision: 12456
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12456
Author: jesterking
Date: 2007-11-02 16:13:31 +0100 (Fri, 02 Nov 2007)
Log Message:
-----------
* some after-merge cleaning.
* add some extra stuff, so they don't get lost in bit deepspace
Modified Paths:
--------------
branches/pynodes/extern/SConscript
branches/pynodes/source/blender/SConscript
branches/pynodes/source/blender/blenkernel/intern/modifier.c
branches/pynodes/source/blender/makesdna/DNA_modifier_types.h
branches/pynodes/source/blender/makesdna/DNA_text_types.h
branches/pynodes/source/blender/src/buttons_editing.c
branches/pynodes/source/blender/src/header_text.c
branches/pynodes/source/creator/SConscript
branches/pynodes/source/creator/creator.c
Added Paths:
-----------
branches/pynodes/extern/lua/
branches/pynodes/extern/lua/Makefile
branches/pynodes/extern/lua/SConscript
branches/pynodes/extern/lua/lapi.c
branches/pynodes/extern/lua/lapi.h
branches/pynodes/extern/lua/lauxlib.c
branches/pynodes/extern/lua/lauxlib.h
branches/pynodes/extern/lua/lbaselib.c
branches/pynodes/extern/lua/lcode.c
branches/pynodes/extern/lua/lcode.h
branches/pynodes/extern/lua/ldblib.c
branches/pynodes/extern/lua/ldebug.c
branches/pynodes/extern/lua/ldebug.h
branches/pynodes/extern/lua/ldo.c
branches/pynodes/extern/lua/ldo.h
branches/pynodes/extern/lua/ldump.c
branches/pynodes/extern/lua/lfunc.c
branches/pynodes/extern/lua/lfunc.h
branches/pynodes/extern/lua/lgc.c
branches/pynodes/extern/lua/lgc.h
branches/pynodes/extern/lua/linit.c
branches/pynodes/extern/lua/liolib.c
branches/pynodes/extern/lua/llex.c
branches/pynodes/extern/lua/llex.h
branches/pynodes/extern/lua/llimits.h
branches/pynodes/extern/lua/lmathlib.c
branches/pynodes/extern/lua/lmem.c
branches/pynodes/extern/lua/lmem.h
branches/pynodes/extern/lua/loadlib.c
branches/pynodes/extern/lua/lobject.c
branches/pynodes/extern/lua/lobject.h
branches/pynodes/extern/lua/lopcodes.c
branches/pynodes/extern/lua/lopcodes.h
branches/pynodes/extern/lua/loslib.c
branches/pynodes/extern/lua/lparser.c
branches/pynodes/extern/lua/lparser.h
branches/pynodes/extern/lua/lstate.c
branches/pynodes/extern/lua/lstate.h
branches/pynodes/extern/lua/lstring.c
branches/pynodes/extern/lua/lstring.h
branches/pynodes/extern/lua/lstrlib.c
branches/pynodes/extern/lua/ltable.c
branches/pynodes/extern/lua/ltable.h
branches/pynodes/extern/lua/ltablib.c
branches/pynodes/extern/lua/ltm.c
branches/pynodes/extern/lua/ltm.h
branches/pynodes/extern/lua/lua.c
branches/pynodes/extern/lua/lua.h
branches/pynodes/extern/lua/luac.c
branches/pynodes/extern/lua/luaconf.h
branches/pynodes/extern/lua/lualib.h
branches/pynodes/extern/lua/lundump.c
branches/pynodes/extern/lua/lundump.h
branches/pynodes/extern/lua/lvm.c
branches/pynodes/extern/lua/lvm.h
branches/pynodes/extern/lua/lzio.c
branches/pynodes/extern/lua/lzio.h
branches/pynodes/extern/lua/print.c
branches/pynodes/source/blender/blu/
branches/pynodes/source/blender/blu/README
branches/pynodes/source/blender/blu/SConscript
branches/pynodes/source/blender/blu/blu_interface.c
branches/pynodes/source/blender/blu/blu_interface.h
branches/pynodes/source/blender/blu/intern/
branches/pynodes/source/blender/blu/intern/blu_camera.c
branches/pynodes/source/blender/blu/intern/blu_camera.h
branches/pynodes/source/blender/blu/intern/blu_camera_helper.c
branches/pynodes/source/blender/blu/intern/blu_camera_helper.h
branches/pynodes/source/blender/blu/intern/blu_gen_utils.c
branches/pynodes/source/blender/blu/intern/blu_gen_utils.h
branches/pynodes/source/blender/blu/intern/blu_lamp.c
branches/pynodes/source/blender/blu/intern/blu_lamp.h
branches/pynodes/source/blender/blu/intern/blu_lamp_helper.c
branches/pynodes/source/blender/blu/intern/blu_lamp_helper.h
branches/pynodes/source/blender/blu/intern/blu_libs.h
branches/pynodes/source/blender/blu/intern/blu_object.c
branches/pynodes/source/blender/blu/intern/blu_object.h
branches/pynodes/source/blender/blu/intern/blu_object_helper.c
branches/pynodes/source/blender/blu/intern/blu_object_helper.h
branches/pynodes/source/blender/blu/intern/blu_scene.c
branches/pynodes/source/blender/blu/intern/blu_scene.h
branches/pynodes/source/blender/blu/intern/blu_scene_helper.c
branches/pynodes/source/blender/blu/intern/blu_scene_helper.h
branches/pynodes/source/blender/blu/intern/blu_tools.c
branches/pynodes/source/blender/blu/intern/blu_tools.h
branches/pynodes/source/blender/blu/intern/blu_types.c
branches/pynodes/source/blender/blu/libs/
branches/pynodes/source/blender/blu/libs/lbitlib.c
branches/pynodes/source/blender/blu/libs/lrandom.c
branches/pynodes/source/blender/blu/libs/lv3.c
branches/pynodes/source/blender/blu/libs/lv3.h
branches/pynodes/source/blender/blu/libs/random.c
Modified: branches/pynodes/extern/SConscript
===================================================================
--- branches/pynodes/extern/SConscript 2007-11-02 08:42:04 UTC (rev 12455)
+++ branches/pynodes/extern/SConscript 2007-11-02 15:13:31 UTC (rev 12456)
@@ -14,5 +14,7 @@
if env['WITH_BF_VERSE']:
SConscript(['verse/dist/SConstruct'])
+SConscript(['lua/SConscript'])
+
if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
SConscript(['ffmpeg/SConscript']);
Added: branches/pynodes/extern/lua/Makefile
===================================================================
--- branches/pynodes/extern/lua/Makefile (rev 0)
+++ branches/pynodes/extern/lua/Makefile 2007-11-02 15:13:31 UTC (rev 12456)
@@ -0,0 +1,183 @@
+# makefile for building Lua
+# see ../INSTALL for installation instructions
+# see ../Makefile and luaconf.h for further customization
+
+# == CHANGE THE SETTINGS BELOW TO SUIT YOUR ENVIRONMENT =======================
+
+# Your platform. See PLATS for possible values.
+PLAT= none
+
+CC= gcc
+CFLAGS= -O2 -Wall $(MYCFLAGS)
+AR= ar rcu
+RANLIB= ranlib
+RM= rm -f
+LIBS= -lm $(MYLIBS)
+
+MYCFLAGS=
+MYLDFLAGS=
+MYLIBS=
+
+# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
+
+PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+
+LUA_A= liblua.a
+CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
+ lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \
+ lundump.o lvm.o lzio.o
+LIB_O= lauxlib.o lbaselib.o ldblib.o liolib.o lmathlib.o loslib.o ltablib.o \
+ lstrlib.o loadlib.o linit.o
+
+LUA_T= lua
+LUA_O= lua.o
+
+LUAC_T= luac
+LUAC_O= luac.o print.o
+
+ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O)
+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
+ALL_A= $(LUA_A)
+
+default: $(PLAT)
+
+all: $(ALL_T)
+
+o: $(ALL_O)
+
+a: $(ALL_A)
+
+$(LUA_A): $(CORE_O) $(LIB_O)
+ $(AR) $@ $?
+ $(RANLIB) $@
+
+$(LUA_T): $(LUA_O) $(LUA_A)
+ $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
+
+$(LUAC_T): $(LUAC_O) $(LUA_A)
+ $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
+
+clean:
+ $(RM) $(ALL_T) $(ALL_O)
+
+depend:
+ @$(CC) $(CFLAGS) -MM l*.c print.c
+
+echo:
+ @echo "PLAT = $(PLAT)"
+ @echo "CC = $(CC)"
+ @echo "CFLAGS = $(CFLAGS)"
+ @echo "AR = $(AR)"
+ @echo "RANLIB = $(RANLIB)"
+ @echo "RM = $(RM)"
+ @echo "MYCFLAGS = $(MYCFLAGS)"
+ @echo "MYLDFLAGS = $(MYLDFLAGS)"
+ @echo "MYLIBS = $(MYLIBS)"
+
+# convenience targets for popular platforms
+
+none:
+ @echo "Please choose a platform:"
+ @echo " $(PLATS)"
+
+aix:
+ $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS="-brtl -bexpall"
+
+ansi:
+ $(MAKE) all MYCFLAGS=-DLUA_ANSI
+
+bsd:
+ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
+
+freebsd:
+ $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
+
+generic:
+ $(MAKE) all MYCFLAGS=
+
+linux:
+ $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
+
+macosx:
+ $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
+# use this on Mac OS X 10.4
+# $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline"
+
+mingw:
+ $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
+ "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
+ "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
+ $(MAKE) "LUAC_T=luac.exe" luac.exe
+
+posix:
+ $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
+
+solaris:
+ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
+
+# list targets that do not create files (but not all makes understand .PHONY)
+.PHONY: all $(PLATS) default o a clean depend echo none
+
+# DO NOT DELETE
+
+lapi.o: lapi.c lua.h luaconf.h lapi.h lobject.h llimits.h ldebug.h \
+ lstate.h ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h \
+ lundump.h lvm.h
+lauxlib.o: lauxlib.c lua.h luaconf.h lauxlib.h
+lbaselib.o: lbaselib.c lua.h luaconf.h lauxlib.h lualib.h
+lcode.o: lcode.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
+ lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h lgc.h \
+ ltable.h
+ldblib.o: ldblib.c lua.h luaconf.h lauxlib.h lualib.h
+ldebug.o: ldebug.c lua.h luaconf.h lapi.h lobject.h llimits.h lcode.h \
+ llex.h lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \
+ lfunc.h lstring.h lgc.h ltable.h lvm.h
+ldo.o: ldo.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+ lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lparser.h lstring.h \
+ ltable.h lundump.h lvm.h
+ldump.o: ldump.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h \
+ lzio.h lmem.h lundump.h
+lfunc.o: lfunc.c lua.h luaconf.h lfunc.h lobject.h llimits.h lgc.h lmem.h \
+ lstate.h ltm.h lzio.h
+lgc.o: lgc.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+ lzio.h lmem.h ldo.h lfunc.h lgc.h lstring.h ltable.h
+linit.o: linit.c lua.h luaconf.h lualib.h lauxlib.h
+liolib.o: liolib.c lua.h luaconf.h lauxlib.h lualib.h
+llex.o: llex.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h ltm.h \
+ lzio.h lmem.h llex.h lparser.h lstring.h lgc.h ltable.h
+lmathlib.o: lmathlib.c lua.h luaconf.h lauxlib.h lualib.h
+lmem.o: lmem.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+ ltm.h lzio.h lmem.h ldo.h
+loadlib.o: loadlib.c lauxlib.h lua.h luaconf.h lobject.h llimits.h \
+ lualib.h
+lobject.o: lobject.c lua.h luaconf.h ldo.h lobject.h llimits.h lstate.h \
+ ltm.h lzio.h lmem.h lstring.h lgc.h lvm.h
+lopcodes.o: lopcodes.c lopcodes.h llimits.h lua.h luaconf.h
+loslib.o: loslib.c lua.h luaconf.h lauxlib.h lualib.h
+lparser.o: lparser.c lua.h luaconf.h lcode.h llex.h lobject.h llimits.h \
+ lzio.h lmem.h lopcodes.h lparser.h ldebug.h lstate.h ltm.h ldo.h \
+ lfunc.h lstring.h lgc.h ltable.h
+lstate.o: lstate.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+ ltm.h lzio.h lmem.h ldo.h lfunc.h lgc.h llex.h lstring.h ltable.h
+lstring.o: lstring.c lua.h luaconf.h lmem.h llimits.h lobject.h lstate.h \
+ ltm.h lzio.h lstring.h lgc.h
+lstrlib.o: lstrlib.c lua.h luaconf.h lauxlib.h lualib.h
+ltable.o: ltable.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h \
+ ltm.h lzio.h lmem.h ldo.h lgc.h ltable.h
+ltablib.o: ltablib.c lua.h luaconf.h lauxlib.h lualib.h
+ltm.o: ltm.c lua.h luaconf.h lobject.h llimits.h lstate.h ltm.h lzio.h \
+ lmem.h lstring.h lgc.h ltable.h
+lua.o: lua.c lua.h luaconf.h lauxlib.h lualib.h
+luac.o: luac.c lua.h luaconf.h lauxlib.h ldo.h lobject.h llimits.h \
+ lstate.h ltm.h lzio.h lmem.h lfunc.h lopcodes.h lstring.h lgc.h \
+ lundump.h
+lundump.o: lundump.c lua.h luaconf.h ldebug.h lstate.h lobject.h \
+ llimits.h ltm.h lzio.h lmem.h ldo.h lfunc.h lstring.h lgc.h lundump.h
+lvm.o: lvm.c lua.h luaconf.h ldebug.h lstate.h lobject.h llimits.h ltm.h \
+ lzio.h lmem.h ldo.h lfunc.h lgc.h lopcodes.h lstring.h ltable.h lvm.h
+lzio.o: lzio.c lua.h luaconf.h llimits.h lmem.h lstate.h lobject.h ltm.h \
+ lzio.h
+print.o: print.c ldebug.h lstate.h lua.h luaconf.h lobject.h llimits.h \
+ ltm.h lzio.h lmem.h lopcodes.h lundump.h
+
+# (end of Makefile)
Added: branches/pynodes/extern/lua/SConscript
===================================================================
--- branches/pynodes/extern/lua/SConscript (rev 0)
+++ branches/pynodes/extern/lua/SConscript 2007-11-02 15:13:31 UTC (rev 12456)
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+Import ('env')
+
+source_files = ['lapi.c',
+ 'lcode.c',
+ 'ldebug.c',
+ 'ldo.c',
+ 'ldump.c',
+ 'lfunc.c',
+ 'lgc.c',
+ 'llex.c',
+ 'lmem.c',
+ 'lobject.c',
+ 'lopcodes.c',
+ 'lparser.c',
+ 'lstate.c',
+ 'lstring.c',
+ 'ltable.c',
+ 'ltm.c',
+ 'lundump.c',
+ 'lvm.c',
+ 'lzio.c',
+ 'lauxlib.c',
+ 'lbaselib.c',
+ 'ldblib.c',
+ 'liolib.c',
+ 'lmathlib.c',
+ 'loslib.c',
+ 'ltablib.c',
+ 'lstrlib.c',
+ 'loadlib.c',
+ 'linit.c'
+ ]
+
+#env.BlenderLib (libnameextern_lua', source=source_files)
+env.BlenderLib ( libname = 'extern_lua', sources=source_files, includes=[], defines=[], libtype=['core'], priority=[5], compileflags=[] )
\ No newline at end of file
Added: branches/pynodes/extern/lua/lapi.c
===================================================================
--- branches/pynodes/extern/lua/lapi.c (rev 0)
+++ branches/pynodes/extern/lua/lapi.c 2007-11-02 15:13:31 UTC (rev 12456)
@@ -0,0 +1,1080 @@
+/*
+** $Id: lapi.c,v 2.55 2006/06/07 12:37:17 roberto Exp $
+** Lua API
+** See Copyright Notice in lua.h
+*/
+
+
+#include <assert.h>
+#include <math.h>
+#include <stdarg.h>
+#include <string.h>
+
+#define lapi_c
+#define LUA_CORE
+
+#include "lua.h"
+
+#include "lapi.h"
+#include "ldebug.h"
+#include "ldo.h"
+#include "lfunc.h"
+#include "lgc.h"
+#include "lmem.h"
+#include "lobject.h"
+#include "lstate.h"
+#include "lstring.h"
+#include "ltable.h"
+#include "ltm.h"
+#include "lundump.h"
+#include "lvm.h"
+
+
+
+const char lua_ident[] =
+ "$Lua: " LUA_RELEASE " " LUA_COPYRIGHT " $\n"
+ "$Authors: " LUA_AUTHORS " $\n"
+ "$URL: www.lua.org $\n";
+
+
+
+#define api_checknelems(L, n) api_check(L, (n) <= (L->top - L->base))
+
+#define api_checkvalidindex(L, i) api_check(L, (i) != luaO_nilobject)
+
+#define api_incr_top(L) {api_check(L, L->top < L->ci->top); L->top++;}
+
+
+
+static TValue *index2adr (lua_State *L, int idx) {
+ if (idx > 0) {
+ TValue *o = L->base + (idx - 1);
+ api_check(L, idx <= L->ci->top - L->base);
+ if (o >= L->top) return cast(TValue *, luaO_nilobject);
+ else return o;
+ }
+ else if (idx > LUA_REGISTRYINDEX) {
+ api_check(L, idx != 0 && -idx <= L->top - L->base);
+ return L->top + idx;
+ }
+ else switch (idx) { /* pseudo-indices */
+ case LUA_REGISTRYINDEX: return registry(L);
+ case LUA_ENVIRONINDEX: {
+ Closure *func = curr_func(L);
+ sethvalue(L, &L->env, func->c.env);
+ return &L->env;
+ }
+ case LUA_GLOBALSINDEX: return gt(L);
+ default: {
+ Closure *func = curr_func(L);
+ idx = LUA_GLOBALSINDEX - idx;
+ return (idx <= func->c.nupvalues)
+ ? &func->c.upvalue[idx-1]
+ : cast(TValue *, luaO_nilobject);
+ }
+ }
+}
+
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list