Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2005-11-21 23:43:12
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19201/wxLua/apps/build/bakefiles Modified Files: apps.bkl Log Message: update to more depricated wx27 stuff Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps.bkl 20 Jun 2005 09:48:35 -0000 1.4 --- apps.bkl 21 Nov 2005 23:42:59 -0000 1.5 *************** *** 59,71 **** <win32-res>wxlua/src/wxlua.rc</win32-res> - <!-- here we handle the --> - <sources>..\bindings\wxwidgets\wxluawrap.c</sources> - - <!-- Libraries must be put in the right order ! --> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>lua</wxlua-lib> <wx-lib>adv</wx-lib> --- 59,67 ---- <win32-res>wxlua/src/wxlua.rc</win32-res> <!-- Libraries must be put in the right order ! --> <wxlua-lib>wxluadebug</wxlua-lib> <wxlua-lib>wxluasocket</wxlua-lib> <wxlua-lib>wxlua</wxlua-lib> ! <wxlua-lib>wxbind</wxlua-lib> <wxlua-lib>lua</wxlua-lib> <wx-lib>adv</wx-lib> |
|
From: John L. <jr...@us...> - 2005-11-20 22:31:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29501/wxLua/modules/wxbind/src Modified Files: Makefile Log Message: missed renamimg target_lib Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 20 Nov 2005 22:28:07 -0000 1.2 --- Makefile 20 Nov 2005 22:31:43 -0000 1.3 *************** *** 111,116 **** cd $(WXBIND_TARGET_LIBDIR) \ && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: --- 111,116 ---- cd $(WXBIND_TARGET_LIBDIR) \ && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK1) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(WXBIND_TARGET_LIB_LINK2) clean: |
|
From: John L. <jr...@us...> - 2005-11-20 22:28:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28455/wxLua/modules/wxluasocket/src Modified Files: Makefile Log Message: Makefile cleanup Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 7 Jun 2005 04:17:41 -0000 1.1 --- Makefile 20 Nov 2005 22:28:07 -0000 1.2 *************** *** 7,33 **** # Makefile for wxLua library using gmake ! LUADIR = ../../lua ! WXDIR = $(shell wx-config --prefix) ! WXBASENAME = $(shell wx-config --basename) ! WXLIBBASE = $(shell wx-config --basename) ! WXVERSION = $(shell wx-config --version) ! WXRELEASE = $(shell wx-config --release) ! CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall ! LDLIBS = $(shell wx-config --libs) ! CXX = $(shell wx-config --cxx) ! APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= ! LIBVERSION_CURRENT=1 ! LIBVERSION_REVISION=5 ! LIBVERSION_AGE=0 ! TARGET_LIBNAME = lib$(WXLIBBASE)_wxluasocket-$(WXRELEASE) ! TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so --- 7,45 ---- # Makefile for wxLua library using gmake ! # --- wxLua parameters ------------------------------------------------------- ! WXLUA_LIBVERSION_CURRENT = 1 ! WXLUA_LIBVERSION_REVISION = 5 ! WXLUA_LIBVERSION_AGE = 0 ! WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib ! LUA = $(WXLUA_DIR)/bin/lua ! # ---------------------------------------------------------------------------- ! # --- wxWidgets parameters from wx-config ------------------------------------ ! WXCONFIG := wx-config ! WXPREFIX = $(shell $(WXCONFIG) --prefix) ! WXBASENAME = $(shell $(WXCONFIG) --basename) ! WXVERSION = $(shell $(WXCONFIG) --version) ! WXRELEASE = $(shell $(WXCONFIG) --release) ! WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) ! WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib ! # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= ! TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) ! TARGET_LIBDIR = $(WXPREFIX)/lib ! ! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so *************** *** 65,69 **** $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(WXDIR)/lib \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ --- 77,81 ---- $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ *************** *** 73,78 **** rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(WXDIR)/lib/$(TARGET_LIB_LINK1) \ ! $(WXDIR)/lib/$(TARGET_LIB_LINK2) -include $(DEPFILES) --- 85,90 ---- rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-11-20 22:28:15
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28455/wxLua/apps/wxlua/src Modified Files: Makefile Removed Files: Makefile_import Log Message: Makefile cleanup Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 20 Nov 2005 06:36:39 -0000 1.5 --- Makefile 20 Nov 2005 22:28:07 -0000 1.6 *************** *** 7,46 **** # Makefile for wxLua standalone sample using gmake ! WXLUA = ../../.. ! LUADIR = $(WXLUA)/modules/lua ! WXDIR = $(shell wx-config --prefix) ! WXLIBDIR = $(WXDIR)/lib ! WXBASENAME = $(shell wx-config --basename) ! WXLIBBASE = $(shell wx-config --basename) ! WXVERSION = $(shell wx-config --version) ! WXRELEASE = $(shell wx-config --release) ! CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g ! LDLIBS = $(shell wx-config --libs) ! CXX = $(shell wx-config --cxx) ! PROGRAM = wxLua ! LUA = $(WXLUA)/bin/lua ! LUA_LIBS = $(WXLUA)/lib/liblua.a $(WXLUA)/lib/liblualib.a ! WXLUA_LIB = $(WXLIBBASE)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXLIBBASE)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXLIBBASE)_wxluasocket-$(WXRELEASE) ! WXLUABIND_LIB = $(WXLIBBASE)_wxluabind-$(WXRELEASE) ! WXSTC_LIB = $(WXLIBBASE)_stc-$(WXRELEASE) ! WXXRC_LIB = $(WXLIBBASE)_xrc-$(WXRELEASE) ! WXFL_LIB = $(WXLIBBASE)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I$(WXLUA)/modules -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs ! #APPEXTRALIBS=-L$(WXLIBDIR) $(WXLIBDIR)/lib$(WXLUA_LIB).a $(WXLIBDIR)/lib$(STC_LIB).a $(WXLIBDIR)/lib$(WXXRC_LIB).a $(WXLIBDIR)/lib$(WXFL_LIB).a $(LUA_LIBS) # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB) OBJECTS=wxlua.o --- 7,56 ---- # Makefile for wxLua standalone sample using gmake ! # --- wxLua parameters ------------------------------------------------------- ! WXLUA_LIBVERSION_CURRENT = 1 ! WXLUA_LIBVERSION_REVISION = 5 ! WXLUA_LIBVERSION_AGE = 0 ! WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib ! LUA = $(WXLUA_DIR)/bin/lua ! # ---------------------------------------------------------------------------- ! # --- wxWidgets parameters from wx-config ------------------------------------ ! WXCONFIG := wx-config ! WXPREFIX = $(shell $(WXCONFIG) --prefix) ! WXBASENAME = $(shell $(WXCONFIG) --basename) ! WXVERSION = $(shell $(WXCONFIG) --version) ! WXRELEASE = $(shell $(WXCONFIG) --release) ! WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) ! WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib ! # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! PROGRAM = wxLua ! LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a ! WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) ! WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) ! WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) ! WXLUABIND_LIB = $(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) ! WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) ! WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs ! #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS) # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) ! APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) -l$(WXSTC_LIB) -l$(WXXRC_LIB) $(LUA_LIBS) -l$(WXLUABIND_LIB) OBJECTS=wxlua.o *************** *** 56,78 **** lua: ! @(cd $(LUADIR) && make) bindings: ! @(cd $(WXLUA)/bindings/wxwidgets && make) editor: ! $(LUA) $(WXLUA)/util/bin2c/bin2c.lua -t $(WXLUA)/samples/editor.wx.lua wxLuaEditor > editor.h wxLuaBindings: ! @(cd $(WXLUA)/modules/wxbind/src && make) wxLuaLib: ! @(cd $(WXLUA)/modules/wxlua/src && make) wxLuaDebugLib: ! @(cd $(WXLUA)/modules/wxluadebug/src && make) wxLuaSocketLib: ! @(cd $(WXLUA)/modules/wxluasocket/src && make) clean: --- 66,88 ---- lua: ! @(cd $(WXLUA_DIR)/modules/lua && make) bindings: ! @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) editor: ! $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t $(WXLUA_DIR)/samples/editor.wx.lua wxLuaEditor > editor.h wxLuaBindings: ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make) wxLuaLib: ! @(cd $(WXLUA_DIR)/modules/wxlua/src && make) wxLuaDebugLib: ! @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make) wxLuaSocketLib: ! @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) clean: *************** *** 81,89 **** cleanall: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! make -f Makefile_import clean ! @(cd $(WXLUA)/modules/wxlua/src && make clean) ! @(cd $(WXLUA)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA)/modules/wxluasocket/src && make clean) ! @(cd $(WXLUA)/modules/wxbind/src && make clean) -include $(DEPFILES) --- 91,100 ---- cleanall: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core ! @(cd $(WXLUA_DIR)/modules/lua && make clean) ! @(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean) ! @(cd $(WXLUA_DIR)/modules/wxbind/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxlua/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) ! @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) -include $(DEPFILES) --- Makefile_import DELETED --- |
|
From: John L. <jr...@us...> - 2005-11-20 22:28:15
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28455/wxLua/bindings/wxwidgets Modified Files: Makefile Log Message: Makefile cleanup Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 20 Nov 2005 06:36:39 -0000 1.1 --- Makefile 20 Nov 2005 22:28:07 -0000 1.2 *************** *** 9,22 **** # Makefile for generating the bindings ! WXLUA = ../.. ! include $(WXLUA)/bindings/wxwidgets/wrappers.lst ! THEWRAPPERS=$(addprefix $(WXLUA)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=luasetup.h.in $(WXLUA)/bindings/genwxbind.lua $(WXLUA)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind genwxbind: $(DEPFILES) ! @(cd $(WXLUA)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) # do nothing to clean --- 9,22 ---- # Makefile for generating the bindings ! WXLUA_DIR = ../.. ! include $(WXLUA_DIR)/bindings/wxwidgets/wrappers.lst ! THEWRAPPERS=$(addprefix $(WXLUA_DIR)/bindings/wxwidgets/, $(WRAPPERS)) ! DEPFILES=luasetup.h.in $(WXLUA_DIR)/bindings/genwxbind.lua $(WXLUA_DIR)/bindings/wxwidgets/override.hpp # $(THEWRAPPERS) all: genwxbind genwxbind: $(DEPFILES) ! @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) # do nothing to clean |
|
From: John L. <jr...@us...> - 2005-11-20 22:28:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28455/wxLua/modules/wxluadebug/src Modified Files: Makefile Log Message: Makefile cleanup Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 7 Jun 2005 04:17:40 -0000 1.1 --- Makefile 20 Nov 2005 22:28:07 -0000 1.2 *************** *** 7,33 **** # Makefile for wxLua library using gmake ! LUADIR = ../../lua ! WXDIR = $(shell wx-config --prefix) ! WXBASENAME = $(shell wx-config --basename) ! WXLIBBASE = $(shell wx-config --basename) ! WXVERSION = $(shell wx-config --version) ! WXRELEASE = $(shell wx-config --release) ! CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall ! LDLIBS = $(shell wx-config --libs) ! CXX = $(shell wx-config --cxx) ! APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= ! LIBVERSION_CURRENT=1 ! LIBVERSION_REVISION=5 ! LIBVERSION_AGE=0 ! TARGET_LIBNAME = lib$(WXLIBBASE)_wxluadebug-$(WXRELEASE) ! TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so --- 7,45 ---- # Makefile for wxLua library using gmake ! # --- wxLua parameters ------------------------------------------------------- ! WXLUA_LIBVERSION_CURRENT = 1 ! WXLUA_LIBVERSION_REVISION = 5 ! WXLUA_LIBVERSION_AGE = 0 ! WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib ! LUA = $(WXLUA_DIR)/bin/lua ! # ---------------------------------------------------------------------------- ! # --- wxWidgets parameters from wx-config ------------------------------------ ! WXCONFIG := wx-config ! WXPREFIX = $(shell $(WXCONFIG) --prefix) ! WXBASENAME = $(shell $(WXCONFIG) --basename) ! WXVERSION = $(shell $(WXCONFIG) --version) ! WXRELEASE = $(shell $(WXCONFIG) --release) ! WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) ! WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib ! # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= ! TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE) ! TARGET_LIBDIR = $(WXPREFIX)/lib ! ! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so *************** *** 63,67 **** $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(WXDIR)/lib \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ --- 75,79 ---- $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ *************** *** 71,76 **** rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(WXDIR)/lib/$(TARGET_LIB_LINK1) \ ! $(WXDIR)/lib/$(TARGET_LIB_LINK2) -include $(DEPFILES) --- 83,88 ---- rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-11-20 22:28:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28455/wxLua/modules/wxlua/src Modified Files: Makefile Log Message: Makefile cleanup Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 7 Jun 2005 04:17:39 -0000 1.1 --- Makefile 20 Nov 2005 22:28:07 -0000 1.2 *************** *** 7,33 **** # Makefile for wxLua library using gmake ! LUADIR = ../../lua ! WXDIR = $(shell wx-config --prefix) ! WXBASENAME = $(shell wx-config --basename) ! WXLIBBASE = $(shell wx-config --basename) ! WXVERSION = $(shell wx-config --version) ! WXRELEASE = $(shell wx-config --release) ! CXXFLAGS = $(shell wx-config --cxxflags) -MMD -g -Wall ! LDLIBS = $(shell wx-config --libs) ! CXX = $(shell wx-config --cxx) ! APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= ! LIBVERSION_CURRENT=1 ! LIBVERSION_REVISION=5 ! LIBVERSION_AGE=0 ! TARGET_LIBNAME = lib$(WXLIBBASE)_wxlua-$(WXRELEASE) ! TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so --- 7,45 ---- # Makefile for wxLua library using gmake ! # --- wxLua parameters ------------------------------------------------------- ! WXLUA_LIBVERSION_CURRENT = 1 ! WXLUA_LIBVERSION_REVISION = 5 ! WXLUA_LIBVERSION_AGE = 0 ! WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib ! LUA = $(WXLUA_DIR)/bin/lua ! # ---------------------------------------------------------------------------- ! # --- wxWidgets parameters from wx-config ------------------------------------ ! WXCONFIG := wx-config ! WXPREFIX = $(shell $(WXCONFIG) --prefix) ! WXBASENAME = $(shell $(WXCONFIG) --basename) ! WXVERSION = $(shell $(WXCONFIG) --version) ! WXRELEASE = $(shell $(WXCONFIG) --release) ! WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) ! WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib ! # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= ! TARGET_LIBNAME = lib$(WXBASENAME)_wxlua-$(WXRELEASE) ! TARGET_LIBDIR = $(WXLUA_LIBDIR) ! ! TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so *************** *** 56,60 **** $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) --- 68,72 ---- $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) $(TARGET_LIB_STATIC) : $(OBJECTS) *************** *** 65,69 **** $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(WXDIR)/lib \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ --- 77,81 ---- $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(TARGET_LIBDIR) \ && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ *************** *** 73,78 **** rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(WXDIR)/lib/$(TARGET_LIB_LINK1) \ ! $(WXDIR)/lib/$(TARGET_LIB_LINK2) -include $(DEPFILES) --- 85,90 ---- rm -f core $(OBJECTS) $(DEPFILES) \ $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-11-20 22:28:15
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28455/wxLua/modules/wxbind/src Modified Files: Makefile Log Message: Makefile cleanup Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 20 Nov 2005 06:39:46 -0000 1.1 --- Makefile 20 Nov 2005 22:28:07 -0000 1.2 *************** *** 10,38 **** WXLUASETUP = luasetup.h ! WXCONFIG := wx-config ! WXDIR = $(shell $(WXCONFIG) --prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) - WXLIBBASE = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) WXRELEASE = $(shell $(WXCONFIG) --release) ! CXXFLAGS = $(shell $(WXCONFIG) --cxxflags) -MMD -g -Wall ! LDLIBS = $(shell $(WXCONFIG) --libs) ! CXX = $(shell $(WXCONFIG) --cxx) ! ! APPEXTRADEFS=-I../../ -I$(WXDIR)/contrib/include -fexceptions -DLUACALL= ! LIBVERSION_CURRENT=1 ! LIBVERSION_REVISION=5 ! LIBVERSION_AGE=0 ! TARGET_LIBNAME = lib$(WXLIBBASE)_wxluabind-$(WXRELEASE) ! TARGET_LIBDIR = $(WXDIR)/lib ! TARGET_LIB_STATIC = $(WXDIR)/lib/$(TARGET_LIBNAME).a ! TARGET_LIB_SHARED = $(WXDIR)/lib/$(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) ! TARGET_LIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) ! TARGET_LIB_LINK2 = $(TARGET_LIBNAME).so RM = rm -f --- 10,49 ---- WXLUASETUP = luasetup.h ! # --- wxLua parameters ------------------------------------------------------- ! WXLUA_LIBVERSION_CURRENT = 1 ! WXLUA_LIBVERSION_REVISION = 5 ! WXLUA_LIBVERSION_AGE = 0 ! WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib ! ! LUA = $(WXLUA_DIR)/bin/lua ! # ---------------------------------------------------------------------------- ! ! # --- wxWidgets parameters from wx-config ------------------------------------ ! WXCONFIG := wx-config ! WXPREFIX = $(shell $(WXCONFIG) --prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) WXRELEASE = $(shell $(WXCONFIG) --release) + WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) + WXLDLIBS = $(shell $(WXCONFIG) --libs) + WXCXX = $(shell $(WXCONFIG) --cxx) + WXLIB_DIR = $(WXPREFIX)/lib + # ---------------------------------------------------------------------------- ! CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall ! LDLIBS = $(WXLDLIBS) ! CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= ! WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXBIND_TARGET_LIBDIR = $(WXPREFIX)/lib ! WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a ! WXBIND_TARGET_LIB_SHARED = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT).$(WXLUA_LIBVERSION_REVISION).$(WXLUA_LIBVERSION_AGE) ! WXBIND_TARGET_LIB_LINK1 = $(WXBIND_TARGET_LIBNAME).so.$(WXLUA_LIBVERSION_CURRENT) ! WXBIND_TARGET_LIB_LINK2 = $(WXBIND_TARGET_LIBNAME).so RM = rm -f *************** *** 89,111 **** $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< ! all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ ! $(TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(TARGET_LIBDIR) \ ! && $(RM) $(TARGET_LIB_LINK1) $(TARGET_LIB_LINK2) \ ! && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ ! && $(LN_S) $(TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ ! $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) --- 100,122 ---- $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< ! all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) ! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) $(RANLIB) $@ ! $(WXBIND_TARGET_LIB_SHARED): $(OBJECTS) $(CXX) -shared -o $@ $(OBJECTS) ! cd $(WXBIND_TARGET_LIBDIR) \ ! && $(RM) $(WXBIND_TARGET_LIB_LINK1) $(WXBIND_TARGET_LIB_LINK2) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(TARGET_LIB_LINK1) \ ! && $(LN_S) $(WXBIND_TARGET_LIB_SHARED) $(TARGET_LIB_LINK2) clean: rm -f core $(OBJECTS) $(DEPFILES) \ ! $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-11-20 21:20:46
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13091/wxLua/docs Modified Files: dirs.txt Log Message: update to new dir structure Index: dirs.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/dirs.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dirs.txt 7 Jun 2005 04:39:18 -0000 1.1 --- dirs.txt 20 Nov 2005 21:20:36 -0000 1.2 *************** *** 1,8 **** ! 06/01/2005 This is a description of the directory structure of wxLua. ------------------------------------------------------------------------------- ! Directory structure ------------------------------------------------------------------------------- --- 1,8 ---- ! 11/20/2005 This is a description of the directory structure of wxLua. ------------------------------------------------------------------------------- ! Directory structure of wxLua ------------------------------------------------------------------------------- *************** *** 12,35 **** /build/ - build for all applications /wxlua/ - wxLua the main IDE for wxLua (the "Standalone" program) ! /embedded/ - an embedded sample ! /runtime/ - a stripped down runtime for wxLua /bin/ - output binaries are built here, lua for example /build/ - cmake, bakefile stuff here, may call sub build dirs /docs/ - any generic docs go here /lib/ - output libs are built here, wxlualib for example ! /samples/ - sample wxlua programs ! /name/ - any multifile sample gets its own dir ! /utils/ - generic utils, bin2c for example ! /bindings/ - input *.i files to make the "wrappers" ! wxluawrap.lua - the main wrapper file ! /wxwidgets/ - wrapper files for wxWidgets ! /bit/ - the bitwise lib for lua, maybe nothing needed here ! /other .i files for other stuff.../ ! ! /wrappers/ - output of the wrapper files may be built here ! /wxwidgets/ - output of bindings and wxLuaPrinting, wxLuaHtmlWin ! /bit/ - the wrapper is the "src" of the bit library ! /output of other .i files for other stuff.../ ! /modules/ - c/c++ code for wxlua /build/ - build files for all of this --- 12,28 ---- /build/ - build for all applications /wxlua/ - wxLua the main IDE for wxLua (the "Standalone" program) ! /embedded/ - TODO - an embedded sample ! /runtime/ - TODO - a stripped down runtime for wxLua /bin/ - output binaries are built here, lua for example + + /bindings/ - input *.i files to make the "wrappers" + genwxluabind.lua - the main wrapper file, converts *.i to *.cpp + /wxwidgets/ - wrapper files for wxWidgets + /bit/ - TODO - the bitwise lib for lua + /build/ - cmake, bakefile stuff here, may call sub build dirs /docs/ - any generic docs go here /lib/ - output libs are built here, wxlualib for example ! /modules/ - c/c++ code for wxlua /build/ - build files for all of this *************** *** 47,61 **** /include/ - debug.h, stacktree, splittree /src/ - debug.cpp, stacktree, splittree ! /wxxmlrpc/ - ?? /include/ - /src/ - ! /wxdebuggernub/ - ?? this is a generic lib for xmlrpc? don"t prepend wxlua to it /include/ - /src/ - ! /wxluadebugger/ - this depends on wxlua so prepend wxlua to it /include/ - /src/ - ! ------------------------------------------------------------------------------- Original wxLua distribution directory structure ------------------------------------------------------------------------------- --- 40,72 ---- /include/ - debug.h, stacktree, splittree /src/ - debug.cpp, stacktree, splittree ! ! /wxxmlrpc/ - TODO - ? /include/ - /src/ - ! /wxdebuggernub/ - TODO - this is a generic lib for xmlrpc? don"t prepend wxlua to it /include/ - /src/ - ! /wxluadebugger/ - TODO - ? this depends on wxlua so prepend wxlua to it /include/ - /src/ - ! /samples/ - sample wxlua programs ! /name/ - TODO - any multifile sample gets its own dir ! /utils/ - generic utils ! /bin2c/ - a program to convert a text file to an unsigned char array ! ! ------------------------------------------------------------------------------ ! DEAD UNUSED DIRECTORIES (to be removed by Sourceforge) ! ------------------------------------------------------------------------------ ! ! wxLua/ ! /import/ - see /bindings/... ! /include/ - see /modules/[module name]/include ! /src/ - see /modules/[module name]/src ! /lua/ - see /modules/lua/* ! /wrappers/ - see /modules/wxbind ! /wxlua/ - see /modules/wxlua ! ! ------------------------------------------------------------------------------ Original wxLua distribution directory structure ------------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2005-11-20 20:13:27
|
Update of /cvsroot/wxlua/wxLua/include/wxlua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26839/wxLua/include/wxlua Removed Files: dservice.h Log Message: remove dead files --- dservice.h DELETED --- |
|
From: John L. <jr...@us...> - 2005-11-20 20:10:57
|
Update of /cvsroot/wxlua/wxLua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26275/wxLua/src Removed Files: dservice.cpp wxLuaLib_wx26.dsp Log Message: remove more dead files --- dservice.cpp DELETED --- --- wxLuaLib_wx26.dsp DELETED --- |
|
From: John L. <jr...@us...> - 2005-11-20 20:10:57
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26275/wxLua/modules/wxluasocket/src Added Files: dservice.cpp Log Message: remove more dead files --- NEW FILE: dservice.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaDebuggee.cpp // Purpose: wxLua Debuggee - App Debugging Service using wxSockets // Author: Ray Gilbert // Modified by: // Created: 2003-06-23 // RCS-ID: $Id: dservice.cpp,v 1.1 2005/11/20 20:10:41 jrl1 Exp $ // Copyright: (c) Ray Gilbert // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // // Based heavily on: // wxLuaDebugTarget.cpp and other wxLua files // Copyright: (c) 2002 Lomtick Software. All rights reserved. // wxWidgets Socket Sample #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dservice.h" #endif [...2142 lines suppressed...] return 0; } void wxLuaDebuggee::NotifyBreakPoints(wxLuaDebugSocket* debugSocket) { wxCriticalSectionLocker locker(m_breakPointListCriticalSection); // Notify Debugger of Each BreakPoint LuaBreakPointList::Node* nodeBreakPoint; LuaBreakPointList::Node* nextBreakPoint; for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint) { nextBreakPoint = nodeBreakPoint->GetNext(); LuaBreakPoint* breakPoint = nodeBreakPoint->GetData(); m_debugService->NotifyBreakpointAdded(*breakPoint, debugSocket); } } |
|
From: John L. <jr...@us...> - 2005-11-20 20:10:57
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26275/wxLua/modules/wxluasocket/include Added Files: dservice.h Log Message: remove more dead files --- NEW FILE: dservice.h --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaDebuggerService.h // Purpose: wxLua Debuggee - App Debugging Service using wxSockets // Author: Ray Gilbert // Modified by: // Created: 2003-06-23 // RCS-ID: $Id: dservice.h,v 1.1 2005/11/20 20:10:41 jrl1 Exp $ // Copyright: (c) Ray Gilbert // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// // // Based heavily on: // wxLuaDebugTarget.cpp by J. Winwood // wxWidgets Socket Sample #ifndef WX_LUA_DEBUGGERSERVICE_H #define WX_LUA_DEBUGGERSERVICE_H #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dservice.h" #endif #include "wxlua/defs.h" #include "wx/dynarray.h" #include "wx/socket.h" #if wxCHECK_VERSION(2,3,0) #include "wx/filename.h" #else // FIXME: for wxWidgets 2.2.9 which does not implement wxFileName // This is a quick hack to test if I can compile the // lua wrapper for 2.2.9. I am not going to do anything // more for 2.2.9, but if anyone requires it, they may wish // fix and test the wxWidgets lua wrapper. RG typedef wxString wxFileName; #endif #include "wxlua/wxlua.h" #include "wxlua/internal.h" #include "wxlua/library.h" #include "wxlua/dserver.h" #define SERVER_ID 1200 #define SOCKET_ID 1201 #define SOCKET_DEBUGGER_ID 1202 #define PORT_LUADEBUG 1561 class WXDLLIMPEXP_WXLUA wxLuaDebugService; class WXDLLIMPEXP_WXLUA wxLuaDebuggee; // ---------------------------------------------------------------------------- // wxLuaDebugSocket - Handles Debugger/Debuggee IO // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebugSocket { public: wxLuaDebugSocket(const wxLuaDebugSocket& debugSocket) { m_Socket = debugSocket.m_Socket; } wxLuaDebugSocket(wxSocketBase* sock) { m_Socket = sock; } wxLuaDebugSocket() { m_Socket = NULL; } ~wxLuaDebugSocket() { if (m_Socket) { m_Socket->Destroy(); delete m_Socket; m_Socket = NULL; } } bool operator==(wxLuaDebugSocket& debugSocket) { return debugSocket.m_Socket == m_Socket; } // Client Socket wxSocketBase* GetSocket() const { return m_Socket; } void SetSocket(wxSocketBase* sock) { m_Socket = sock; } // Socket Error bool Error() { return !m_Socket || m_Socket->Error(); } // Is Socket Connected bool IsConnected() { return m_Socket && m_Socket->IsConnected(); } // Safely Destroy Socket bool Destroy() { if (m_Socket) { wxSocketBase* sock = m_Socket; m_Socket = NULL; return sock->Destroy(); } return true; } // Read Data unsigned char ReadByte(); short ReadWord(); unsigned short ReadUWord(); int ReadInt(); unsigned int ReadUInt(); long ReadLong(); unsigned long ReadULong(); wxString ReadString(); wxLuaDebugData *ReadDebugData(); // Write Data bool WriteByte(unsigned char value); bool WriteWord(short value); bool WriteUWord(unsigned short value); bool WriteInt(int value); bool WriteUInt(unsigned int value); bool WriteLong(long value); bool WriteULong(unsigned long value); bool WriteString(const wxString &value); bool WriteDebugData(const wxLuaDebugData *pSortedList); bool WaitForRead(); private: wxSocketBase* m_Socket; }; WX_DECLARE_LIST(wxLuaDebugSocket, wxLuaDebugSocketList); // ---------------------------------------------------------------------------- // LuaBreakPoint - Project BreakPoint - a filename/line pair // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA LuaBreakPoint : public wxObject { public: LuaBreakPoint(); LuaBreakPoint(const LuaBreakPoint& breakPoint) { Copy(breakPoint); } LuaBreakPoint(const wxFileName& fileName, int line, bool enabled = true); ~LuaBreakPoint() {} /// Assignment operator. void operator= (const LuaBreakPoint& data) { Copy(data); } // Filename wxFileName& GetFileName() { return m_fileName; } void SetFileName(wxFileName& fileName) { m_fileName = fileName; } // Line int GetLine() { return m_line; } void SetLine(int line) { m_line = line; } // Breakpoint Enabled int GetEnabled() { return m_enabled; } void SetEnabled(bool enable) { m_enabled = enable; } static wxString GetBreakPointKey(const wxFileName& fileName, int line) { #if wxCHECK_VERSION(2,3,0) return wxString::Format(wxT("%u:%s"), line, fileName.GetFullPath().c_str()); #else return wxString::Format(wxT("%u:%s"), line, fileName.c_str()); #endif } private: void Copy(const LuaBreakPoint& breakPoint); wxFileName m_fileName; bool m_enabled; int m_line; }; WX_DECLARE_LIST(LuaBreakPoint, LuaBreakPointList); // ---------------------------------------------------------------------------- // wxLuaDebuggee - Accepts Commands from Debugger, Redirects Lua Events to Debugger // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebuggee : public wxObject { friend class wxLuaDebugService; public: wxLuaDebuggee(wxLuaDebugService * debugService, lua_State *state); ~wxLuaDebuggee(); void AddBreakPoint(const wxFileName &fileName, int lineNumber); void RemoveBreakPoint(const wxFileName &fileName, int lineNumber); void DisableBreakPoint(const wxFileName &fileName, int lineNumber); void EnableBreakPoint(const wxFileName &fileName, int lineNumber); void InteruptWait(); void NotifyBreakPoints(wxLuaDebugSocket* debugSocket = NULL); protected: enum debugOperations { DEBUG_STEP, DEBUG_STEPOVER, DEBUG_STEPOUT, DEBUG_GO }; wxLuaDebugService* m_debugService; lua_State *m_luaState; LuaBreakPointList m_breakPointList; debugOperations m_nextOperation; bool m_forceBreak; bool m_resetRequested; bool m_fErrorsSeen; int m_nFramesUntilBreak; wxArrayInt m_references; bool m_InDebugHook; bool m_Wait; mutable wxCriticalSection m_breakPointListCriticalSection; // Do Debug Commands void ClearAllBreakPoints(); void Step(); void StepOver(); void StepOut(); void Continue(); void Break(); void Reset(); bool EnumerateStack(); bool EnumerateStackEntry(int stackRef); bool EnumerateTable(int tableRef, int nIndex, int itemNode); bool EvaluateExpr(int exprRef, const wxString &strExpr); void ClearReferences(); // Some Outputs void DisplayError(const wxString &strError); void NotifyPrint(const wxString &strMsg); // Debug Events from LuaDebugHook bool DebugHook(int event); private: bool AtBreakPoint(const wxFileName &fileName, int lineNumber) const; wxString GetTableInfo(int index); wxString GetUserDataInfo(int index, bool full = true); wxString MakeBoolean(int num); wxString MakeNumber(double dnum); wxFileName GetDebugInfo(int &lineNumber) const; // Debug Events from Lua Interpreter static void LUACALL LuaDebugHook(lua_State *state, lua_Debug *debug); static int LUACALL LuaPrint (lua_State *L); }; WX_DECLARE_LIST(wxLuaDebuggee, wxLuaDebuggeeList); // ---------------------------------------------------------------------------- // wxLuaDebugService - App Debugging Service // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebugService : public wxEvtHandler { public: wxLuaDebugService(int portNumber = PORT_LUADEBUG); ~wxLuaDebugService(); // Start Service bool StartService(); // Debug Lua Interpreter void DebugLua(lua_State* state); bool IsDebugger(); // Send Data to Debugger bool NotifyBreak(const wxFileName &fileName, int lineNumber); bool NotifyPrint(const wxString &errorMsg); bool NotifyError(const wxString &errorMsg); bool NotifyExit(); bool NotifyStackEnumeration(wxLuaDebugData *pDebugData); bool NotifyStackEntryEnumeration(int stackRef, wxLuaDebugData *pDebugData); bool NotifyTableEnumeration(int itemNode, wxLuaDebugData *pDebugData); bool NotifyEvaluateExpr(int exprRef, const wxString &strResult); bool NotifyBreakpointAdded(LuaBreakPoint& breakPoint, wxLuaDebugSocket* debugSocket = NULL); bool NotifyBreakpointRemoved(LuaBreakPoint& breakPoint, wxLuaDebugSocket* debugSocket = NULL); wxLuaDebuggee* GetActiveDebuggee(); bool WaitForRead(); protected: void OnServerEvent(wxSocketEvent& event); void OnSocketEvent(wxSocketEvent& event); void OnSocketLostEvent(wxSocketEvent& event); wxLuaDebugSocket* GetDebugSocket(wxSocketBase* sock); private: wxSocketServer* m_serverSocket; int m_portNumber; // Debuggers connected to Service mutable wxCriticalSection m_debuggerSocketListCriticalSection; wxLuaDebugSocketList m_debuggerSocketList; // Lua Interpreters Hooked by Service mutable wxCriticalSection m_debuggeeListCriticalSection; wxLuaDebuggeeList m_debuggeeList; mutable wxCriticalSection m_notifyBreakCriticalSection; DECLARE_EVENT_TABLE() }; // ---------------------------------------------------------------------------- // wxLuaDebugger - Lua Debugger Client (Client Side of Lua Debug Service) // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUA wxLuaDebugger : public wxLuaDebuggerBase { public: wxLuaDebugger(); ~wxLuaDebugger(); bool Connect(const wxString& hostname = wxT("localhost"), int portNumber = PORT_LUADEBUG); // Debugger Commands bool AddBreakPoint(const wxString &fileName, int lineNumber); bool RemoveBreakPoint(const wxString &fileName, int lineNumber); bool DisableBreakPoint(const wxString &fileName, int lineNumber); bool EnableBreakPoint(const wxString &fileName, int lineNumber); bool ClearAllBreakPoints(); bool Step(); bool StepOver(); bool StepOut(); bool Continue(); bool Break(); bool EnumerateStack(); bool Reset(); bool EnumerateStackEntry(int stackEntry); bool EnumerateTable(int tableRef, int nIndex, int nItemNode); bool CleanupDebugReferences(); protected: void OnSocketEvent(wxSocketEvent& event); void NotifyError(const wxString &msg); // Not Required for Debug Service virtual bool Run(const wxString &WXUNUSED(fileName), const wxString &WXUNUSED(buffer)) { return false; } private: mutable wxCriticalSection m_debuggerSocketCriticalSection; wxLuaDebugSocket* m_debuggerSocket; int m_portNumber; DECLARE_EVENT_TABLE() }; #endif // WX_LUA_DEBUGGERSERVICE_H |
|
From: Francesco M. <fr...@us...> - 2005-11-20 12:12:18
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8844 Modified Files: configure Log Message: fixing unix builds Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure 20 Nov 2005 11:35:17 -0000 1.1 --- configure 20 Nov 2005 12:11:48 -0000 1.2 *************** *** 6385,6389 **** fi ! ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile" cat >confcache <<\_ACEOF --- 6385,6389 ---- fi ! ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile util/Makefile" cat >confcache <<\_ACEOF *************** *** 6941,6944 **** --- 6941,6945 ---- "modules/Makefile" ) CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;; "apps/Makefile" ) CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; + "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} |
|
From: Francesco M. <fr...@us...> - 2005-11-20 12:12:18
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8844/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fixing unix builds Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.vc 20 Nov 2005 11:35:18 -0000 1.6 --- makefile.vc 20 Nov 2005 12:11:49 -0000 1.7 *************** *** 60,64 **** msvc$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj \ - msvc$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj \ msvc$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj \ --- 60,63 ---- *************** *** 526,532 **** $(CC) /c /nologo /TC /Fo$@ $(MOD_LUA_LIB_CFLAGS) $** - msvc$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj: ..\..\lua\src\ldllmain.c - $(CC) /c /nologo /TC /Fo$@ $(MOD_LUA_LIB_CFLAGS) $** - msvc$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj: ..\..\lua\src\ldo.c $(CC) /c /nologo /TC /Fo$@ $(MOD_LUA_LIB_CFLAGS) $** --- 525,528 ---- Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.bcc 20 Nov 2005 11:35:18 -0000 1.8 --- makefile.bcc 20 Nov 2005 12:11:48 -0000 1.9 *************** *** 94,98 **** borland$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj \ borland$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj \ - borland$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj \ borland$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj \ borland$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj \ --- 94,97 ---- *************** *** 543,549 **** $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** - borland$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj: ..\..\lua\src\ldllmain.c - $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** - borland$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj: ..\..\lua\src\ldo.c $(CC) -q -c -P- -o$@ $(MOD_LUA_LIB_CFLAGS) $** --- 542,545 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** makefile.wat 20 Nov 2005 11:35:18 -0000 1.6 --- makefile.wat 20 Nov 2005 12:11:49 -0000 1.7 *************** *** 328,332 **** watcom$(WXLIBPOSTFIX)\mod_lua_lib_lcode.obj & watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.obj & - watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj & watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj & watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldump.obj & --- 328,331 ---- *************** *** 647,653 **** $(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $< - watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.obj : .AUTODEPEND ..\..\lua\src\ldllmain.c - $(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $< - watcom$(WXLIBPOSTFIX)\mod_lua_lib_ldo.obj : .AUTODEPEND ..\..\lua\src\ldo.c $(CC) -bt=nt -zq -fo=$^@ $(MOD_LUA_LIB_CFLAGS) $< --- 646,649 ---- Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** makefile.gcc 20 Nov 2005 11:35:18 -0000 1.8 --- makefile.gcc 20 Nov 2005 12:11:48 -0000 1.9 *************** *** 61,65 **** mingw$(WXLIBPOSTFIX)\mod_lua_lib_lcode.o \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldebug.o \ - mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.o \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldo.o \ mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldump.o \ --- 61,64 ---- *************** *** 561,567 **** $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldllmain.o: ../../lua/src/ldllmain.c - $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\mod_lua_lib_ldo.o: ../../lua/src/ldo.c $(CC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) $(CPPDEPS) $< --- 560,563 ---- |
|
From: Francesco M. <fr...@us...> - 2005-11-20 12:12:18
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8844/modules Modified Files: Makefile.in Log Message: fixing unix builds Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 20 Nov 2005 11:35:18 -0000 1.6 --- Makefile.in 20 Nov 2005 12:11:48 -0000 1.7 *************** *** 42,46 **** mod_lua_lib_lcode.o \ mod_lua_lib_ldebug.o \ - mod_lua_lib_ldllmain.o \ mod_lua_lib_ldo.o \ mod_lua_lib_ldump.o \ --- 42,45 ---- *************** *** 324,328 **** ./../bin/lua$(EXEEXT): $(MOD_LUA_OBJECTS) ./../lib/$(LIBPREFIX)lua$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L./../lib $(LDFLAGS) -llua $(__mod_lua___mac_setfilecmd) --- 323,327 ---- ./../bin/lua$(EXEEXT): $(MOD_LUA_OBJECTS) ./../lib/$(LIBPREFIX)lua$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L./../lib $(LDFLAGS) -llua -lm $(__mod_lua___mac_setfilecmd) *************** *** 377,383 **** $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldebug.c - mod_lua_lib_ldllmain.o: ./lua/src/ldllmain.c - $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldllmain.c - mod_lua_lib_ldo.o: ./lua/src/ldo.c $(CCC) -c -o $@ $(MOD_LUA_LIB_CFLAGS) ./lua/src/ldo.c --- 376,379 ---- |
|
From: Francesco M. <fr...@us...> - 2005-11-20 12:12:18
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8844/build/autoconf Modified Files: configure.ac Log Message: fixing unix builds Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure.ac 20 Nov 2005 11:35:17 -0000 1.1 --- configure.ac 20 Nov 2005 12:11:48 -0000 1.2 *************** *** 40,44 **** AC_BAKEFILE([m4_include(autoconf_inc.m4)]) ! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile]) AC_OUTPUT --- 40,44 ---- AC_BAKEFILE([m4_include(autoconf_inc.m4)]) ! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile util/Makefile]) AC_OUTPUT |
|
From: Francesco M. <fr...@us...> - 2005-11-20 12:12:18
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8844/modules/build/bakefiles Modified Files: modules.bkl sources.bkl Log Message: fixing unix builds Index: sources.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/sources.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** sources.bkl 20 Jun 2005 09:02:57 -0000 1.4 --- sources.bkl 20 Nov 2005 12:11:48 -0000 1.5 *************** *** 19,23 **** lua/src/lcode.c lua/src/ldebug.c ! lua/src/ldllmain.c lua/src/ldo.c lua/src/ldump.c --- 19,23 ---- lua/src/lcode.c lua/src/ldebug.c ! <!-- lua/src/ldllmain.c --> lua/src/ldo.c lua/src/ldump.c Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules.bkl 20 Jun 2005 09:48:36 -0000 1.7 --- modules.bkl 20 Nov 2005 12:11:48 -0000 1.8 *************** *** 202,205 **** --- 202,209 ---- <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> <exename>lua</exename> + <if cond="TARGETING_WIN32=='0'"> + <!-- we require the standard MATH library to build the lua sources --> + <sys-lib>m</sys-lib> + </if> </exe> |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:41:47
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2090/build/bakefiles Added Files: .cvsignore Log Message: updated bakefile build system --- NEW FILE: .cvsignore --- .bakefile* |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:41:47
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2090/build/autoconf Added Files: .cvsignore Log Message: updated bakefile build system --- NEW FILE: .cvsignore --- autom4te.cache |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:41:47
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2090/modules Modified Files: .cvsignore Log Message: updated bakefile build system Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 20 Nov 2005 11:40:15 -0000 1.1 --- .cvsignore 20 Nov 2005 11:41:38 -0000 1.2 *************** *** 3,4 **** --- 3,6 ---- bk-deps *.o + *.d + .deps |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:40:24
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1944/modules Added Files: .cvsignore Log Message: updated bakefile build system --- NEW FILE: .cvsignore --- config.* Makefile bk-deps *.o |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:40:23
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1944 Added Files: .cvsignore Removed Files: autoconf_inc.m4 Log Message: updated bakefile build system --- autoconf_inc.m4 DELETED --- --- NEW FILE: .cvsignore --- config.* Makefile bk-deps *.o |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:40:23
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1944/apps Added Files: .cvsignore Log Message: updated bakefile build system --- NEW FILE: .cvsignore --- config.* Makefile bk-deps *.o |
|
From: Francesco M. <fr...@us...> - 2005-11-20 11:36:31
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1157 Added Files: aclocal.m4 wxpresets.m4 Log Message: updated bakefile build system --- NEW FILE: wxpresets.m4 --- dnl --------------------------------------------------------------------------- dnl Author: Francesco Montorsi dnl Creation date: 13/9/2005 dnl RCS-ID: $Id: wxpresets.m4,v 1.1 2005/11/20 11:36:23 frm Exp $ dnl Purpose: Some M4 macros which makes *much* easier writing the dnl configure.ac files for build system based on wxpresets dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl Macros for wxWidgets build configuration detection. dnl Typically used in configure.in/ac as: dnl dnl # basic configure checks dnl ... dnl dnl # required library checks dnl AM_WXPRESETS dnl ... dnl dnl # write the output files dnl AC_BAKEFILE([m4_incl ude(autoconf_inc.m4)]) dnl AC_CONFIG_FILES([Makefile ...]) dnl AC_OUTPUT dnl dnl # end of the configure.in script dnl AM_WXPRESETS_MSG # optional: just to show a message to the user dnl dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- dnl AM_WXFLAGS_CONTAIN / AM_WXSELECTEDCONFIG_CONTAIN ([RESULTVAR], [STRING]) dnl dnl Sets to nonzero the variable named "WX_$RESULTVAR" if the wxWidgets dnl additional CPP flags (taken from $WX_CPPFLAGS) contain the given STRING. dnl Otherwise the variable will be set to 0. dnl dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it doesn't work; dnl we'll use 'expr STRING : REGEXP' instead dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXFLAGS_CONTAIN], [ WX_$1=$(expr "$WX_CPPFLAGS" : ".*$2.*") ]) AC_DEFUN([AM_WXSELECTEDCONFIG_CONTAIN], [ WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*") ]) dnl --------------------------------------------------------------------------- dnl AM_WXFLAGS_CHECK([RESULTVAR], [STRING], [MSG] [, ACTION-IF-FOUND dnl [, ACTION-IF-NOT-FOUND]]) dnl dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets dnl additional CPP flags and put the result of the search in WX_$RESULTVAR dnl also adding the "yes" or "no" message result to MSG. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXFLAGS_CHECK], [ if test "$$1" = "wxlike" ; then dnl The user does not have particular preferences for this option; dnl so we will detect the wxWidgets relative build setting and will use it AC_MSG_CHECKING([$3]) AM_WXFLAGS_CONTAIN([$1], [$2]) if test "$WX_$1" != "0"; then WX_$1=1 AC_MSG_RESULT([yes]) ifelse([$4], , :, [$4]) else WX_$1=0 AC_MSG_RESULT([no]) ifelse([$5], , :, [$5]) fi else dnl Use the setting given by the user WX_$1=$$1 fi ]) AC_DEFUN([AM_WXSELECTEDCONFIG_CHECK], [ if test "$$1" = "wxlike" ; then dnl The user does not have particular preferences for this option; dnl so we will detect the wxWidgets relative build setting and will use it AC_MSG_CHECKING([$3]) AM_WXSELECTEDCONFIG_CONTAIN([$1], [$2]) if test "$WX_$1" != "0"; then WX_$1=1 AC_MSG_RESULT([yes]) ifelse([$4], , :, [$4]) else WX_$1=0 AC_MSG_RESULT([no]) ifelse([$5], , :, [$5]) fi else dnl Use the setting given by the user WX_$1=$$1 fi ]) dnl --------------------------------------------------------------------------- dnl AM_WXPRESETS_CHECK([minimum-wx-version], []) dnl dnl Sets the WX_UNICODE, WX_DEBUG, WX_SHARED, WX_VERSION variables to the right dnl values looking at the current $WX_CPPFLAGS variable. dnl To set the $WX_CPPFLAGS variable you need to use AM_PATH_WXCONFIG first. dnl dnl Then sets the WX_GTKPORT, WX_MOTIFPORT, WX_MACPORT, WXX11PORT, WXMGLPORT, WXMSWPORT dnl flags to 1 or 0 to match the current wxWidgets port used. dnl Also sets the WX_PORT var to one of gtk,motif,mac,x11,mgl,msw values. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXPRESETS_CHECK], [ dnl be sure that the WX_VERSION macro has the same format of the WX_VERSION option dnl which is used by wx_win32.bkl (i.e. 25, 26, 27... instead of 2.5.x, 2.6.x, 2.7.x...) wx_config_major_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` wx_config_minor_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "WX_VERSION: $WX_VERSION" fi if test $WX_VERSION -gt 26 ; then dnl The wx-config we are using understands the "--selected_config" option dnl which returns an easy-parsable string ! WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "Using wx-config --selected_config; WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" fi AM_WXSELECTEDCONFIG_CHECK([UNICODE], [unicode], [if wxWidgets was built with UNICODE enabled]) AM_WXSELECTEDCONFIG_CHECK([DEBUG], [debug], [if wxWidgets was built in DEBUG mode]) dnl we could test directly for WX_SHARED with a line like: dnl AM_WXSELECTEDCONFIG_CHECK([SHARED], [shared], [if wxWidgets was built in SHARED mode]) dnl since wx-config --selected-config outputs the 'shared' word when wx was built in shared mode. dnl However that wouldn't work since we define the '--enable-static' option and not the dnl '--enable-shared' option (just as wx does) and thus at this point we have an empty WX_SHARED dnl variable; the right variable to use is WX_STATIC which is initialized to 'wxlike' here... AM_WXSELECTEDCONFIG_CHECK([STATIC], [static], [if wxWidgets was built in STATIC mode]) if test "$WX_STATIC" != "0"; then WX_SHARED=0 else WX_SHARED=1 fi dnl checks for the wx port used WX_PORT="unknown" AM_WXSELECTEDCONFIG_CHECK([GTKPORT], [gtk], [if wxWidgets port is wxGTK], [WX_PORT="gtk"]) AM_WXSELECTEDCONFIG_CHECK([MOTIFPORT], [motif], [if wxWidgets port is wxMotif], [WX_PORT="motif"]) AM_WXSELECTEDCONFIG_CHECK([MACPORT], [mac], [if wxWidgets port is wxMac], [WX_PORT="mac"]) AM_WXSELECTEDCONFIG_CHECK([X11PORT], [x11], [if wxWidgets port is wxX11], [WX_PORT="x11"]) AM_WXSELECTEDCONFIG_CHECK([MGLPORT], [mgl], [if wxWidgets port is wxMGL], [WX_PORT="mgl"]) AM_WXSELECTEDCONFIG_CHECK([MSWPORT], [msw], [if wxWidgets port is wxMSW], [WX_PORT="msw"]) dnl in case we are using wxGTK check if we are using GTK 1.x or GTK 2.x; dnl the user will be able to find the result of the check in the $WX_GTKPORT_VERSION variable if test "$WX_PORT" = "gtk"; then TEMP=wxlike AM_WXSELECTEDCONFIG_CHECK([TEMP], [gtk2], [if wxGTK uses GTK 2.x (instead of GTK 1.x)], [WX_GTKPORT_VERSION=2], [WX_GTKPORT_VERSION=1]) fi else dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "Using WX_CPPFLAGS: $WX_CPPFLAGS" fi dnl Before wx2.6.2, wx-config did not have the "--selected_config" option... dnl thus we need to extract the info we need from $WX_CPPFLAGS... AM_WXFLAGS_CHECK([UNICODE], [unicode], [if wxWidgets was built with UNICODE enabled]) AM_WXFLAGS_CHECK([DEBUG], [__WXDEBUG__], [if wxWidgets was built in DEBUG mode]) AM_WXFLAGS_CHECK([STATIC], [static], [if wxWidgets was built in STATIC mode]) if test "$WX_STATIC" != "0"; then WX_SHARED=0 else WX_SHARED=1 fi dnl checks for the wx port used WX_PORT="unknown" AM_WXFLAGS_CHECK([GTKPORT], [__WXGTK__], [if wxWidgets port is wxGTK], [WX_PORT="gtk"]) AM_WXFLAGS_CHECK([MOTIFPORT], [__WXMOTIF__], [if wxWidgets port is wxMotif], [WX_PORT="motif"]) AM_WXFLAGS_CHECK([MACPORT], [__WXMAC__], [if wxWidgets port is wxMac], [WX_PORT="mac"]) AM_WXFLAGS_CHECK([X11PORT], [__WXX11__], [if wxWidgets port is wxX11], [WX_PORT="x11"]) AM_WXFLAGS_CHECK([MGLPORT], [__WXMGL__], [if wxWidgets port is wxMGL], [WX_PORT="mgl"]) AM_WXFLAGS_CHECK([MSWPORT], [__WXMSW__], [if wxWidgets port is wxMSW], [WX_PORT="msw"]) dnl in case we are using wxGTK check if we are using GTK 1.x or GTK 2.x; dnl the user will be able to find the result of the check in the $WX_GTKPORT_VERSION variable if test "$WX_PORT" = "gtk"; then TEMP=wxlike AM_WXFLAGS_CHECK([TEMP], [gtk2], [if wxGTK uses GTK 2.x (instead of GTK 1.x)], [WX_GTKPORT_VERSION=2], [WX_GTKPORT_VERSION=1]) fi fi dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "WX_SHARED: $WX_SHARED, WX_DEBUG: $WX_DEBUG, WX_UNICODE: $WX_UNICODE" echo "WX_GTKPORT: $WX_GTKPORT, WX_MOTIFPORT: $WX_MOTIFPORT, WX_MACPORT: $WX_MACPORT, " echo "WX_X11PORT: $WX_X11PORT, WX_MGLPORT: $WX_MGLPORT, WX_MSWPORT: $WX_MSWPORT" echo "WX_PORT: $WX_PORT" echo "WX_GTKPORT_VERSION: $WX_GTKPORT_VERSION" fi dnl nice way to check: dnl - that only one of the WX_*PORT variables has been set to 1 dnl - at least one of the WX_*PORT has been set ! if test "$WX_PORT" = "unknown" -a "$PORT" = "wxlike" ; then AC_MSG_ERROR([ Cannot detect the currently installed wxWidgets port ! Check your 'wx-config --cxxflags'... ]) fi checksum="$(expr $WX_GTKPORT + $WX_MOTIFPORT + $WX_MACPORT + $WX_X11PORT + $WX_MGLPORT + $WX_MSWPORT)" if test "$checksum" = "0" ; then AC_MSG_ERROR([ Cannot detect the currently installed wxWidgets port ! Check your 'wx-config --cxxflags'... ]) fi if test "$checksum" != "1" ; then AC_MSG_ERROR([ Your 'wx-config --cxxflags' command seems to define more than one port symbol... check your wxWidgets installation (the 'wx-config --list' command may help). ]) fi ]) dnl --------------------------------------------------------------------------- dnl AM_WXPRESETS_MSG dnl dnl Shows a summary message to the user about the WX_* variable contents. dnl This macro is used typically at the end of the configure script. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXPRESETS_MSG], [ if test "$WX_DEBUG" = "1" ; then echo " - DEBUG build" elif test "$WX_DEBUG" = "0" ; then echo " - RELEASE build" else echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi if test "$WX_UNICODE" = "1" ; then echo " - UNICODE mode" elif test "$WX_UNICODE" = "0" ; then echo " - ANSI mode" else echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi if test "$WX_SHARED" = "1" ; then echo " - SHARED mode" elif test "$WX_SHARED" = "0" ; then echo " - STATIC mode" else echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi echo " - VERSION: $WX_VERSION" if test "$WX_PORT" = "gtk"; then if test "$WX_GTKPORT_VERSION" = "1"; then echo " - PORT: gtk (with GTK+ 1.x)" elif test "$WX_GTKPORT_VERSION" = "2" ; then echo " - PORT: gtk (with GTK+ 2.x)" else echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi else echo " - PORT: $WX_PORT" fi ]) dnl --------------------------------------------------------------------------- dnl WX_ARG_ENABLE/WX_ARG_WITH dnl dnl Two little custom macros which define the ENABLE/WITH configure arguments. dnl Macro arguments: dnl $1 = the name of the --enable / --with feature dnl $2 = the name of the variable associated dnl $3 = the description of that feature dnl $4 = the default value for that feature dnl $5 = additional action to do in case option is given with "yes" value dnl --------------------------------------------------------------------------- AC_DEFUN([WX_ARG_ENABLE], [AC_ARG_ENABLE($1, AC_HELP_STRING([--enable-$1], [$3 (default is $4)]), [], [enableval="$4"]) dnl Show a message to the user about this option AC_MSG_CHECKING([for the --enable-$1 option]) if test "$enableval" = "yes" ; then AC_MSG_RESULT([yes]) $2=1 $5 elif test "$enableval" = "no" ; then AC_MSG_RESULT([no]) $2=0 elif test "$enableval" = "wxlike" ; then AC_MSG_RESULT([will be detected from wxWidgets]) $2="wxlike" else AC_MSG_ERROR([unrecognized option value (allowed values: yes, no, wxlike) !]) fi ]) AC_DEFUN([WX_ARG_WITH], [AC_ARG_WITH($1, AC_HELP_STRING([--with-$1], [$3 (default is $4)]), [], [withval="$4"]) dnl Show a message to the user about this option AC_MSG_CHECKING([for the --with-$1 option]) if test "$withval" = "yes" ; then AC_MSG_RESULT([yes]) $2=1 $5 dnl NB: we don't allow --with-gtk=no option since it does not make much sense ! dnl elif test "$withval" = "no" ; then dnl AC_MSG_RESULT([no]) dnl $2=0 elif test "$withval" = "wxlike" ; then AC_MSG_RESULT([will be detected from wxWidgets]) $2="wxlike" else AC_MSG_ERROR([unrecognized option value (allowed values: yes, wxlike) !]) fi ]) dnl --------------------------------------------------------------------------- dnl AM_OPTIONS_WXPRESETS dnl dnl Gives to the configure script the following options: dnl --enable-static dnl --enable-debug dnl --enable-unicode dnl checks for their presence and eventually set the SHARED,DEBUG,UNICODE dnl variables accordingly. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_OPTIONS_WXPRESETS], [ dnl The default values (and also option names) are the same of wx's ones WX_ARG_ENABLE([static], [STATIC], [Builds in static mode], [wxlike]) WX_ARG_ENABLE([unicode], [UNICODE], [Builds in unicode mode], [wxlike]) WX_ARG_ENABLE([debug], [DEBUG], [Builds in debug mode], [wxlike]) PORT="wxlike" WX_ARG_WITH([motif], [MOTIFPORT], [Uses the wxMotif port], [wxlike], [PORT="motif"]) WX_ARG_WITH([gtk], [GTKPORT], [Uses the wxGTK port], [wxlike], [PORT="gtk"]) WX_ARG_WITH([x11], [X11PORT], [Uses the wxX11 port], [wxlike], [PORT="x11"]) WX_ARG_WITH([mac], [MACPORT], [Uses the wxMac port], [wxlike], [PORT="mac"]) WX_ARG_WITH([mgl], [MGLPORT], [Uses the wxMGL port], [wxlike], [PORT="mgl"]) dnl In case we are on Cygwin ! WX_ARG_WITH([msw], [MSWPORT], [Uses the wxMSW port], [wxlike], [PORT="msw"]) dnl nice way to check: dnl - that only one of the *PORT variables has been set to 1 dnl - at least one of the *PORT has been set ! dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "STATIC: $STATIC, DEBUG: $DEBUG, UNICODE: $UNICODE, PORT: $PORT" echo "GTKPORT: $GTKPORT, X11PORT: $X11PORT, MACPORT: $MACPORT, MOTIFPORT: $MOTIFPORT, MGLPORT: $MGLPORT" echo "PORT: $PORT" fi ]) dnl --------------------------------------------------------------------------- dnl AM_CONVERT_WXPRESETS_OPTIONS_TO_WXCONFIG_FLAGS dnl dnl Sets the WXCFG_FLAGS string using the SHARED,DEBUG,UNICODE variable values dnl which are different from "wxlike" dnl --------------------------------------------------------------------------- AC_DEFUN([AM_CONVERT_WXPRESETS_OPTIONS_TO_WXCONFIG_FLAGS], [ dnl The space at the end of the WXCFG_FLAGS is important; do not remove ! if test "$STATIC" = "1" ; then WXCFG_FLAGS="--static=yes " elif test "$STATIC" = "0" ; then WXCFG_FLAGS="--static=no " fi if test "$DEBUG" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--debug=yes " elif test "$DEBUG" = "0" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--debug=no " fi if test "$UNICODE" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--unicode=yes " elif test "$UNICODE" = "0" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--unicode=no " fi if test "$GTKPORT" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--toolkit=gtk2 " elif test "$MOTIFPORT" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--toolkit=motif " elif test "$X11PORT" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--toolkit=x11 " elif test "$MACPORT" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--toolkit=mac " elif test "$MGLPORT" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--toolkit=mgl " elif test "$MSWPORT" = "1" ; then WXCFG_FLAGS="$WXCFG_FLAGS""--toolkit=msw " fi dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "WXCFG_FLAGS: $WXCFG_FLAGS" fi ]) dnl --------------------------------------------------------------------------- dnl AM_WXPRESETS([minimum-wx-version], [addwxlibraries]) dnl dnl where "addwxlibraries" are those wxWidgets libraries (when wx is built dnl in multilib mode) required by the program to link (e.g. xml,xrc,net,odbc,etc); dnl the core & base libraries are included by default. dnl dnl Just a convenience macro for dnl AM_OPTIONS_WXCONFIG dnl AM_PATH_WXCONFIG([minimum-wx-version], [], [], [addwxlibraries]) dnl AM_WXPRESETS_CHECK dnl macros. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXPRESETS], [ dnl From --enable-* options set by AM_OPTIONS_WXPRESETS, create the dnl WXCFG_FLAGS string to give to wx-config AM_CONVERT_WXPRESETS_OPTIONS_TO_WXCONFIG_FLAGS AM_PATH_WXCONFIG([$1], [wxWin=1], [wxWin=0], [$2,core,base], [$WXCFG_FLAGS]) if test "$wxWin" != 1; then AC_MSG_ERROR([ The requested wxWidgets build couldn't be found. Try to use the default build of wxWidgets (try the command 'wx-config --list'); i.e. leave the --enable-unicode, --enable-static, --enable-debug and --with-* options to their default values. If you still get this error, then check that 'wx-config' is in path, the directory where wxWidgets libraries are installed (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH or equivalent variable and wxWidgets version is $1 or above. ]) else dnl do not update CPPFLAGS nor CXXFLAGS doing something like: dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS" dnl otherwise we'll get the dnl same settings repetead three times since wxpresets generate a dnl Makefile.in which merges these two variables with $WX_CPPFLAGS dnl automatically... dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" dnl LIBS="$LIBS $WX_LIBS" dnl FOR DEBUG ONLY if test "$DBG_CONFIGURE" = "1"; then echo "WX_LIBS: $WX_LIBS" fi fi dnl Synch our WX_DEBUG,WX_UNICODE,WX_SHARED variables with wx ones AM_WXPRESETS_CHECK ]) dnl --------------------------------------------------------------------------- dnl AM_WXPRESETS_FULL([minimum-wx-version], [addwxlibraries]) dnl dnl Like AM_WXPRESETS but this macro also does those standard checks dnl to recognize the system and the installed utility programs dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXPRESETS_FULL], [ dnl This allows us to use Bakefile, recognizing the system type dnl (and sets the AC_CANONICAL_BUILD, AC_CANONICAL_HOST and dnl AC_CANONICAL_TARGET variables) AC_CANONICAL_SYSTEM dnl we set these vars to avoid that the AC_PROG_C* macros add the "-g -O2" flags; dnl we will add them later, if needed CFLAGS= CXXFLAGS= CPPFLAGS= dnl Checks for basic programs used to compile/install. AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_RANLIB AC_PROG_CC AC_PROG_CXX AC_PROG_CXXCPP dnl check for wxWidgets library and initialization of WX_* variables AM_WXPRESETS([$1], [$2]) dnl add the optimize/debug flags dnl FIXME: unsure if these are right also for compilers other than GCC dnl NOTE1: these checks must be put after AM_WXPRESETS (which sets the $WX_* variables)... dnl NOTE2: the CXXFLAGS are merged together with the CPPFLAGS so we don't need to set them, too if [[ "$WX_DEBUG" = "1" ]]; then dnl NOTE: the -Wundef and -Wno-ctor-dtor-privacy are not enabled automatically by -Wall CPPFLAGS="$CPPFLAGS -g -O0 -Wall -Wundef -Wno-ctor-dtor-privacy" CFLAGS="$CFLAGS -g -O0 -Wall -Wundef" else CPPFLAGS="$CPPFLAGS -O2" CFLAGS="$CFLAGS -O2" fi ]) dnl --------------------------------------------------------------------------- dnl AM_WXPRESETS_MSG_BEGIN dnl dnl Like AM_WXPRESETS_MSG but this macro also gives info about the configuration dnl of the package which used the wxpresets. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXPRESETS_MSG_BEGIN], [ echo echo " ----------------------------------------------------------------" echo " Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed." echo " Summary of main configuration settings for $PACKAGE_NAME:" if [[ "$WX_DEBUG" = "1" ]]; then echo " - DEBUG build" else echo " - RELEASE build" fi if [[ "$WX_UNICODE" = "1" ]]; then echo " - UNICODE mode" else echo " - ANSI mode" fi if [[ "$WX_SHARED" = "1" ]]; then echo " - SHARED mode" else echo " - STATIC mode" fi ]) dnl --------------------------------------------------------------------------- dnl AM_WXPRESETS_MSG_END dnl dnl Like AM_WXPRESETS_MSG but this macro also gives info about the configuration dnl of the package which used the wxpresets. dnl --------------------------------------------------------------------------- AC_DEFUN([AM_WXPRESETS_MSG_END], [ echo echo " The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION" echo " has the following settings:" AM_WXPRESETS_MSG echo echo " Now, just run make." echo " ----------------------------------------------------------------" echo ]) --- NEW FILE: aclocal.m4 --- # generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY, to the extent permitted by law; without # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. dnl --------------------------------------------------------------------------- dnl Support macros for makefiles generated by BAKEFILE. dnl --------------------------------------------------------------------------- dnl Lots of compiler & linker detection code contained here was taken from dnl wxWindows configure.in script (see http://www.wxwindows.org) [...1817 lines suppressed...] if test "x$WXRC" = x ; then dnl wx-config --utility is a new addition to wxWidgets: _WX_PRIVATE_CHECK_VERSION(2,5,3) if test -n "$wx_ver_ok"; then WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc` fi fi if test "x$WXRC" = x ; then AC_MSG_RESULT([not found]) ifelse([$2], , :, [$2]) else AC_MSG_RESULT([$WXRC]) ifelse([$1], , :, [$1]) fi AC_SUBST(WXRC) fi ]) |
