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...> - 2007-01-08 04:41:39
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24033/samples Modified Files: editor.wx.lua Log Message: Applied most of patch 1622013 except combining start debug and continue, default font changes for MSW Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** editor.wx.lua 3 Jan 2007 23:14:41 -0000 1.42 --- editor.wx.lua 8 Jan 2007 04:41:33 -0000 1.43 *************** *** 11,15 **** function iff(cond, a, b) if cond then return a else return b end end ! -- Does the num has all the bits in value function HasBit(value, num) for n = 32, 0, -1 do --- 11,15 ---- function iff(cond, a, b) if cond then return a else return b end end ! -- Does the num have all the bits in value function HasBit(value, num) [...1069 lines suppressed...] --- 2151,2169 ---- end) + frame:Connect(ID_SHOWHIDEWINDOW, wx.wxEVT_COMMAND_MENU_SELECTED, + function (event) + if splitter:IsSplit() then + splitter:Unsplit() + else + local x, y = frame:GetClientSize() + splitter:SplitHorizontally(notebook, errorLog, (2 * y) / 3) + end + end) + + frame:Connect(ID_USECONSOLE, wx.wxEVT_COMMAND_MENU_SELECTED, + function (event) + menuBar:Check(ID_USECONSOLE, menuBar:IsChecked(ID_USECONSOLE)) + end) + -- --------------------------------------------------------------------------- -- Create the Help menu and attach the callback functions |
|
From: John L. <jr...@us...> - 2007-01-04 23:28:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7567/wxLua/bindings/wxwidgets Modified Files: gdi.i Log Message: wxDisplay::GetClientSize not in 2.6 a little speedup in wxluasudoku.wx.lua Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** gdi.i 23 Dec 2006 06:16:19 -0000 1.35 --- gdi.i 4 Jan 2007 23:28:04 -0000 1.36 *************** *** 1331,1338 **** %static int GetFromWindow(wxWindow* win) wxRect GetGeometry() const ! wxRect GetClientArea() const wxArrayVideoModes GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const wxString GetName() const ! bool IsOk() const bool IsPrimary() %endclass --- 1331,1338 ---- %static int GetFromWindow(wxWindow* win) wxRect GetGeometry() const ! %wxchkver_2_8 wxRect GetClientArea() const wxArrayVideoModes GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const wxString GetName() const ! bool IsOk() const bool IsPrimary() %endclass |
|
From: John L. <jr...@us...> - 2007-01-04 23:28:10
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7567/wxLua/modules/wxbind/src Modified Files: gdi.cpp Log Message: wxDisplay::GetClientSize not in 2.6 a little speedup in wxluasudoku.wx.lua Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** gdi.cpp 23 Dec 2006 06:16:20 -0000 1.42 --- gdi.cpp 4 Jan 2007 23:28:04 -0000 1.43 *************** *** 11230,11233 **** --- 11230,11256 ---- + #if (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetClientArea[] = { 0 }; + // %wxchkver_2_8 wxRect GetClientArea() const + static int LUACALL wxLua_wxDisplay_GetClientArea(lua_State *L) + { + wxLuaState wxlState(L); + wxRect *returns; + // get this + wxDisplay * self = (wxDisplay *)wxlState.GetUserDataType(1, s_wxluatag_wxDisplay); + // call GetClientArea + // allocate a new object using the copy constructor + returns = new wxRect(self->GetClientArea()); + // add the new object to the tracked memory list + wxLua_AddTrackedObject(wxlState, (wxRect *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxRect, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetFromPoint[] = { &s_wxluatag_wxPoint, 0 }; *************** *** 11266,11288 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetClientArea[] = { 0 }; - // wxRect GetClientArea() const - static int LUACALL wxLua_wxDisplay_GetClientArea(lua_State *L) - { - wxLuaState wxlState(L); - wxRect *returns; - // get this - wxDisplay * self = (wxDisplay *)wxlState.GetUserDataType(1, s_wxluatag_wxDisplay); - // call GetClientArea - // allocate a new object using the copy constructor - returns = new wxRect(self->GetClientArea()); - // add the new object to the tracked memory list - wxLua_AddTrackedObject(wxlState, (wxRect *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxRect, returns); - - return 1; - } - #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) --- 11289,11292 ---- *************** *** 11414,11418 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_IsOk[] = { 0 }; ! // bool IsOk() const static int LUACALL wxLua_wxDisplay_IsOk(lua_State *L) { --- 11418,11422 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_IsOk[] = { 0 }; ! // bool IsOk() const static int LUACALL wxLua_wxDisplay_IsOk(lua_State *L) { *************** *** 11457,11464 **** WXLUAMETHOD wxDisplay_methods[] = { #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) { LuaMethod, "GetFromPoint", wxLua_wxDisplay_GetFromPoint, 1, 1, s_wxluatagArray_wxLua_wxDisplay_GetFromPoint }, { LuaMethod, "GetGeometry", wxLua_wxDisplay_GetGeometry, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetGeometry }, - { LuaMethod, "GetClientArea", wxLua_wxDisplay_GetClientArea, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetClientArea }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) --- 11461,11472 ---- WXLUAMETHOD wxDisplay_methods[] = { + #if (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)) + { LuaMethod, "GetClientArea", wxLua_wxDisplay_GetClientArea, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetClientArea }, + #endif // (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) { LuaMethod, "GetFromPoint", wxLua_wxDisplay_GetFromPoint, 1, 1, s_wxluatagArray_wxLua_wxDisplay_GetFromPoint }, { LuaMethod, "GetGeometry", wxLua_wxDisplay_GetGeometry, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetGeometry }, #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) |
|
From: John L. <jr...@us...> - 2007-01-04 23:28:10
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7567/wxLua/bindings Modified Files: genwxbind.bat Log Message: wxDisplay::GetClientSize not in 2.6 a little speedup in wxluasudoku.wx.lua Index: genwxbind.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** genwxbind.bat 13 Dec 2006 00:27:56 -0000 1.8 --- genwxbind.bat 4 Jan 2007 23:28:03 -0000 1.9 *************** *** 25,35 **** echo Generating wxWidgets Binding ! %LUA% -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets\error.txt echo Generating wxStyledTextCtrl Binding ! %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt echo Generating wxLuaDebugger Binding ! %LUA% -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket\error.txt echo Generating wxLuaCan app Binding --- 25,35 ---- echo Generating wxWidgets Binding ! %LUA% -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets_error.txt echo Generating wxStyledTextCtrl Binding ! %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc_error.txt echo Generating wxLuaDebugger Binding ! %LUA% -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket_error.txt echo Generating wxLuaCan app Binding |
|
From: John L. <jr...@us...> - 2007-01-04 23:28:10
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7567/wxLua/samples Modified Files: wxluasudoku.wx.lua Log Message: wxDisplay::GetClientSize not in 2.6 a little speedup in wxluasudoku.wx.lua Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** wxluasudoku.wx.lua 21 Dec 2006 20:14:21 -0000 1.60 --- wxluasudoku.wx.lua 4 Jan 2007 23:28:05 -0000 1.61 *************** *** 640,649 **** function sudoku.RemovePossibleAll(row, col, value, sudokuTable, exceptTable, break_if_empty) exceptTable = exceptTable or {} ! local cell local block_cell = sudoku.BlockToCell(sudoku.RowColToBlock(row, col)) - break_empty = break_empty or false for rcb = 1, 9 do ! cell = sudoku.RowColToCell(rcb, col) if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then sudokuTable.possible[cell][value] = nil --- 640,648 ---- function sudoku.RemovePossibleAll(row, col, value, sudokuTable, exceptTable, break_if_empty) exceptTable = exceptTable or {} ! break_if_empty = break_if_empty or false local block_cell = sudoku.BlockToCell(sudoku.RowColToBlock(row, col)) for rcb = 1, 9 do ! local cell = sudoku.RowColToCell(rcb, col) if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then sudokuTable.possible[cell][value] = nil *************** *** 1297,1304 **** while cell <= 81 do if not sudoku.HasCellValue(cell, s) then - local row, col = sudoku.CellToRowCol(cell) local possible = sudoku.GetCellPossible(cell, s) ! --for k, v in pairs(possible) do for n = 1, 9 do local k = n --- 1296,1302 ---- while cell <= 81 do if not sudoku.HasCellValue(cell, s) then local possible = sudoku.GetCellPossible(cell, s) ! --for k, v in pairs(possible) do -- use for loop to ensure direction for n = 1, 9 do local k = n *************** *** 1308,1316 **** s = sudoku.RemoveCellPossible(cell, k, s) local s1 = TableCopy(s) -- don't use SetValue since we only care about possible s1.values[cell] = k --sudoku.SetValue(row, col, k, s1) ! ! -- start a new table and test out this guess w/ new table s1 = sudoku.RemovePossibleAll(row, col, k, s1, nil, true) --- 1306,1314 ---- s = sudoku.RemoveCellPossible(cell, k, s) + -- start a new table and test out this guess local s1 = TableCopy(s) -- don't use SetValue since we only care about possible s1.values[cell] = k --sudoku.SetValue(row, col, k, s1) ! local row, col = sudoku.CellToRowCol(cell) s1 = sudoku.RemovePossibleAll(row, col, k, s1, nil, true) *************** *** 1318,1321 **** --- 1316,1320 ---- guesses.current = guesses.current + 1 + -- check for nil return from RemovePossibleAll for break_if_empty if s1 then s1, g = sudoku.DoSolveBruteForce(sudokuTable, backwards, s1, guesses, cell+1) |
|
From: Francesco M. <fr...@us...> - 2007-01-03 23:14:44
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10127 Modified Files: editor.wx.lua Log Message: reverted change erraneously committed Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** editor.wx.lua 3 Jan 2007 23:10:02 -0000 1.41 --- editor.wx.lua 3 Jan 2007 23:14:41 -0000 1.42 *************** *** 1,2271 **** ! -------------------------------------------------------------------------=--- ! -- Name: Editor.wx.lua ! -- Purpose: wxLua IDE ! -- Author: J Winwood ! -- Created: March 2002 ! -- Copyright: (c) 2002-5 Lomtick Software. All rights reserved. ! -- Licence: wxWidgets licence ! -------------------------------------------------------------------------=--- ! ! -- Equivalent to C's "cond ? a : b", all terms will be evaluated [...4340 lines suppressed...] ! for index = 1, #arg do ! fileName = arg[index] ! if fileName ~= "--" then ! LoadFile(fileName, nil, true) ! end ! end ! ! if notebook:GetPageCount() > 0 then ! notebook:SetSelection(0) ! else ! local editor = CreateEditor("untitled.lua") ! SetupKeywords(editor, true) ! end ! else ! local editor = CreateEditor("untitled.lua") ! SetupKeywords(editor, true) ! end ! ! --frame:SetIcon(wxLuaEditorIcon) --FIXME add this back ! frame:Show(true) |
|
From: Francesco M. <fr...@us...> - 2007-01-03 23:10:09
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7944/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: added check for OpenGL libraries Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** aclocal.m4 24 Dec 2006 13:30:56 -0000 1.38 --- aclocal.m4 3 Jan 2007 23:10:02 -0000 1.39 *************** *** 1723,1725 **** ]) ! m4_include([../../wxwin.m4]) --- 1723,1725 ---- ]) ! m4_include([wxwin.m4]) Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** configure.ac 24 Dec 2006 13:30:56 -0000 1.38 --- configure.ac 3 Jan 2007 23:10:02 -0000 1.39 *************** *** 317,321 **** # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol # to get rid of this check which fails for some reason when building the AP ! if [[ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]]; then minversion="1.2.4" --- 317,321 ---- # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol # to get rid of this check which fails for some reason when building the AP ! if [[[ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]]]; then minversion="1.2.4" *************** *** 345,348 **** --- 345,409 ---- + dnl --------------------------------------------------------------------------- + dnl WX_CHECK_FOR_GL( + dnl [action if found], + dnl [action if not found]) + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_CHECK_FOR_GL], + [ + dnl save original flags into support variables + AM_SAVE_COREVAR() + + dnl add to the compilation & link flags the wxWidgets flags + dnl + dnl NOTE: this is very important since the test program + dnl we will compile needs to be linked against wx + dnl and the configure script will use these *FLAGS + dnl variables and it cannot be told to use other flags. + dnl + dnl NOTE2: we don't want to put into *FLAGS variables the + dnl WX_* variable values since the Makefile.in for + dnl a wxpresets-based application already merges + dnl the *FLAGS contents with WX_* vars + dnl + dnl NOTE3: the CXXFLAGS are merged with CPPFLAGS and + dnl thus we don't need to add the WX_CPPFLAGS to both + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + dnl before WX_LIBS we want the lib of STC + OLD_WXLIBS=$WX_LIBS + AM_PREPEND_WXLIKE_LIB([gl]) + LIBS="$LIBS $WX_LIBS" + + dnl check for this component presence + AC_MSG_CHECKING([if wxWidgets OpenGL bindings are available]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([#include <wx/glcanvas.h>], + [wxGLContext dummy(NULL);]) + ], + [WXGL_PRESENCE=1], [WXGL_PRESENCE=0]) + + if test "$WXGL_PRESENCE" = "1"; then + AC_MSG_RESULT([yes]) + $1 + else + AC_MSG_RESULT([no]) + $2 + fi + + dnl restore the original flags + WX_LIBS=$OLD_WXLIBS + AM_RESTORE_COREVAR() + ]) + + WX_CHECK_FOR_GL + if test "$WXGL_PRESENCE" = "1"; then + # let's add OpenGL binding library to the libraries to link + # so that if the user wants to use wxLua bindings to wxOpenGL he + # won't have linking errors + AM_PREPEND_WXLIKE_LIB([gl]) + fi + |
|
From: Francesco M. <fr...@us...> - 2007-01-03 23:10:06
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7944/samples Modified Files: editor.wx.lua Log Message: added check for OpenGL libraries Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** editor.wx.lua 13 Dec 2006 06:57:50 -0000 1.40 --- editor.wx.lua 3 Jan 2007 23:10:02 -0000 1.41 *************** *** 1,2098 **** ! -------------------------------------------------------------------------=--- ! -- Name: Editor.wx.lua ! -- Purpose: wxLua IDE ! -- Author: J Winwood ! -- Created: March 2002 ! -- Copyright: (c) 2002-5 Lomtick Software. All rights reserved. ! -- Licence: wxWidgets licence ! -------------------------------------------------------------------------=--- ! ! -- Equivalent to C's "cond ? a : b", all terms will be evaluated [...4340 lines suppressed...] ! local hide = visible and folded ! if show then editor:ShowLines(1, editor.LineCount-1) end ! for ln = 1, editor.LineCount - 1 do ! local foldRaw = editor:GetFoldLevel(ln) ! local foldLvl = math.mod(foldRaw, 4096) ! local foldHdr = math.mod(math.floor(foldRaw / 8192), 2) == 1 ! if show then ! if foldHdr then ! if not editor:GetFoldExpanded(ln) then editor:ToggleFold(ln) end ! end ! elseif hide and foldLvl == wx.wxSTC_FOLDLEVELBASE then if not foldHdr then editor:HideLines(ln, ln) end ! elseif foldHdr then ! if editor:GetFoldExpanded(ln) then editor:ToggleFold(ln) end ! end ! end ! editor:EnsureCaretVisible() ! end ! ! |
|
From: Francesco M. <fr...@us...> - 2007-01-03 23:10:06
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7944 Modified Files: configure Log Message: added check for OpenGL libraries Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** configure 24 Dec 2006 13:30:55 -0000 1.47 --- configure 3 Jan 2007 23:10:00 -0000 1.48 *************** *** 7153,7157 **** # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol # to get rid of this check which fails for some reason when building the AP ! if [ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]; then minversion="1.2.4" --- 7153,7157 ---- # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol # to get rid of this check which fails for some reason when building the AP ! if [[ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]]; then minversion="1.2.4" *************** *** 7351,7354 **** --- 7351,7464 ---- + + + SAVED_CPPFLAGS="$CPPFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" + SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + + + CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" + CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + + OLD_WXLIBS=$WX_LIBS + + WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS gl,$WX_ADDITIONAL_LIBS --libs)" + + LIBS="$LIBS $WX_LIBS" + + { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5 + echo $ECHO_N "checking if wxWidgets OpenGL bindings are available... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + #include <wx/glcanvas.h> + int + main () + { + wxGLContext dummy(NULL); + ; + return 0; + } + + _ACEOF + rm -f conftest.$ac_objext conftest$ac_exeext + if { (ac_try="$ac_link" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + WXGL_PRESENCE=1 + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + WXGL_PRESENCE=0 + fi + + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + + if test "$WXGL_PRESENCE" = "1"; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + + else + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + + fi + + WX_LIBS=$OLD_WXLIBS + + CPPFLAGS="$SAVED_CPPFLAGS" + CXXFLAGS="$SAVED_CXXFLAGS" + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS" + + + if test "$WXGL_PRESENCE" = "1"; then + # let's add OpenGL binding library to the libraries to link + # so that if the user wants to use wxLua bindings to wxOpenGL he + # won't have linking errors + + WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS gl,$WX_ADDITIONAL_LIBS --libs)" + + fi + + + # Produce some useful info for pkg-config: |
|
From: Francesco M. <fr...@us...> - 2006-12-27 10:57:40
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv22490 Modified Files: Makefile.in Log Message: fixed path in SetFile calls Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** Makefile.in 26 Dec 2006 11:00:49 -0000 1.54 --- Makefile.in 27 Dec 2006 10:57:36 -0000 1.55 *************** *** 100,104 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_builddir)/bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxlua$(EXEEXT) COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ --- 100,104 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_builddir)/bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -a C $(top_builddir)/bin/wxlua$(EXEEXT) COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ *************** *** 122,126 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C wxluaedit$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL \ -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ --- 122,127 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL \ -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ *************** *** 143,147 **** @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxluacan$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -i \ --- 144,148 ---- @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -a C $(top_builddir)/bin/wxluacan$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -i \ *************** *** 164,168 **** @COND_USE_WXLUAFREEZEAPP_1@ = $(top_builddir)/bin/wxluafreeze$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C wxluafreeze$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd = $(REZ) -d __DARWIN__ -t \ APPL -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ --- 165,170 ---- @COND_USE_WXLUAFREEZEAPP_1@ = $(top_builddir)/bin/wxluafreeze$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluafreeze$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd = $(REZ) -d __DARWIN__ -t \ APPL -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ |
|
From: Francesco M. <fr...@us...> - 2006-12-26 11:00:53
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14623/apps Modified Files: Makefile.in Log Message: make the mac bundles only when the relative targets are built Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** Makefile.in 24 Dec 2006 13:30:55 -0000 1.53 --- Makefile.in 26 Dec 2006 11:00:49 -0000 1.54 *************** *** 114,117 **** --- 114,120 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ uninstall_app_wxlua @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o + @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__wxLua_app_Contents_PkgInfo___depname \ + @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ + @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ wxLua.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ *************** *** 133,136 **** --- 136,141 ---- @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o + @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__wxLuaEdit_app_Contents_PkgInfo___depname \ + @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = wxLuaEdit.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle *************** *** 151,154 **** --- 156,161 ---- @COND_USE_WXLUACANAPP_1@__uninstall_app_wxluacan___depname \ @COND_USE_WXLUACANAPP_1@ = uninstall_app_wxluacan + @COND_USE_WXLUACANAPP_1@__wxLuaCan_app_Contents_PkgInfo___depname \ + @COND_USE_WXLUACANAPP_1@ = wxLuaCan.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__app_wxluacan_bundle___depname \ @COND_PLATFORM_MACOSX_1@ = app_wxluacan_bundle *************** *** 172,175 **** --- 179,184 ---- @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o + @COND_USE_WXLUAFREEZEAPP_1@__wxLuaFreeze_app_Contents_PkgInfo___depname \ + @COND_USE_WXLUAFREEZEAPP_1@ = wxLuaFreeze.app/Contents/PkgInfo @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle *************** *** 231,255 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! wxLua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLua.app/Contents ! mkdir -p wxLua.app/Contents/MacOS ! mkdir -p wxLua.app/Contents/Resources ! ! ! sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! -e "s/EXECUTABLE/app_wxlua/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist ! ! ! echo -n "APPL????" >wxLua.app/Contents/PkgInfo ! ! ! ln -f $(top_builddir)/bin/wxlua$(EXEEXT) wxLua.app/Contents/MacOS/app_wxlua ! ! ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLua.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: wxLua.app/Contents/PkgInfo @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) --- 240,264 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@wxLua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ mkdir -p wxLua.app/Contents ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ mkdir -p wxLua.app/Contents/MacOS ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ mkdir -p wxLua.app/Contents/Resources ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/EXECUTABLE/app_wxlua/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ -e "s/VERSION/2.8.0/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ echo -n "APPL????" >wxLua.app/Contents/PkgInfo ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ln -f $(top_builddir)/bin/wxlua$(EXEEXT) wxLua.app/Contents/MacOS/app_wxlua ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLua.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: $(__wxLua_app_Contents_PkgInfo___depname) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) *************** *** 266,290 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! wxLuaEdit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLuaEdit.app/Contents ! mkdir -p wxLuaEdit.app/Contents/MacOS ! mkdir -p wxLuaEdit.app/Contents/Resources ! ! ! sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! -e "s/EXECUTABLE/app_wxluaedit/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist ! ! ! echo -n "APPL????" >wxLuaEdit.app/Contents/PkgInfo ! ! ! ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) wxLuaEdit.app/Contents/MacOS/app_wxluaedit ! ! ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaEdit.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: wxLuaEdit.app/Contents/PkgInfo @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) --- 275,299 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@wxLuaEdit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ mkdir -p wxLuaEdit.app/Contents ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ mkdir -p wxLuaEdit.app/Contents/MacOS ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ mkdir -p wxLuaEdit.app/Contents/Resources ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/EXECUTABLE/app_wxluaedit/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ -e "s/VERSION/2.8.0/" \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ echo -n "APPL????" >wxLuaEdit.app/Contents/PkgInfo ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) wxLuaEdit.app/Contents/MacOS/app_wxluaedit ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaEdit.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: $(__wxLuaEdit_app_Contents_PkgInfo___depname) @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) *************** *** 301,325 **** @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! wxLuaCan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLuaCan.app/Contents ! mkdir -p wxLuaCan.app/Contents/MacOS ! mkdir -p wxLuaCan.app/Contents/Resources ! ! ! sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! -e "s/EXECUTABLE/app_wxluacan/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist ! ! ! echo -n "APPL????" >wxLuaCan.app/Contents/PkgInfo ! ! ! ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) wxLuaCan.app/Contents/MacOS/app_wxluacan ! ! ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaCan.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: wxLuaCan.app/Contents/PkgInfo @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) --- 310,334 ---- @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! @COND_USE_WXLUACANAPP_1@wxLuaCan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! @COND_USE_WXLUACANAPP_1@ mkdir -p wxLuaCan.app/Contents ! @COND_USE_WXLUACANAPP_1@ mkdir -p wxLuaCan.app/Contents/MacOS ! @COND_USE_WXLUACANAPP_1@ mkdir -p wxLuaCan.app/Contents/Resources ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! @COND_USE_WXLUACANAPP_1@ -e "s/EXECUTABLE/app_wxluacan/" \ ! @COND_USE_WXLUACANAPP_1@ -e "s/VERSION/2.8.0/" \ ! @COND_USE_WXLUACANAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ echo -n "APPL????" >wxLuaCan.app/Contents/PkgInfo ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) wxLuaCan.app/Contents/MacOS/app_wxluacan ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ ! @COND_USE_WXLUACANAPP_1@ cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaCan.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: $(__wxLuaCan_app_Contents_PkgInfo___depname) @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) *************** *** 336,360 **** @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! wxLuaFreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLuaFreeze.app/Contents ! mkdir -p wxLuaFreeze.app/Contents/MacOS ! mkdir -p wxLuaFreeze.app/Contents/Resources ! ! ! sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! -e "s/EXECUTABLE/app_wxluafreeze/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist ! ! ! echo -n "APPL????" >wxLuaFreeze.app/Contents/PkgInfo ! ! ! ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) wxLuaFreeze.app/Contents/MacOS/app_wxluafreeze ! ! ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaFreeze.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: wxLuaFreeze.app/Contents/PkgInfo app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c --- 345,369 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! @COND_USE_WXLUAFREEZEAPP_1@wxLuaFreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! @COND_USE_WXLUAFREEZEAPP_1@ mkdir -p wxLuaFreeze.app/Contents ! @COND_USE_WXLUAFREEZEAPP_1@ mkdir -p wxLuaFreeze.app/Contents/MacOS ! @COND_USE_WXLUAFREEZEAPP_1@ mkdir -p wxLuaFreeze.app/Contents/Resources ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ -e "s/EXECUTABLE/app_wxluafreeze/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ -e "s/VERSION/2.8.0/" \ ! @COND_USE_WXLUAFREEZEAPP_1@ $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ echo -n "APPL????" >wxLuaFreeze.app/Contents/PkgInfo ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) wxLuaFreeze.app/Contents/MacOS/app_wxluafreeze ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ ! @COND_USE_WXLUAFREEZEAPP_1@ cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaFreeze.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: $(__wxLuaFreeze_app_Contents_PkgInfo___depname) app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c |
|
From: Francesco M. <fr...@us...> - 2006-12-26 11:00:52
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14623/build/bakefiles Modified Files: mac_bundles.bkl Log Message: make the mac bundles only when the relative targets are built Index: mac_bundles.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/mac_bundles.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mac_bundles.bkl 23 Dec 2006 11:10:52 -0000 1.2 --- mac_bundles.bkl 26 Dec 2006 11:00:49 -0000 1.3 *************** *** 64,72 **** <set var="BUNDLE">$(value).app/Contents</set> <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set> ! <set var="BUNDLE_TGT_REF"> ! $(BUNDLE)/PkgInfo ! </set> ! <add-target target="$(BUNDLE_TGT)" type="action"/> <modify-target target="$(BUNDLE_TGT)"> <!-- required data: --> --- 64,70 ---- <set var="BUNDLE">$(value).app/Contents</set> <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set> ! <set var="BUNDLE_TGT_REF">$(BUNDLE)/PkgInfo</set> ! <add-target target="$(BUNDLE_TGT)" type="action" cond="target"/> <modify-target target="$(BUNDLE_TGT)"> <!-- required data: --> |
|
From: Francesco M. <fr...@us...> - 2006-12-26 10:37:06
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5110/build/bakefiles Modified Files: wxluabase.bkl Log Message: updated version number for 2.8.0.0 (as reported by Doug Currie) Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluabase.bkl 22 Dec 2006 20:45:07 -0000 1.31 --- wxluabase.bkl 26 Dec 2006 10:37:02 -0000 1.32 *************** *** 31,36 **** --- 31,39 ---- NOTE: wxLua version is stored in the following variable, WXLUA_RELEASE, and in + 1) build\autoconf\configure.ac 2) distrib\innosetup\wxlua.iss + 3) modules/wxlua/include/wxldefs.h + files. Remember to update all of them ! --> |
|
From: Francesco M. <fr...@us...> - 2006-12-26 10:37:05
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5110/modules/wxlua/include Modified Files: wxldefs.h Log Message: updated version number for 2.8.0.0 (as reported by Doug Currie) Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxldefs.h 17 Dec 2006 07:47:17 -0000 1.12 --- wxldefs.h 26 Dec 2006 10:37:02 -0000 1.13 *************** *** 26,34 **** //----------------------------------------------------------------------------- ! #define WXLUA_MAJOR_VERSION 2 ! #define WXLUA_MINOR_VERSION 6 ! #define WXLUA_RELEASE_VERSION 3 ! #define WXLUA_SUBRELEASE_VERSION 0 ! #define WXLUA_VERSION_STRING wxT("wxLua 2.6.3") // For non-Unix systems (i.e. when building without a configure script), --- 26,34 ---- //----------------------------------------------------------------------------- ! #define WXLUA_MAJOR_VERSION 2 ! #define WXLUA_MINOR_VERSION 8 ! #define WXLUA_RELEASE_VERSION 0 ! #define WXLUA_SUBRELEASE_VERSION 0 ! #define WXLUA_VERSION_STRING wxT("wxLua 2.8.0.0") // For non-Unix systems (i.e. when building without a configure script), |
|
From: Francesco M. <fr...@us...> - 2006-12-24 20:52:26
|
Update of /cvsroot/wxlua/wxLua/distrib/innosetup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4347/distrib/innosetup Modified Files: wxlua.iss Log Message: committed the version of the installer used for releasing 2.8.0.0 (forgot to do that before actually doing the release) Index: wxlua.iss =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/innosetup/wxlua.iss,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.iss 10 Dec 2006 18:04:25 -0000 1.1 --- wxlua.iss 24 Dec 2006 20:52:19 -0000 1.2 *************** *** 7,11 **** ; 1) build\autoconf\configure.ac ; 2) WXLUA_RELEASE variable in build/bakefiles/wxluabase.bkl ! #define VERSION "2.6.2.0" --- 7,15 ---- ; 1) build\autoconf\configure.ac ; 2) WXLUA_RELEASE variable in build/bakefiles/wxluabase.bkl ! #define VERSION "2.8.0.0" ! ! ; before compiling this script with Inno Setup Compiler compile wxLua ! ; with the following options: ! ; BUILD=debug SHARED=1 WX_SHARED=1 *************** *** 58,61 **** --- 62,66 ---- Source: art\*; DestDir: {app}\art; Components: main Source: bin\*.exe; DestDir: {app}\bin; Components: main + Source: bin\*.dll; DestDir: {app}\bin; Components: main ; help component *************** *** 68,74 **** ; be careful with these dirs (as they could contain a lot of temp stuff) ! Source: apps\*; Excludes: build\msw\msvc*,build\msw\bcc*; DestDir: {app}\apps; Flags: recursesubdirs; Components: sources ! Source: modules\*; Excludes: build\msw\msvc*,build\msw\bcc*; DestDir: {app}\modules; Flags: recursesubdirs; Components: sources ! Source: build\*; Excludes: \msw\msvc*,\msw\bcc*; DestDir: {app}\build; Flags: recursesubdirs; Components: sources Source: lib\*; Excludes: *.lib*,*.dll*; DestDir: {app}\lib; Components: sources --- 73,79 ---- ; be careful with these dirs (as they could contain a lot of temp stuff) ! Source: apps\*; Excludes: build\msw\vc*,build\msw\bcc*; DestDir: {app}\apps; Flags: recursesubdirs; Components: sources ! Source: modules\*; Excludes: build\msw\vc*,build\msw\bcc*; DestDir: {app}\modules; Flags: recursesubdirs; Components: sources ! Source: build\*; Excludes: \msw\vc*,\msw\bcc*; DestDir: {app}\build; Flags: recursesubdirs; Components: sources Source: lib\*; Excludes: *.lib*,*.dll*; DestDir: {app}\lib; Components: sources *************** *** 88,96 **** Name: associateopen; Description: Associate OPEN action for .lua files with wxLua interpreter; GroupDescription: Other tasks:; Components: main Name: associateedit; Description: Associate EDIT action for .lua files with wxLuaEditor; GroupDescription: Other tasks:; Components: main [Icons] Name: {group}\wxLua; Filename: {app}\bin\wxlua.exe; WorkingDir: {app}; Components: main; Tasks: startmenu Name: {group}\wxLuaEditor; Filename: {app}\bin\wxluaedit.exe; WorkingDir: {app}; Components: main; Tasks: startmenu ! Name: {group}\wxLua docs; Filename: {app}\docs\doxygen\html\index.html; Components: help; Tasks: startmenu Name: {userdesktop}\wxLuaEditor; Filename: {app}\bin\wxluaedit.exe; WorkingDir: {app}; Components: main; Tasks: desktopicon Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\wxLua; Filename: {app}\bin\wxluaedit.exe; Tasks: quicklaunchicon --- 93,105 ---- Name: associateopen; Description: Associate OPEN action for .lua files with wxLua interpreter; GroupDescription: Other tasks:; Components: main Name: associateedit; Description: Associate EDIT action for .lua files with wxLuaEditor; GroupDescription: Other tasks:; Components: main + Name: updatepath; Description: Add lua and wxLua command-line program's folder to the PATH; GroupDescription: Other tasks:; Components: main [Icons] Name: {group}\wxLua; Filename: {app}\bin\wxlua.exe; WorkingDir: {app}; Components: main; Tasks: startmenu Name: {group}\wxLuaEditor; Filename: {app}\bin\wxluaedit.exe; WorkingDir: {app}; Components: main; Tasks: startmenu ! Name: {group}\wxLua doxygen docs; Filename: {app}\docs\doxygen\html\index.html; Components: help; Tasks: startmenu ! Name: {group}\wxLua docs; Filename: {app}\docs; Components: help; Tasks: startmenu ! Name: {group}\Uninstall; Filename: {uninstallexe}; Components: main; Tasks: startmenu ! Name: {userdesktop}\wxLuaEditor; Filename: {app}\bin\wxluaedit.exe; WorkingDir: {app}; Components: main; Tasks: desktopicon Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\wxLua; Filename: {app}\bin\wxluaedit.exe; Tasks: quicklaunchicon *************** *** 109,110 **** --- 118,165 ---- Root: HKCR; Subkey: wxLuaFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\wxlua.exe"" ""%1"""; Tasks: associateopen + + + + + ; UPDATE PATH stuff + ; ================= + + + [Code] + + #include "modifypath.iss" + + procedure CurStepChanged(CurStep: TSetupStep); + begin + case CurStep of + ssPostInstall: + begin + + if IsTaskSelected('updatepath') then + // if logged in as the admin we can add the path to all users + if IsAdminLoggedOn then + ModifyPath('{app}\bin', pmAddToEnd, psAllUsers) + else + ModifyPath('{app}\bin', pmAddToEnd, psCurrentUser) + + end + end + end; + + procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep); + begin + case CurUninstallStep of + usPostUninstall: + begin + if IsAdminLoggedOn then + ModifyPath('{app}\bin', pmRemove, psAllUsers) + else + ModifyPath('{app}\bin', pmRemove, psCurrentUser) + end + end + end; + + + + + |
|
From: Francesco M. <fr...@us...> - 2006-12-24 17:31:15
|
Update of /cvsroot/wxlua/wxLua/distrib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23829 Modified Files: announce.txt Log Message: removed newlines from the announcement text as _all_ places where the announcement must be posted have their own wrap mechanisms and thus those newlines had to be manually removed Index: announce.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/announce.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** announce.txt 18 Dec 2006 17:18:39 -0000 1.2 --- announce.txt 24 Dec 2006 17:31:11 -0000 1.3 *************** *** 24,47 **** ---------------------------------------------------------------- ! The wxLua team is pleased to announce a new release of the ! lua bindings to wxWidgets cross-platform GUI library. This version supports ! wxWidgets 2.6.3 to 2.8.0 and uses lua 5.1. ! wxLua is a lua scripting language wrapper around the C++ wxWidgets ! cross-platform GUI library. It consists of an executable for running ! standalone wxLua scripts, a module for lua programs to load using require, ! and the source code to build a library for extending C++ programs with a ! fast, small, fully embeddable scripting language. ! wxWidgets is a cross-platform toolkit that lets developers create ! applications for Win32, Mac OS X, GTK+, X11, Motif, WinCE, and more using a ! single codebase. Unlike other cross-platform toolkits, wxWidgets applications ! look and feel native. This is because wxWidgets uses the platform's own native ! controls rather than emulating them. It's also extensive, free, open-source, ! and mature. ! wxLua wraps all the GUI controls that wxWidgets provides as well as common ! dialogs, drawing graphics, image loading, saving, manipulating, file functions, ! sound and media playback, printing, sockets, and more. --- 24,34 ---- ---------------------------------------------------------------- ! The wxLua team is pleased to announce a new release of the lua bindings to wxWidgets cross-platform GUI library. This version supports wxWidgets 2.6.3 to 2.8.0 and uses lua 5.1. ! wxLua is a lua scripting language wrapper around the C++ wxWidgets cross-platform GUI library. It consists of an executable for running standalone wxLua scripts, a module for lua programs to load using require, and the source code to build a library for extending C++ programs with a fast, small, fully embeddable scripting language. ! wxWidgets is a cross-platform toolkit that lets developers create applications for Win32, Mac OS X, GTK+, X11, Motif, WinCE, and more using a single codebase. Unlike other cross-platform toolkits, wxWidgets applications look and feel native. This is because wxWidgets uses the platform's own native controls rather than emulating them. It's also extensive, free, open-source, and mature. ! wxLua wraps all the GUI controls that wxWidgets provides as well as common dialogs, drawing graphics, image loading, saving, manipulating, file functions, sound and media playback, printing, sockets, and more. |
|
From: Francesco M. <fr...@us...> - 2006-12-24 17:06:33
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14107 Modified Files: download.php Log Message: updated the DLL link for 2.8.0.0 release Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** download.php 24 Dec 2006 16:42:19 -0000 1.20 --- download.php 24 Dec 2006 17:06:29 -0000 1.21 *************** *** 19,22 **** --- 19,23 ---- $winlink="http://prdownloads.sourceforge.net/wxlua/wxLua-$latestversion-setup.exe?download"; + $dlllink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-dlls.zip?download"; $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.dmg?download"; *************** *** 79,84 **** <h2 id="win">...for Windows</h2> <a href="<?php echo $winlink; ?>"><img src="images/win.png" alt="Windows download"/></a> ! <p><a href="<?php echo $winlink; ?>">Binary package</a> (.exe installer) ~ <?php echo $exesize; ?> MB: self-contained; you won't need anything else.<br/> ! For problems with installation, see the <a href="support.php">support page</a>.</p> </div> --- 80,87 ---- <h2 id="win">...for Windows</h2> <a href="<?php echo $winlink; ?>"><img src="images/win.png" alt="Windows download"/></a> ! <p><a href="<?php echo $winlink; ?>">Binary package</a> (.exe installer) ~ <?php echo $exesize; ?> MB: self-contained; you won't need anything else.</p> ! <p>You may also want to download a <a href="<?php echo $dlllink; ?>">package</a> containing only the ! DLLs required for using wxWidgets bindings as a <a href="http://lua-users.org/wiki/BuildingModules">Lua module</a>.</p> ! <p>For problems with installation, see the <a href="support.php">support page</a>.</p> </div> |
|
From: Francesco M. <fr...@us...> - 2006-12-24 16:42:23
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4667 Modified Files: download.php Log Message: updated download links for new release Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** download.php 16 May 2006 20:24:32 -0000 1.19 --- download.php 24 Dec 2006 16:42:19 -0000 1.20 *************** *** 9,27 **** // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.6.2.0"; ! $exesize="3.6"; // size of the wxlua-xxx-setup.exe file (in MB) ! $tarsize="1.0"; // size of the wxlua-xxx.tar.gz file (in MB) ! $zipsize="1.2"; // size of the wxlua-xxx.zip file (in MB) ! $apsize="6.2"; // size of the wxlua-xxx.package file (in MB) ! $bundlesize="3.0"; // size of the wxlua-xxx. file (in MB) ! $winlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-setup.exe?download"; $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.dmg?download"; $ziplink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.zip?download"; ! $tarlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.tar.gz?download"; ?> --- 9,27 ---- // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.0.0"; ! $bz2size="1.1"; // size of the wxlua-xxx.tar.bz2 file (in MB) ! $zipsize="1.1"; // size of the wxlua-xxx.zip file (in MB) ! $exesize="5.3"; // size of the wxlua-xxx-setup.exe file (in MB) ! $apsize="9.6"; // size of the wxlua-xxx.package file (in MB) ! $bundlesize="3.0"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://prdownloads.sourceforge.net/wxlua/wxLua-$latestversion-setup.exe?download"; $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.dmg?download"; $ziplink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.zip?download"; ! $bz2link="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.tar.bz2?download"; ?> *************** *** 94,98 **** <h2 id="mac">...for Macintosh</h2> <a href="<?php echo $maclink; ?>"><img src="images/macosx.png" alt="Macintosh download"/></a> ! <p><a href="<?php echo $maclink; ?>">Binary package</a> (???Bundle???) ~ <?php echo $bundlesize; ?> MB: ???.<br/> For problems with installation, see the <a href="support.php">support page</a>.</p> </div> --- 94,98 ---- <h2 id="mac">...for Macintosh</h2> <a href="<?php echo $maclink; ?>"><img src="images/macosx.png" alt="Macintosh download"/></a> ! <p><a href="<?php echo $maclink; ?>">Binary package</a> (Mac Bundle) ~ <?php echo $bundlesize; ?> MB: self-contained.<br/> For problems with installation, see the <a href="support.php">support page</a>.</p> </div> *************** *** 103,107 **** <p>Source packages are available in two formats which contain exactly the same things:</p> <ul> ! <li><a href="<?php echo $tarlink; ?>">Source package</a> (.tar.gz) ~ <?php echo $tarsize; ?> MB</li> <li><a href="<?php echo $ziplink; ?>">Source package</a> (.zip) ~ <?php echo $zipsize; ?> MB</li> </ul> --- 103,107 ---- <p>Source packages are available in two formats which contain exactly the same things:</p> <ul> ! <li><a href="<?php echo $bz2link; ?>">Source package</a> (.tar.bz2) ~ <?php echo $bz2size; ?> MB</li> <li><a href="<?php echo $ziplink; ?>">Source package</a> (.zip) ~ <?php echo $zipsize; ?> MB</li> </ul> |
|
From: Francesco M. <fr...@us...> - 2006-12-24 13:30:59
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25620 Modified Files: configure Log Message: small AP fixes Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** configure 22 Dec 2006 20:45:04 -0000 1.46 --- configure 24 Dec 2006 13:30:55 -0000 1.47 *************** *** 7151,7157 **** # check for the wxStEdit component... ! if [ "$USE_WXLUAEDITAPP" = "1" ]; then ! minversion="1.2.0" --- 7151,7159 ---- # check for the wxStEdit component... ! # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol ! # to get rid of this check which fails for some reason when building the AP ! if [ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]; then ! minversion="1.2.4" *************** *** 7172,7176 **** - major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'` minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'` --- 7174,7177 ---- *************** *** 7296,7305 **** ! if test $ac_cv_prog_stedit_set = "1"; then ! # add to the library to link to the wxStEdit lib ! #WX_LIBS="-lstedit $WX_LIBS" ! WX_LIBS="$wxstedit_lib $WX_LIBS" ! ! else if test $WX_VERSION -gt 26 ; then --- 7297,7301 ---- ! if test $ac_cv_prog_stedit_set = "0"; then if test $WX_VERSION -gt 26 ; then *************** *** 10010,10014 **** fi ! ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc" --- 10006,10010 ---- fi ! ac_config_files="$ac_config_files Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc distrib/autopackage/default.apspec" *************** *** 10590,10593 **** --- 10586,10590 ---- "apps/Makefile") CONFIG_FILES="$CONFIG_FILES apps/Makefile" ;; "build/autoconf/wxlua.pc") CONFIG_FILES="$CONFIG_FILES build/autoconf/wxlua.pc" ;; + "distrib/autopackage/default.apspec") CONFIG_FILES="$CONFIG_FILES distrib/autopackage/default.apspec" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 |
|
From: Francesco M. <fr...@us...> - 2006-12-24 13:30:59
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25620/build/autoconf Modified Files: aclocal.m4 configure.ac Log Message: small AP fixes Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** aclocal.m4 22 Dec 2006 20:45:06 -0000 1.37 --- aclocal.m4 24 Dec 2006 13:30:56 -0000 1.38 *************** *** 1723,3036 **** ]) ! dnl --------------------------------------------------------------------------- ! dnl Author: wxWidgets development team, ! dnl Francesco Montorsi, ! dnl Bob McCown (Mac-testing) ! dnl Creation date: ! dnl RCS-ID: $Id$ ! dnl --------------------------------------------------------------------------- ! [...1288 lines suppressed...] ! ]) ! ! AC_DEFUN([AM_WXPRESETS_SUMMARY_MSG_END], ! [ ! echo ! echo " The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION" ! echo " has the following settings:" ! AM_WXPRESETS_SUMMARY_MSG ! echo ! echo " Now, just run make." ! echo " ----------------------------------------------------------------" ! echo ! ]) ! ! ! --- 1723,1725 ---- ]) ! m4_include([../../wxwin.m4]) Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** configure.ac 23 Dec 2006 11:10:52 -0000 1.37 --- configure.ac 24 Dec 2006 13:30:56 -0000 1.38 *************** *** 315,321 **** # check for the wxStEdit component... ! if [[ "$USE_WXLUAEDITAPP" = "1" ]]; then ! minversion="1.2.0" AM_SET_WXLIKE_LIBNAME([wx], [stedit]) --- 315,323 ---- # check for the wxStEdit component... ! # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol ! # to get rid of this check which fails for some reason when building the AP ! if [[ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]]; then ! minversion="1.2.4" AM_SET_WXLIKE_LIBNAME([wx], [stedit]) *************** *** 326,333 **** [ac_cv_prog_stedit_set=0]) ! if test $ac_cv_prog_stedit_set = "1"; then ! # add to the library to link to the wxStEdit lib ! WX_LIBS="$wxstedit_lib $WX_LIBS" ! else AM_SET_WXBUILD_STR AC_MSG_NOTICE([ --- 328,332 ---- [ac_cv_prog_stedit_set=0]) ! if test $ac_cv_prog_stedit_set = "0"; then AM_SET_WXBUILD_STR AC_MSG_NOTICE([ *************** *** 387,391 **** AC_BAKEFILE([m4_include(autoconf_inc.m4)]) ! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc]) # since at least the "luamodule.wx.lua" sample require to be able to find --- 386,390 ---- AC_BAKEFILE([m4_include(autoconf_inc.m4)]) ! AC_CONFIG_FILES([Makefile modules/Makefile apps/Makefile build/autoconf/wxlua.pc distrib/autopackage/default.apspec]) # since at least the "luamodule.wx.lua" sample require to be able to find |
|
From: Francesco M. <fr...@us...> - 2006-12-24 13:30:59
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25620/apps Modified Files: Makefile.in Log Message: small AP fixes Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** Makefile.in 23 Dec 2006 11:21:30 -0000 1.52 --- Makefile.in 24 Dec 2006 13:30:55 -0000 1.53 *************** *** 207,211 **** $(top_builddir)/bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 $(__app_lua___mac_setfilecmd) --- 207,211 ---- $(top_builddir)/bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) |
|
From: Francesco M. <fr...@us...> - 2006-12-24 13:30:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25620/apps/build/bakefiles Modified Files: apps.bkl Log Message: small AP fixes Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** apps.bkl 23 Dec 2006 11:10:52 -0000 1.49 --- apps.bkl 24 Dec 2006 13:30:55 -0000 1.50 *************** *** 89,107 **** <headers>$(LUA_HDR)</headers> <!-- see modules/build/bakefiles/options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> <if cond="TARGETING_WIN32=='0'"> ! <!-- we require the standard MATH library to build the lua sources --> <sys-lib>m</sys-lib> </if> - - <!-- we want as EXE name the standard "lua" name so that when we install - wxLua we get the lua installed in standard places and with standard names - (see also the notes in modules.bkl for lua_lib and lua_dll) - --> - <exename>lua</exename> - <wxlua-lib>lua</wxlua-lib> </exe> --- 89,108 ---- <headers>$(LUA_HDR)</headers> + <!-- we want as EXE name the standard "lua" name so that when we install + wxLua we get the lua installed in standard places and with standard names + (see also the notes in modules.bkl for lua_lib and lua_dll) + --> + <exename>lua</exename> + <!-- see modules/build/bakefiles/options.bkl for these --> <cflags>$(LUA_PLATFORM_SPECIFIC_CFLAGS)</cflags> <ldflags>$(LUA_PLATFORM_SPECIFIC_LDFLAGS)</ldflags> + <wxlua-lib>lua</wxlua-lib> <if cond="TARGETING_WIN32=='0'"> ! <!-- we require the standard MATH library to build the lua sources ! (and it needs to be listed _after_ <wxlua-lib>lua</wxlua-lib> --> <sys-lib>m</sys-lib> </if> </exe> |
|
From: Francesco M. <fr...@us...> - 2006-12-24 13:30:59
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25620/distrib/autopackage Modified Files: default.apspec.in makeautopackage Log Message: small AP fixes Index: default.apspec.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/default.apspec.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** default.apspec.in 24 Dec 2006 11:20:18 -0000 1.3 --- default.apspec.in 24 Dec 2006 13:30:56 -0000 1.4 *************** *** 15,18 **** --- 15,19 ---- AutopackageTarget: 1.2 PackageFileName: $SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package + Compression: bzip2 [BuildPrepare] *************** *** 20,26 **** # to their absolute path otherwise they will be considered as shared # and the order of the lib will be messed !! ! export APBUILD_RESOLVE_LIBPATH=".*lua.*" export APBUILD_STATIC="tiff expat" ! prepareBuild --disable-shared --disable-debug --disable-customwxbind-install [BuildUnprepare] --- 21,28 ---- # to their absolute path otherwise they will be considered as shared # and the order of the lib will be messed !! ! export APBUILD_RESOLVE_LIBPATH=".*stedit.* .*lua.*" export APBUILD_STATIC="tiff expat" ! export NO_WXLUAEDIT_CHECK=1 ! prepareBuild --disable-shared --disable-debug --enable-unicode --disable-customwxbind-install --disable-precomp-headers [BuildUnprepare] Index: makeautopackage =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/makeautopackage,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makeautopackage 24 Dec 2006 09:46:19 -0000 1.2 --- makeautopackage 24 Dec 2006 13:30:56 -0000 1.3 *************** *** 4,12 **** # main dir after you ran configure there mkdir -p toupload rm -f upload/*.xml upload/*.meta upload/*.package cd ../.. ! makeinstaller $@ distrib/autopackage/default.apspec.in if test $? = 0; then mv *.xml *.meta *.package distrib/autopackage/toupload --- 4,13 ---- # main dir after you ran configure there + rm -rf toupload mkdir -p toupload rm -f upload/*.xml upload/*.meta upload/*.package cd ../.. ! makeinstaller $@ distrib/autopackage/default.apspec if test $? = 0; then mv *.xml *.meta *.package distrib/autopackage/toupload |
|
From: Francesco M. <fr...@us...> - 2006-12-24 11:20:22
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11262 Modified Files: default.apspec.in Log Message: little small fixes for new release Index: default.apspec.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/default.apspec.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** default.apspec.in 24 Dec 2006 11:00:22 -0000 1.2 --- default.apspec.in 24 Dec 2006 11:20:18 -0000 1.3 *************** *** 22,26 **** export APBUILD_RESOLVE_LIBPATH=".*lua.*" export APBUILD_STATIC="tiff expat" ! prepareBuild --disable-shared --disable-debug --disable-customwxbind-install --with-wxdir=/home/frm/work/wxGTK-2.6.3 [BuildUnprepare] --- 22,26 ---- export APBUILD_RESOLVE_LIBPATH=".*lua.*" export APBUILD_STATIC="tiff expat" ! prepareBuild --disable-shared --disable-debug --disable-customwxbind-install [BuildUnprepare] *************** *** 47,51 **** installExe bin/* installData share/wxlua ! installIcon share/pixmaps/wxlua.xpm installMime share/mime/packages/wxlua.xml installMenuItem "Development" share/applications/wxlua.desktop --- 47,51 ---- installExe bin/* installData share/wxlua ! installIcon share/pixmaps/wxlualogo.xpm installMime share/mime/packages/wxlua.xml installMenuItem "Development" share/applications/wxlua.desktop |
