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: Francesco M. <fr...@us...> - 2006-12-24 11:17:15
|
Update of /cvsroot/wxlua/wxLua/art In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10025 Modified Files: wxlualogo.xpm wxluasmall.xpm Log Message: committed slightly better versions Index: wxlualogo.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxlualogo.xpm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxlualogo.xpm 24 Dec 2006 11:08:16 -0000 1.2 --- wxlualogo.xpm 24 Dec 2006 11:17:11 -0000 1.3 *************** *** 1,205 **** /* XPM */ ! static char *wxlualogo[] = { ! /* columns rows colors chars-per-pixel */ ! "24 24 175 2", ! " c black", ! ". c #000069", ! "X c #00006B", ! "o c navy", ! "O c #121289", ! "+ c #1A1A8C", ! "@ c #1F1F8F", ! "# c #242492", ! "$ c #2F2F97", ! "% c #303097", ! "& c #38389B", ! "* c #1D18DD", ! "= c #1111E1", ! "- c #3124D6", ! "; c #2929FF", ! ": c #3333FF", ! "> c #3D3DFF", ! ", c #40409F", ! "< c #4343A1", ! "1 c #4848A3", ! "2 c #4F4FA7", ! "3 c #4242BE", ! "4 c #5555AA", ! "5 c #5757AB", ! "6 c #5858AB", ! "7 c #5C5CAD", ! "8 c #5E5EAE", ! "9 c #6D42B7", ! "0 c #6060AF", ! "q c #6161B0", ! "w c #6868B3", ! "e c #7777BB", ! "r c #7D7DBE", ! "t c #4242DB", ! "y c #4F4FDC", ! "u c #5252D7", ! "i c #5A5AD0", ! "p c #5F5FD2", ! "a c #4545F0", ! "s c #4747FF", ! "d c #4C4CFF", ! "f c #5B5BED", ! "g c #5252FF", ! "h c #5C5CFF", ! "j c #7C7CCD", ! "k c #7474D1", ! "l c #7474DC", ! "z c #6363FF", ! "x c #7272FF", ! "c c #7373FF", ! "v c #7878FF", ! "b c #D30000", ! "n c #D30404", ! "m c #D30A0A", ! "M c #D60E0E", ! "N c #D90000", ! "B c #DB0000", ! "V c #D90404", ! "C c #D31212", ! "Z c #D31717", ! "A c #D71A1A", ! "S c #D52C2C", ! "D c #D52D2D", ! "F c #DC3F3F", ! "G c #EF1717", ! "H c #F60F0F", ! "J c #F91919", ! "K c #EF2727", ! "L c #EF3D3D", ! "P c #F92121", ! "I c #FF2323", ! "U c #F92B2B", ! "Y c #FF2D2D", ! "T c #FF3737", ! "R c #DD5454", ! "E c #DC7777", ! "W c #F04242", ! "Q c #FF4141", ! "! c #FF4E4E", ! "~ c #FF5252", ! "^ c #FF6262", ! "/ c #FF6C6C", ! "( c #FF7D7D", ! ") c #8B5FA7", ! "_ c #CBCB00", ! "` c #CFCF00", ! "' c #CFCF05", ! "] c #CFCF0E", ! "[ c #D1D100", ! "{ c #D2D20D", ! "} c #D8D806", ! "| c #DEDE0E", ! " . c #D0D018", ! ".. c #D3D31B", ! "X. c #DEDE17", ! "o. c #DEDE1F", ! "O. c #CCCC26", ! "+. c #C9C93E", ! "@. c #D4D42C", ! "#. c #DDDD2A", ! "$. c #EFEF1B", ! "%. c #EFEF25", ! "&. c #EFEF2F", ! "*. c #EFEF38", ! "=. c #CDCD4C", ! "-. c #DCDC49", ! ";. c #D5D555", ! ":. c #CDCD64", ! ">. c #D3D36E", ! ",. c #EFEF42", ! "<. c #EFEF43", ! "1. c #F1F14E", ! "2. c #F1F15E", ! "3. c #F7F758", ! "4. c #E3E367", ! "5. c #FAFA6A", ! "6. c #FFFF71", ! "7. c #FFFF7F", ! "8. c #B5B5A7", ! "9. c #8282C0", ! "0. c #8585C2", ! "q. c #8383D1", ! "w. c #9191C8", ! "e. c #9393D3", ! "r. c #8585E2", ! "t. c #8F8FE2", ! "y. c #8181F3", ! "u. c #8585FF", ! "i. c #8686FF", ! "p. c #9A9AE2", ! "a. c #9292FF", ! "s. c #9696FF", ! "d. c #9F9FFF", ! "f. c #A1A1E2", ! "g. c #A1A1F3", ! "h. c #ACACFF", ! "j. c #B6B6EE", ! "k. c #B2B2F3", ! "l. c #CD8989", ! "z. c #CF8F8F", ! "x. c #D18383", ! "c. c #D18989", ! "v. c #D28D8D", ! "b. c #DC8B8B", ! "n. c #CA87B1", ! "m. c #FF8A8A", ! "M. c #FF9797", ! "N. c #FF9898", ! "B. c #FFA4A4", ! "V. c #FFB0B0", ! "C. c #FFB2B2", ! "Z. c #FFBEBE", ! "A. c #DBDB81", ! "S. c #DBDB8A", ! "D. c #DBDB94", ! "F. c #E7E781", ! "G. c #EFEF9F", ! "H. c #FBFB81", ! "J. c #FFFF8C", ! "K. c #FFFF99", ! "L. c #FFFF9E", ! "P. c #E4E4AC", ! "I. c #EFEFB0", ! "U. c #FFFFA6", ! "Y. c #FFFFB3", ! "T. c #FFFFB4", ! "R. c #C9C9E4", ! "E. c #C1C1FF", ! "W. c #FFC4C4", ! "Q. c #F9CBCB", ! "!. c #FFD3D3", ! "~. c #FFFFC6", ! "^. c #ECECF5", ! "/. c gray100", ! "(. c None", ! /* pixels */ ! "(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.(.o o o o o o o (.", ! "(.(.(.(.(.(.(.(. o o o o o 2 e.@ o ", ! "(.(.(.(.(.(. (.(.(. . o o o o ^./.9.o ", ! "(.(.(.(. (.(.(.(.(.(.(.(.o + o o o j R.$ X ", ! "(.(.(. (.(.(.(.(.(.(.(.(.o o w o % o % & 1 o ", ! "(.(. (.(.(.(.(.(.(.(.(.(.(.o w o q o q < 0.O ", ! "(. (.(.(.(.(.(.(.(.(.(.(.(.o q 5 < 4 4 7 e # ", ! "(. (.(.(.(.(.(.e.f.p.t.r.l i o o o X o o o o o ", ! " (.(.(.(.(.q.j.E.h.d.a.u.u (.(.o o o o . (.", ! " (.(.(.(.(.(.k k.h.a.u.x z t (.(.(.(.(.(.(. (.", ! " (.(.(.(.(.(.p g.s.v h s j 8.D.S.A.>.:.(.(. (.", ! " (.(.z.l.c.x.) y.x d > a P.~.Y.U.K.J.;.(.(. (.", ! " (.(.v.Q.Z.V.n.f g : ; y I.T.K.J.H.6.-.(.(. (.", ! " (.(.b.!.B.N.m.9 - * = 3 G.L.7.5.1.<.@.(.(. (.", ! " (.(.E W.m.( ^ ! L D (.=.F.H.3.<.*.&. .(.(. (.", ! " (.(.R V./ ~ Q T K A (.+.4.2.*.&.%.$.{ (.(. (.", ! " (.F N.Q T Y I G M (. O.#.o.X.| } _ (. (.", ! " (.D W U P J H N N (.(.(. .] ' ` [ (.(. (.", ! "(. (.Z C m n n N (.(.(.(.(.(.(.(.(.(. (.(.", ! "(.(. (.(.(.(.(.(.(.(.(.(.(.(.(.(.(. (.(.(.", ! "(.(. (.(.(.(.(.(.(.(.(.(.(.(.(. (.(.(.", ! "(.(.(. (.(.(.(.(.(.(.(.(.(.(. (.(.(.(.", ! "(.(.(.(.(. (.(.(.(.(.(.(. (.(.(.(.(.(.", ! "(.(.(.(.(.(. (.(.(.(.(.(.(." ! }; --- 1,199 ---- /* XPM */ ! static char * wxlualogo_xpm[] = { ! "24 24 172 2", ! " c None", ! ". c #000080", ! "+ c #5858AB", ! "@ c #7777BB", ! "# c #0F0F87", ! "$ c #1F1F8F", ! "% c #FEFEFE", ! "& c #FFFFFF", ! "* c #6666B2", ! "= c #060682", ! "- c #D5D5EA", ! "; c #EFEFF7", ! "> c #333399", ! ", c #040481", ! "' c #6161B0", ! ") c #0D0D86", ! "! c #020280", ! "~ c #0A0A84", ! "{ c #1E1E8E", ! "] c #0B0B85", ! "^ c #6B6BB5", ! "/ c #6868B3", ! "( c #131389", ! "_ c #5454A9", ! ": c #4747A3", ! "< c #9B9BCD", ! "[ c #010180", ! "} c #040482", ! "| c #7D7DBE", ! "1 c #3E3E9E", ! "2 c #7B7BBD", ! "3 c #9292C8", ! "4 c #8E8ED1", ! "5 c #8A8AD2", ! "6 c #8181D2", ! "7 c #7A7AD2", ! "8 c #7070CF", ! "9 c #40409F", ! "0 c #15158A", ! "a c #2F2F97", ! "b c #9898DB", ! "c c #CACAFE", ! "d c #BBBBFF", ! "e c #AFAFFF", ! "f c #A2A2FF", ! "g c #9595FE", ! "h c #6464DB", ! "i c #ADADED", ! "j c #C3C3FF", ! "k c #9696FF", ! "l c #8A8AFF", ! "m c #7D7DFF", ! "n c #6161ED", ! "o c #9C9CED", ! "p c #B1B1FF", ! "q c #8989FF", ! "r c #6464FF", ! "s c #5252FF", ! "t c #4949E6", ! "u c #8282ED", ! "v c #9D9DFF", ! "w c #6F6FFF", ! "x c #4242FF", ! "y c #8181CA", ! "z c #DCDCA9", ! "A c #E9E9A7", ! "B c #E9E99D", ! "C c #E9E992", ! "D c #E9E989", ! "E c #D9D96C", ! "F c #D99A9A", ! "G c #DF9B9B", ! "H c #DF9292", ! "I c #AC72A2", ! "J c #6969ED", ! "K c #7B7BFF", ! "L c #4343FF", ! "M c #3939FF", ! "N c #2F2FFF", ! "O c #BFBFA1", ! "P c #FFFFD7", ! "Q c #FFFFB1", ! "R c #FFFFA5", ! "S c #FFFF99", ! "T c #FFFF8C", ! "U c #FDFD7E", ! "V c #CECE47", ! "W c #DB9494", ! "X c #FFD3D3", ! "Y c #FFB6B6", ! "Z c #FFAAAA", ! "` c #EB95A3", ! " . c #403FDE", ! ".. c #5353FF", ! "+. c #2626FF", ! "@. c #1D1DFF", ! "#. c #C5C591", ! "$. c #FFFFCD", ! "%. c #FFFF98", ! "&. c #FEFE7F", ! "*. c #FAFA6C", ! "=. c #FBFB61", ! "-. c #CDCD38", ! ";. c #E08C8C", ! ">. c #FFCCCC", ! ",. c #FF9E9E", ! "'. c #FF9292", ! "). c #FF8585", ! "!. c #A4549E", ! "~. c #4D2DBF", ! "{. c #2A19C8", ! "]. c #0E0EDA", ! "^. c #0707DA", ! "/. c #C7C776", ! "(. c #FFFFBF", ! "_. c #FFFF80", ! ":. c #FDFD70", ! "<. c #F2F252", ! "[. c #EFEF45", ! "}. c #EFEF3B", ! "|. c #C9C921", ! "1. c #E07A7A", ! "2. c #FFBDBD", ! "3. c #FF7878", ! "4. c #FF5B5B", ! "5. c #FF4949", ! "6. c #FB3E3E", ! "7. c #D12525", ! "8. c #D3D349", ! "9. c #F9F9A6", ! "0. c #F7F75B", ! "a. c #F0F047", ! "b. c #EFEF32", ! "c. c #EFEF29", ! "d. c #C9C915", ! "e. c #E05555", ! "f. c #FFA9A9", ! "g. c #FF6666", ! "h. c #FF4D4D", ! "i. c #FF3F3F", ! "j. c #FF3636", ! "k. c #FB2B2B", ! "l. c #D21818", ! "m. c #D0D039", ! "n. c #F5F58F", ! "o. c #EFEF1F", ! "p. c #EDED16", ! "q. c #C8C808", ! "r. c #DF4141", ! "s. c #FF9191", ! "t. c #FF3535", ! "u. c #FF2C2C", ! "v. c #FF2323", ! "w. c #F91919", ! "x. c #D10B0B", ! "y. c #CACA2A", ! "z. c #D6D628", ! "A. c #DCDC22", ! "B. c #DCDC1A", ! "C. c #DCDC12", ! "D. c #DCDC0B", ! "E. c #CCCC02", ! "F. c #D52A2A", ! "G. c #F33F3F", ! "H. c #F92A2A", ! "I. c #F92121", ! "J. c #F81010", ! "K. c #DC0606", ! "L. c #D31212", ! "M. c #D30B0B", ! "N. c #D30606", ! "O. c #D10000", ! " . . . . ", ! " . . . . + @ # ", ! " . . . . $ % & * ", ! " . . . . = - ; > . ", ! " . , ' . ) ! ~ { ] . ", ! " , ^ . / ( _ : < [ ", ! " } | $ ^ 1 _ 2 3 # ", ! " 4 5 6 7 8 [ 9 1 ( > 0 a > ", ! " b c d e f g h . . . . . ", ! " i j f k l m n ", ! " o p q m r s t ", ! " u v w s x y z A B C D E ", ! " F G H I J K L M N O P Q R S T U V ", ! " W X Y Z ` ...N +.@.#.$.%.T &.*.=.-. ", ! " ;.>.,.'.).!.~.{.].^./.(._.:.<.[.}.|. ", ! " 1.2.).3.4.5.6.7. 8.9.0.a.}.b.c.d. ", ! " e.f.g.h.i.j.k.l. m.n.}.b.c.o.p.q. ", ! " r.s.i.t.u.v.w.x. y.z.A.B.C.D.E. ", ! " F.G.H.I.w.J.K. ", ! " L.M.N.O. ", ! " ", ! " ", ! " ", ! " "}; Index: wxluasmall.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxluasmall.xpm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxluasmall.xpm 24 Dec 2006 11:08:16 -0000 1.3 --- wxluasmall.xpm 24 Dec 2006 11:17:11 -0000 1.4 *************** *** 1,333 **** /* XPM */ ! static char *wxLuaSmall_xpm[] = { ! /* columns rows colors chars-per-pixel */ ! "179 70 257 2", ! " c black", ! ". c #000010", ! "X c #00007B", ! "o c #00006C", ! "O c #000080", ! "+ c #0C0C85", [...1313 lines suppressed...] ! " /=(=_=:==%G%U&I%V&b&a*X&b*c*<=N*[=}=|=1= ,$,$,$,$,$,$,$,$,$s%$ 2=3%3%3%^*3=/*$ $&4=M&$ L&,$&=5=6=_&,=]*7=,$8=9=$ $ |&,$,$,$,$,$,$v%$ $ A&,$,$,$,$,$C&$ ~=[&0=$ ,=a=,$ &$ $ 9=b=<&$ $ 1&,$6*[*$ s%y*c=d='&,$L&$ ^=,$,$,$,$,$,$,$,$,$,$,$ ", ! " e=f=g=U&I%V&b&a*h=b*c*<=N*[=}=i=j=k=l= ,$,$,$,$,$,$,$,$,$d=$ $ $ $ $ d=,$m=n=$ 2%o=$ /*,$)=s&$ $ w&p=,$,$,$q=$ $ _*,$,$,$,$,$,$v%$ $ ;&,$,$,$,$,$3=%&E&$ $ 9=r=,$,$s=t%$ G&,$t=$ $ ,*,$,$'*o=J&$ $ n=A&,$r&$ u=,$,$,$,$,$,$,$,$,$,$,$ ", ! " v=h%w=x=y=z=A=B=C=D=E=F=G=H=I=J=K= ,$,$,$,$,$,$,$,$,$(*L=L=L=L=L=M=,$,$W%N=+&&&L=O=,$.&P=Q=;*W%,$,$,$,$m=$ y%R=,$,$,$,$,$,$S=L=L=W%,$,$,$,$,$,$,$T=U=7=W%,$,$,$B&L=L=+&,$V=L=L=.&,$,$,$W=X=Y=Z=z%,$,$`=L= -,$,$,$,$,$,$,$,$,$,$,$ ", ! " .-+-@-#-$-%-&-*-=---;->- ,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$M=o&|*,-'-,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$ ", ! " ,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$)-$&4%5*B&,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$ ", ! " ,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$ ", ! " ,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$ ", ! " ,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$,$ ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " ", ! " "}; |
|
From: Francesco M. <fr...@us...> - 2006-12-24 11:08:21
|
Update of /cvsroot/wxlua/wxLua/art In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6379 Modified Files: wxlualarge.xpm wxlualogo.xpm wxluasmall.xpm Log Message: fixed XPM Index: wxlualogo.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxlualogo.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs0xvmsp and /tmp/cvs5s183G differ Index: wxluasmall.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxluasmall.xpm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsQxZJaA and /tmp/cvscDMR0R differ Index: wxlualarge.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxlualarge.xpm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs5cJ0lH and /tmp/cvsjGvmIZ differ |
|
From: Francesco M. <fr...@us...> - 2006-12-24 11:00:30
|
Update of /cvsroot/wxlua/wxLua/art In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3034/art Modified Files: wxlualarge.xpm wxluasmall.xpm Added Files: logoonly.svg lualogo.svg wxlualogo.svg wxlualogo.xpm Removed Files: wxlualarge-transparent.xpm Log Message: updated icons with updated logo; updated build system to also uninstall the installed desktop,icons,etc --- NEW FILE: lualogo.svg --- <?xml version="1.0" encoding="iso-8859-1"?> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> <!-- Creator: CorelDRAW --> <svg xmlns="http://www.w3.org/2000/svg" xmlns:odm="http://product.corel.com/CGS/11/cddns/" xml:space="preserve" width="200px" height="196px" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" viewBox="0 0 200 196"> <g id="Layer 1"> <path fill="none" stroke="#858585" stroke-width="3" stroke-dasharray="5 8" d="M173 61c6,11 10,25 10,39 0,46 -38,84 -84,84 -46,0 -84,-38 -84,-84 0,-46 38,-84 84,-84 14,0 27,3 39,10"/> <circle fill="#000080" cx="99" cy="100" r="65"/> <circle fill="#FFFFFF" cx="125" cy="73" r="19"/> <circle fill="#000080" cx="163" cy="35" r="19"/> <text x="49" y="132" fill="#FFFFFF" font-weight="normal" font-size="60" font-family="Arial">Lua</text> </g> </svg> --- wxlualarge-transparent.xpm DELETED --- --- NEW FILE: wxlualogo.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="898.612" height="350.80908" id="svg2" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/home/frm/work/wxLuaWebsite/images" sodipodi:docname="wxlualogo.svg" inkscape:export-filename="/home/tierra/Desktop/blocks.png" inkscape:export-xdpi="72" inkscape:export-ydpi="72" version="1.0"> <defs id="defs4"><linearGradient id="linearGradient6854"> <stop style="stop-color:#ffffe0;stop-opacity:1;" offset="0" id="stop6856" /> <stop style="stop-color:#ffff00;stop-opacity:1;" offset="1" id="stop6858" /> </linearGradient> <linearGradient id="linearGradient6848"> <stop style="stop-color:#0000ff;stop-opacity:1;" offset="0" id="stop6850" /> <stop style="stop-color:#e0e0ff;stop-opacity:1;" offset="1" id="stop6852" /> </linearGradient> <linearGradient id="linearGradient4073"> <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4075" /> <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop4077" /> </linearGradient> <linearGradient id="linearGradient8721"> <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop12145" /> <stop id="stop8725" offset="1" style="stop-color:#ffe0e0;stop-opacity:1;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient33657" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545556,0,0,0.350255,-38.51666,72.6073)" x1="139.43112" y1="520.74255" x2="222.73912" y2="520.74255" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient8721" id="linearGradient33661" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.000031,0,0,1.000031,-45.00832,-319.1057)" x1="221.01576" y1="674.0849" x2="119.92342" y2="474.09103" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient33664" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545558,0,0,0.350255,91.4834,-57.3926)" x1="139.62971" y1="520.74225" x2="222.73819" y2="520.74225" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6848" id="linearGradient33668" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.334164,0,0,1.334164,-90.28301,-537.514)" x1="296.20334" y1="571.52942" x2="220.84492" y2="421.62283" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient33671" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545558,0,0,0.350255,236.4833,37.6074)" x1="139.43103" y1="520.74225" x2="222.73837" y2="520.74225" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6854" id="linearGradient33675" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.334164,0,0,1.334164,54.71699,-442.514)" x1="221.02206" y1="421.6228" x2="296.72556" y2="571.52942" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient8721" id="linearGradient5628" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.000031,0,0,1.000031,-45.00832,-319.1057)" x1="221.01576" y1="674.0849" x2="119.92342" y2="474.09103" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient5630" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545556,0,0,0.350255,-38.51666,72.6073)" x1="139.43112" y1="520.74255" x2="222.73912" y2="520.74255" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6848" id="linearGradient5632" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.334164,0,0,1.334164,-90.28301,-537.514)" x1="296.20334" y1="571.52942" x2="220.84492" y2="421.62283" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient5634" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545558,0,0,0.350255,91.4834,-57.3926)" x1="139.62971" y1="520.74225" x2="222.73819" y2="520.74225" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6854" id="linearGradient5636" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.334164,0,0,1.334164,54.71699,-442.514)" x1="221.02206" y1="421.6228" x2="296.72556" y2="571.52942" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient5638" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545558,0,0,0.350255,236.4833,37.6074)" x1="139.43103" y1="520.74225" x2="222.73837" y2="520.74225" /> </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.70710678" inkscape:cx="471.58665" inkscape:cy="225.24686" inkscape:document-units="px" inkscape:current-layer="layer4" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1016" inkscape:window-height="689" inkscape:window-x="0" inkscape:window-y="25" inkscape:showpageshadow="true" showgrid="false" inkscape:grid-bbox="true" inkscape:guide-points="true" gridspacingx="5px" gridspacingy="5px" gridtolerance="2px" guidetolerance="2px" /> <metadata id="metadata7"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title>wxWidgets Logo</dc:title> <dc:date>May 7th 2006</dc:date> <dc:creator> <cc:Agent> <dc:title>Bryan Petty</dc:title> </cc:Agent> </dc:creator> <cc:license rdf:resource="http://web.resource.org/cc/PublicDomain" /> <dc:rights> <cc:Agent> <dc:title>Bryan Petty</dc:title> </cc:Agent> </dc:rights> </cc:Work> <cc:License rdf:about="http://web.resource.org/cc/PublicDomain"> <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" /> <cc:permits rdf:resource="http://web.resource.org/cc/Distribution" /> <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> </cc:License> </rdf:RDF> </metadata> <g inkscape:groupmode="layer" id="layer2" inkscape:label="Red" style="display:inline" transform="translate(-32.3098,-10.9441)" /> <g inkscape:groupmode="layer" id="layer3" inkscape:label="Blue" style="display:inline" transform="translate(-32.3098,-10.9441)"> <g id="g7440" inkscape:export-filename="/home/frm/Desktop/g5608.png" inkscape:export-xdpi="18.049999" inkscape:export-ydpi="18.049999"> <text transform="scale(0.995183,1.004841)" id="text3746" y="151.18968" x="440.81519" style="font-size:184.2870636px;font-style:normal;font-weight:normal;fill:#ec0000;fill-opacity:1;stroke:#eb0000;stroke-width:10.20000076;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:URW Chancery L" xml:space="preserve"><tspan style="font-style:normal;font-weight:normal;stroke:#eb0000;stroke-width:10.20000076;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" y="151.18968" x="440.81519" id="tspan3748" sodipodi:role="line">wx</tspan></text> <text transform="scale(0.995183,1.004841)" id="text3754" y="167.63525" x="635.54266" style="font-size:176.83982849px;font-style:normal;font-weight:normal;fill:#0000ec;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" xml:space="preserve"><tspan y="167.63525" x="635.54266" id="tspan3756" sodipodi:role="line">Lua</tspan></text> </g> <g id="g7446" transform="translate(2.400357,0)" inkscape:export-filename="/home/frm/Desktop/g5608.png" inkscape:export-xdpi="18.049999" inkscape:export-ydpi="18.049999"> <rect ry="23.439024" y="207.36308" x="448.50467" height="95.372581" width="476" id="rect4643" style="fill:#2b00f5;fill-opacity:1;stroke:none;stroke-width:4.67799997;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:50;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <text id="text4675" y="270.56958" x="488.15308" style="font-size:60.48600769px;font-style:normal;font-weight:bold;fill:white;fill-opacity:1;stroke:white;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans" xml:space="preserve"><tspan y="270.56958" x="488.15308" id="tspan4677" sodipodi:role="line">Easy Power</tspan></text> </g> </g> <g inkscape:groupmode="layer" id="layer4" inkscape:label="Yellow" transform="translate(-32.3098,-10.9441)"> <g id="g5577" transform="translate(200.8183,1.414197)"> <path transform="matrix(1.023771,0,0,1.023771,-37.97774,-90.6321)" d="M 194 279 A 160 160 0 1 1 -126,279 A 160 160 0 1 1 194 279 z" sodipodi:ry="160" sodipodi:rx="160" sodipodi:cy="279" sodipodi:cx="34" id="path2858" style="fill:none;stroke:black;stroke-width:2.99991989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.99991984, 8.99975952;stroke-dashoffset:0;stroke-opacity:1;display:inline" sodipodi:type="arc" /> <path transform="translate(-27.66953,8.500009)" d="M 171 186.5 A 146.5 146.5 0 1 1 -122,186.5 A 146.5 146.5 0 1 1 171 186.5 z" sodipodi:ry="146.5" sodipodi:rx="146.5" sodipodi:cy="186.5" sodipodi:cx="24.5" id="path2847" style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;display:inline" sodipodi:type="arc" /> <path transform="translate(-24.16953,21.00001)" d="M 63 174 A 42 84 0 1 1 -21,174 A 42 84 0 1 1 63 174 z" sodipodi:ry="84" sodipodi:rx="42" sodipodi:cy="174" sodipodi:cx="21" id="path2849" style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;display:inline" sodipodi:type="arc" /> <g transform="matrix(0.5,0,0,0.5,-134.4196,100)" id="g2051"> <path style="fill:url(#linearGradient5628);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" d="M 69.33962,154.99997 L 180.66039,154.99997 C 205.22454,154.99997 225,174.77544 225,199.33959 L 225,310.66037 C 225,335.22451 205.22454,354.99998 180.66039,354.99998 L 69.33962,354.99998 C 44.775476,354.99998 25,335.22451 25,310.66037 L 25,199.33959 C 25,174.77544 44.775476,154.99997 69.33962,154.99997 z " id="rect1393" /> <path style="opacity:0.25;fill:red;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="M 182.05654,230.00562 C 133.52565,230.53078 120.26069,286.69673 77.15765,287.25526 C 58.52185,287.49067 42.627272,274.70086 25.000051,259.55648 L 25.000051,311.20874 C 25.000051,335.45743 44.796904,355.00001 69.36112,354.99998 L 180.68067,354.99998 C 205.24489,354.99998 225.00005,335.45745 225.00005,311.20874 L 225.00005,240.95343 C 212.96769,234.34675 199.0342,229.81756 182.05654,230.00562 z " id="path2231" /> <rect style="fill:url(#linearGradient5630);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" id="rect3182" width="33" height="150" x="50" y="179.99998" ry="17.032595" rx="17.032595" /> <path style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:maroon;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" d="M 69.46811,161.34322 L 180.66022,161.34322 C 201.78838,161.34322 218.65712,178.22195 218.65712,199.34917 L 218.65712,310.66948 C 218.65712,331.80447 201.79163,348.657 180.66022,348.657 L 69.3399,348.657 C 48.208398,348.657 31.343,331.79658 31.343,310.66948 L 31.343,199.31104 C 31.343,178.17908 48.33351,161.34322 69.46811,161.34322 z " id="path37247" sodipodi:nodetypes="ccccccccc" /> <path style="fill:url(#linearGradient5632);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28099823;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.37647059;display:inline" d="M 199.33962,24.99998 L 310.6604,24.99998 C 335.22455,24.99998 355,44.77545 355,69.33958 L 355,180.66037 C 355,205.22451 335.22455,224.99998 310.6604,224.99998 L 199.33962,224.99998 C 174.77548,224.99998 155,205.22451 155,180.66037 L 155,69.33958 C 155,44.77545 174.77548,24.99998 199.33962,24.99998 z " id="path5922" /> <path style="opacity:0.25;fill:blue;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="M 312.05649,100.00562 C 263.5256,100.5308 250.26065,156.69674 207.1576,157.25527 C 188.52179,157.49067 172.62722,144.70086 155,129.55648 L 155,181.20875 C 155,205.45743 174.79685,225.00001 199.36106,224.99998 L 310.68063,224.99998 C 335.24483,224.99998 355,205.45745 355,181.20875 L 355,110.95344 C 342.96764,104.34675 329.03415,99.81756 312.05649,100.00562 z " id="path5924" /> <rect style="fill:url(#linearGradient5634);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" id="rect5926" width="33" height="150" x="180" y="49.999981" ry="17.032595" rx="17.032595" /> <path sodipodi:nodetypes="ccccccccc" id="path41636" d="M 199.46811,31.34322 L 310.66022,31.34322 C 331.78838,31.34322 348.65712,48.22195 348.65712,69.34917 L 348.65712,180.66948 C 348.65712,201.80447 331.79163,218.657 310.66022,218.657 L 199.3399,218.657 C 178.2084,218.657 161.343,201.79658 161.343,180.66948 L 161.343,69.31104 C 161.343,48.17908 178.33351,31.34322 199.46811,31.34322 z " style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:navy;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" /> <path style="fill:url(#linearGradient5636);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28144073;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.37647059;display:inline" d="M 344.33962,119.99997 L 455.66039,119.99997 C 480.22454,119.99997 500,139.77544 500,164.33959 L 500,275.66037 C 500,300.22451 480.22454,319.99998 455.66039,319.99998 L 344.33962,319.99998 C 319.77547,319.99998 300,300.22451 300,275.66037 L 300,164.33959 C 300,139.77544 319.77547,119.99997 344.33962,119.99997 z " id="path5936" /> <path style="opacity:0.25;fill:#c0c000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="M 457.05649,195.00562 C 408.5256,195.53079 395.26065,251.69673 352.1576,252.25526 C 333.52179,252.49067 317.62722,239.70086 300,224.55647 L 300,276.20875 C 300,300.45743 319.79685,320.00001 344.36106,319.99998 L 455.68063,319.99998 C 480.24484,319.99998 500,300.45745 500,276.20875 L 500,205.95343 C 487.96764,199.34674 474.03416,194.81756 457.05649,195.00562 z " id="path5938" /> <rect style="fill:url(#linearGradient5638);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" id="rect5940" width="33" height="150" x="325" y="144.99998" ry="17.032595" rx="17.032595" /> <path style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:olive;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" d="M 344.46811,126.34322 L 455.66022,126.34322 C 476.78838,126.34322 493.65712,143.22195 493.65712,164.34917 L 493.65712,275.66948 C 493.65712,296.80447 476.79163,313.657 455.66022,313.657 L 344.3399,313.657 C 323.2084,313.657 306.343,296.79658 306.343,275.66948 L 306.343,164.31104 C 306.343,143.17908 323.33351,126.34322 344.46811,126.34322 z " id="path42512" sodipodi:nodetypes="ccccccccc" /> </g> </g> <g id="g2250" transform="translate(-459.6194,226.2742)"> <circle transform="translate(673.1606,-250.3301)" id="circle2226" r="65" cy="100" cx="99" sodipodi:cx="99" sodipodi:cy="100" sodipodi:rx="65" sodipodi:ry="65" style="fill:navy" /> <circle transform="translate(673.1606,-250.3301)" id="circle2228" r="19" cy="73" cx="125" sodipodi:cx="125" sodipodi:cy="73" sodipodi:rx="19" sodipodi:ry="19" style="fill:white" /> <text id="text2232" font-size="60" font-weight="normal" y="-118.3301" x="722.16058" style="font-size:60px;font-weight:normal;fill:white;font-family:Arial">Lua</text> </g> </g> </svg> --- NEW FILE: logoonly.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="345.23141" height="350.80902" id="svg1925" sodipodi:version="0.32" inkscape:version="0.44" version="1.0" sodipodi:docbase="/home/frm/work/wxLua/art" sodipodi:docname="logoonly.svg"> <defs id="defs1927"> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient5638" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545558,0,0,0.350255,236.4833,37.6074)" x1="139.43103" y1="520.74225" x2="222.73837" y2="520.74225" /> <linearGradient id="linearGradient6854"> <stop style="stop-color:#ffffe0;stop-opacity:1;" offset="0" id="stop6856" /> <stop style="stop-color:#ffff00;stop-opacity:1;" offset="1" id="stop6858" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6854" id="linearGradient5636" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.334164,0,0,1.334164,54.71699,-442.514)" x1="221.02206" y1="421.6228" x2="296.72556" y2="571.52942" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient5634" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545558,0,0,0.350255,91.4834,-57.3926)" x1="139.62971" y1="520.74225" x2="222.73819" y2="520.74225" /> <linearGradient id="linearGradient6848"> <stop style="stop-color:#0000ff;stop-opacity:1;" offset="0" id="stop6850" /> <stop style="stop-color:#e0e0ff;stop-opacity:1;" offset="1" id="stop6852" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6848" id="linearGradient5632" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.334164,0,0,1.334164,-90.28301,-537.514)" x1="296.20334" y1="571.52942" x2="220.84492" y2="421.62283" /> <linearGradient id="linearGradient4073"> <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop4075" /> <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop4077" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient4073" id="linearGradient5630" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.545556,0,0,0.350255,-38.51666,72.6073)" x1="139.43112" y1="520.74255" x2="222.73912" y2="520.74255" /> <linearGradient id="linearGradient8721"> <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop12145" /> <stop id="stop8725" offset="1" style="stop-color:#ffe0e0;stop-opacity:1;" /> </linearGradient> <linearGradient inkscape:collect="always" xlink:href="#linearGradient8721" id="linearGradient5628" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.000031,0,0,1.000031,-45.00832,-319.1057)" x1="221.01576" y1="674.0849" x2="119.92342" y2="474.09103" /> </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="964" inkscape:window-height="608" inkscape:window-x="52" inkscape:window-y="25" /> <metadata id="metadata1930"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Livello 1" inkscape:groupmode="layer" id="layer1" transform="translate(-15.9557,-11.2434)"> <g id="g5577" transform="translate(184.4642,1.713451)" inkscape:export-filename="/home/frm/work/wxLua/art/wxlualogo.xpm" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> <path transform="matrix(1.023771,0,0,1.023771,-37.97774,-90.6321)" d="M 194 279 A 160 160 0 1 1 -126,279 A 160 160 0 1 1 194 279 z" sodipodi:ry="160" sodipodi:rx="160" sodipodi:cy="279" sodipodi:cx="34" id="path2858" style="fill:none;stroke:black;stroke-width:2.99991989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.99991984, 8.99975952;stroke-dashoffset:0;stroke-opacity:1;display:inline" sodipodi:type="arc" /> <path transform="translate(-27.66953,8.500009)" d="M 171 186.5 A 146.5 146.5 0 1 1 -122,186.5 A 146.5 146.5 0 1 1 171 186.5 z" sodipodi:ry="146.5" sodipodi:rx="146.5" sodipodi:cy="186.5" sodipodi:cx="24.5" id="path2847" style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;display:inline" sodipodi:type="arc" /> <path transform="translate(-24.16953,21.00001)" d="M 63 174 A 42 84 0 1 1 -21,174 A 42 84 0 1 1 63 174 z" sodipodi:ry="84" sodipodi:rx="42" sodipodi:cy="174" sodipodi:cx="21" id="path2849" style="fill:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;display:inline" sodipodi:type="arc" /> <g transform="matrix(0.5,0,0,0.5,-134.4196,100)" id="g2051"> <path style="fill:url(#linearGradient5628);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" d="M 69.33962,154.99997 L 180.66039,154.99997 C 205.22454,154.99997 225,174.77544 225,199.33959 L 225,310.66037 C 225,335.22451 205.22454,354.99998 180.66039,354.99998 L 69.33962,354.99998 C 44.775476,354.99998 25,335.22451 25,310.66037 L 25,199.33959 C 25,174.77544 44.775476,154.99997 69.33962,154.99997 z " id="rect1393" /> <path style="opacity:0.25;fill:red;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="M 182.05654,230.00562 C 133.52565,230.53078 120.26069,286.69673 77.15765,287.25526 C 58.52185,287.49067 42.627272,274.70086 25.000051,259.55648 L 25.000051,311.20874 C 25.000051,335.45743 44.796904,355.00001 69.36112,354.99998 L 180.68067,354.99998 C 205.24489,354.99998 225.00005,335.45745 225.00005,311.20874 L 225.00005,240.95343 C 212.96769,234.34675 199.0342,229.81756 182.05654,230.00562 z " id="path2231" /> <rect style="fill:url(#linearGradient5630);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" id="rect3182" width="33" height="150" x="50" y="179.99998" ry="17.032595" rx="17.032595" /> <path style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:maroon;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" d="M 69.46811,161.34322 L 180.66022,161.34322 C 201.78838,161.34322 218.65712,178.22195 218.65712,199.34917 L 218.65712,310.66948 C 218.65712,331.80447 201.79163,348.657 180.66022,348.657 L 69.3399,348.657 C 48.208398,348.657 31.343,331.79658 31.343,310.66948 L 31.343,199.31104 C 31.343,178.17908 48.33351,161.34322 69.46811,161.34322 z " id="path37247" sodipodi:nodetypes="ccccccccc" /> <path style="fill:url(#linearGradient5632);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28099823;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.37647059;display:inline" d="M 199.33962,24.99998 L 310.6604,24.99998 C 335.22455,24.99998 355,44.77545 355,69.33958 L 355,180.66037 C 355,205.22451 335.22455,224.99998 310.6604,224.99998 L 199.33962,224.99998 C 174.77548,224.99998 155,205.22451 155,180.66037 L 155,69.33958 C 155,44.77545 174.77548,24.99998 199.33962,24.99998 z " id="path5922" /> <path style="opacity:0.25;fill:blue;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="M 312.05649,100.00562 C 263.5256,100.5308 250.26065,156.69674 207.1576,157.25527 C 188.52179,157.49067 172.62722,144.70086 155,129.55648 L 155,181.20875 C 155,205.45743 174.79685,225.00001 199.36106,224.99998 L 310.68063,224.99998 C 335.24483,224.99998 355,205.45745 355,181.20875 L 355,110.95344 C 342.96764,104.34675 329.03415,99.81756 312.05649,100.00562 z " id="path5924" /> <rect style="fill:url(#linearGradient5634);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" id="rect5926" width="33" height="150" x="180" y="49.999981" ry="17.032595" rx="17.032595" /> <path sodipodi:nodetypes="ccccccccc" id="path41636" d="M 199.46811,31.34322 L 310.66022,31.34322 C 331.78838,31.34322 348.65712,48.22195 348.65712,69.34917 L 348.65712,180.66948 C 348.65712,201.80447 331.79163,218.657 310.66022,218.657 L 199.3399,218.657 C 178.2084,218.657 161.343,201.79658 161.343,180.66948 L 161.343,69.31104 C 161.343,48.17908 178.33351,31.34322 199.46811,31.34322 z " style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:navy;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" /> <path style="fill:url(#linearGradient5636);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:38.28144073;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.37647059;display:inline" d="M 344.33962,119.99997 L 455.66039,119.99997 C 480.22454,119.99997 500,139.77544 500,164.33959 L 500,275.66037 C 500,300.22451 480.22454,319.99998 455.66039,319.99998 L 344.33962,319.99998 C 319.77547,319.99998 300,300.22451 300,275.66037 L 300,164.33959 C 300,139.77544 319.77547,119.99997 344.33962,119.99997 z " id="path5936" /> <path style="opacity:0.25;fill:#c0c000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" d="M 457.05649,195.00562 C 408.5256,195.53079 395.26065,251.69673 352.1576,252.25526 C 333.52179,252.49067 317.62722,239.70086 300,224.55647 L 300,276.20875 C 300,300.45743 319.79685,320.00001 344.36106,319.99998 L 455.68063,319.99998 C 480.24484,319.99998 500,300.45745 500,276.20875 L 500,205.95343 C 487.96764,199.34674 474.03416,194.81756 457.05649,195.00562 z " id="path5938" /> <rect style="fill:url(#linearGradient5638);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.25098039;display:inline" id="rect5940" width="33" height="150" x="325" y="144.99998" ry="17.032595" rx="17.032595" /> <path style="opacity:1;fill:none;fill-opacity:0.50196078;fill-rule:nonzero;stroke:olive;stroke-width:12.68599987;stroke-linecap:butt;stroke-linejoin:round;marker-start:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.50196078;display:inline" d="M 344.46811,126.34322 L 455.66022,126.34322 C 476.78838,126.34322 493.65712,143.22195 493.65712,164.34917 L 493.65712,275.66948 C 493.65712,296.80447 476.79163,313.657 455.66022,313.657 L 344.3399,313.657 C 323.2084,313.657 306.343,296.79658 306.343,275.66948 L 306.343,164.31104 C 306.343,143.17908 323.33351,126.34322 344.46811,126.34322 z " id="path42512" sodipodi:nodetypes="ccccccccc" /> </g> </g> <g id="g2250" transform="translate(-475.9735,226.5735)" inkscape:export-filename="/home/frm/work/wxLua/art/wxlualogo.xpm" inkscape:export-xdpi="72" inkscape:export-ydpi="72"> <circle transform="translate(673.1606,-250.3301)" id="circle2226" r="65" cy="100" cx="99" sodipodi:cx="99" sodipodi:cy="100" sodipodi:rx="65" sodipodi:ry="65" style="fill:navy" /> <circle transform="translate(673.1606,-250.3301)" id="circle2228" r="19" cy="73" cx="125" sodipodi:cx="125" sodipodi:cy="73" sodipodi:rx="19" sodipodi:ry="19" style="fill:white" /> <text id="text2232" font-size="60" font-weight="normal" y="-118.3301" x="722.16058" style="font-size:60px;font-weight:normal;fill:white;font-family:Arial">Lua</text> </g> </g> </svg> Index: wxlualarge.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxlualarge.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvshPkrHA and /tmp/cvsuADB2Q differ Index: wxluasmall.xpm =================================================================== RCS file: /cvsroot/wxlua/wxLua/art/wxluasmall.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsCRF87H and /tmp/cvsEZHzYY differ --- NEW FILE: wxlualogo.xpm --- (This appears to be a binary file; contents omitted.) |
|
From: Francesco M. <fr...@us...> - 2006-12-24 11:00:29
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3034/build/bakefiles Modified Files: wxlua.bkl Log Message: updated icons with updated logo; updated build system to also uninstall the installed desktop,icons,etc Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxlua.bkl 19 Dec 2006 21:28:20 -0000 1.32 --- wxlua.bkl 24 Dec 2006 11:00:21 -0000 1.33 *************** *** 120,146 **** <!-- ================================================================== --> ! <template id="srcstuff"> ! <dependency-of>install</dependency-of> ! <srcdir>$(top_srcdir)</srcdir> ! </template> ! <!-- targets mainly required for autopackage creation --> ! <copy-files id="samples" template="srcstuff" cond="TARGETING_UNIX=='1'"> ! <dstdir>$(DESTDIR)$(DATADIR)/wxlua/samples</dstdir> ! <files>$(fileList([ 'samples/*.wx.lua', 'samples/*.xrc' ]))</files> ! </copy-files> ! <copy-files id="desktop" template="srcstuff" cond="TARGETING_UNIX=='1'"> ! <dstdir>$(DESTDIR)$(DATADIR)/applications</dstdir> ! <files>distrib/autopackage/wxlua.desktop</files> ! </copy-files> ! <copy-files id="mime" template="srcstuff" cond="TARGETING_UNIX=='1'"> ! <dstdir>$(DESTDIR)$(DATADIR)/mime/packages</dstdir> ! <files>distrib/autopackage/wxlua.xml</files> ! </copy-files> ! <copy-files id="icon" template="srcstuff" cond="TARGETING_UNIX=='1'"> ! <dstdir>$(DESTDIR)$(DATADIR)/pixmaps</dstdir> ! <files>art/wxlua.xpm</files> ! </copy-files> --- 120,157 ---- <!-- ================================================================== --> ! <if cond="TARGETING_UNIX=='1'"> ! <template id="srcstuff"> ! <dependency-of>install</dependency-of> ! <srcdir>$(top_srcdir)</srcdir> ! </template> + <!-- targets mainly required for autopackage creation --> + <copy-files id="samples" template="srcstuff"> + <dstdir>$(DESTDIR)$(DATADIR)/wxlua/samples</dstdir> + <files>$(fileList([ 'samples/*.wx.lua', 'samples/*.xrc' ]))</files> + </copy-files> + <copy-files id="desktop" template="srcstuff"> + <dstdir>$(DESTDIR)$(DATADIR)/applications</dstdir> + <files>distrib/autopackage/wxlua.desktop</files> + </copy-files> + <copy-files id="mime" template="srcstuff"> + <dstdir>$(DESTDIR)$(DATADIR)/mime/packages</dstdir> + <files>distrib/autopackage/wxlua.xml</files> + </copy-files> + <copy-files id="icon" template="srcstuff"> + <dstdir>$(DESTDIR)$(DATADIR)/pixmaps</dstdir> + <files>art/wxlualogo.xpm</files> + </copy-files> + + <!-- also uninstall stuff installed above --> + <modify-target target="uninstall"> + <command>rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/wxlua.pc</command> + <command>rm -rf $(DESTDIR)$(DATADIR)/wxlua</command> + <command>rm -f $(DESTDIR)$(DATADIR)/applications/wxlua.desktop</command> + <command>rm -f $(DESTDIR)$(DATADIR)/mime/packages/wxlua.xml</command> + <command>rm -f $(DESTDIR)$(DATADIR)/pixmaps/wxlualogo.xpm</command> + </modify-target> + </if> |
|
From: Francesco M. <fr...@us...> - 2006-12-24 11:00:28
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3034/distrib/autopackage Modified Files: default.apspec.in wxlua.desktop wxlua.xml Log Message: updated icons with updated logo; updated build system to also uninstall the installed desktop,icons,etc Index: wxlua.xml =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/wxlua.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.xml 10 Dec 2006 18:04:25 -0000 1.1 --- wxlua.xml 24 Dec 2006 11:00:22 -0000 1.2 *************** *** 6,10 **** <alias type="text/lua" /> ! <apkg:icon>wxlua.xpm</apkg:icon> </mime-type> </mime-info> \ No newline at end of file --- 6,10 ---- <alias type="text/lua" /> ! <apkg:icon>wxlualogo.xpm</apkg:icon> </mime-type> </mime-info> \ No newline at end of file Index: default.apspec.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/default.apspec.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** default.apspec.in 10 Dec 2006 18:04:25 -0000 1.1 --- default.apspec.in 24 Dec 2006 11:00:22 -0000 1.2 *************** *** 15,22 **** AutopackageTarget: 1.2 PackageFileName: $SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package - Compression: bzip2 - - [Description] - wxLua is a set of bindings to wxWidgets for the Lua language. With wxLua you can write programs in Lua that use the wxWidgets cross-platform GUI library to develop and deliver your software with the programming ease of an interpreted language like Lua. [BuildPrepare] --- 15,18 ---- *************** *** 36,41 **** [Prepare] # only wxGTK required: lua and wxStEdit are statically built in ! require @wxwidgets.org/wxgtk 26.0 [Install] --- 32,46 ---- [Prepare] + require @gtk.org/gtk 2.0 + # only wxGTK required: lua and wxStEdit are statically built in ! # NOTE: currently wxAutopackage does not provide STC stuff so we link ! # statically to all wxWidgets (STC cannot be built statically ! # against a shared build of wx) ! ##require @wxwidgets.org/wxgtk 26.0 ! ! # remove the wxLua RPM/DEB/other native package format if installed ! removeOwningPackage $PREFIX/bin/wxlua ! [Install] *************** *** 44,48 **** installIcon share/pixmaps/wxlua.xpm installMime share/mime/packages/wxlua.xml ! installDesktop "Development" share/applications/wxlua.desktop [Uninstall] --- 49,53 ---- installIcon share/pixmaps/wxlua.xpm installMime share/mime/packages/wxlua.xml ! installMenuItem "Development" share/applications/wxlua.desktop [Uninstall] Index: wxlua.desktop =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/wxlua.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.desktop 10 Dec 2006 18:04:25 -0000 1.1 --- wxlua.desktop 24 Dec 2006 11:00:22 -0000 1.2 *************** *** 8,11 **** MimeType=application/lua; Categories=Application;Development; ! Icon=wxlua.xpm X-GNOME-DocPath= \ No newline at end of file --- 8,11 ---- MimeType=application/lua; Categories=Application;Development; ! Icon=wxlualogo.xpm X-GNOME-DocPath= \ No newline at end of file |
|
From: Francesco M. <fr...@us...> - 2006-12-24 11:00:28
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3034 Modified Files: Makefile.in Log Message: updated icons with updated logo; updated build system to also uninstall the installed desktop,icons,etc Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 17 Dec 2006 10:47:41 -0000 1.20 --- Makefile.in 24 Dec 2006 11:00:20 -0000 1.21 *************** *** 38,41 **** --- 38,46 ---- uninstall: uninstall_modules $(__uninstall_apps___depname) + rm -f $(DESTDIR)$(libdir)/pkgconfig/wxlua.pc + rm -rf $(DESTDIR)$(datadir)/wxlua + rm -f $(DESTDIR)$(datadir)/applications/wxlua.desktop + rm -f $(DESTDIR)$(datadir)/mime/packages/wxlua.xml + rm -f $(DESTDIR)$(datadir)/pixmaps/wxlualogo.xpm install-strip: install install-strip_modules $(__install_strip_apps___depname) *************** *** 122,126 **** icon: @mkdir -p $(DESTDIR)$(datadir)/pixmaps ! @for f in art/wxlua.xpm; do \ if test ! -f $(DESTDIR)$(datadir)/pixmaps/$$f -a ! -d $(DESTDIR)$(datadir)/pixmaps/$$f ; \ then x=yep ; \ --- 127,131 ---- icon: @mkdir -p $(DESTDIR)$(datadir)/pixmaps ! @for f in art/wxlualogo.xpm; do \ if test ! -f $(DESTDIR)$(datadir)/pixmaps/$$f -a ! -d $(DESTDIR)$(datadir)/pixmaps/$$f ; \ then x=yep ; \ |
|
From: Francesco M. <fr...@us...> - 2006-12-24 09:56:26
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10645 Modified Files: changelog.txt Log Message: mention Mac improvements; added date for 2.8.0.0 release Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** changelog.txt 20 Dec 2006 16:39:44 -0000 1.21 --- changelog.txt 24 Dec 2006 09:56:23 -0000 1.22 *************** *** 3,7 **** =============== ! version 2.8.0.0 -------------------------------------------------------------------- --- 3,7 ---- =============== ! version 2.8.0.0 (released 24/12/2006) -------------------------------------------------------------------- *************** *** 51,60 **** and what is for making wxLua distributions - Added PCH support ! - Now builds with different configurations are fully supported: both the build directory and the output folders for the libraries and for the binaries are named with the chosen configuration so that there should be no clashes when compiling wxLua with different settings. ! - Now it's possible to build wxLua against a "system" lua using the ! --with-lua-prefix configure's option or LUA_DIR option. --- 51,62 ---- and what is for making wxLua distributions - Added PCH support ! - Builds with different configurations are fully supported: both the build directory and the output folders for the libraries and for the binaries are named with the chosen configuration so that there should be no clashes when compiling wxLua with different settings. ! - Added the --with-lua-prefix configure's option or LUA_DIR option to allow ! to use an external LUA library for building wxLua. ! - Building under wxMac has been greatly improved thanks to Anders F Björklund; ! release 2.8.0.0 also includes a Mac bundle. |
|
From: Francesco M. <fr...@us...> - 2006-12-24 09:46:23
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6800 Modified Files: makeautopackage Log Message: fixed AP make script Index: makeautopackage =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/autopackage/makeautopackage,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makeautopackage 17 Dec 2006 10:32:31 -0000 1.1 --- makeautopackage 24 Dec 2006 09:46:19 -0000 1.2 *************** *** 4,12 **** # main dir after you ran configure there ! mkdir toupload ! rm upload/*.xml upload/*.meta upload/*.package ! cd ../../.. ! makeinstaller $@ build/autopackage/default.apspec ! mv *.xml *.meta *.package build/autopackage/toupload ! cd build/autopackage --- 4,13 ---- # 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 ! fi |
|
From: Francesco M. <fr...@us...> - 2006-12-23 11:21:36
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11023/apps Modified Files: Makefile.in Log Message: fixed Rez command to work on the generated binaries (fix bakefile bug) Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** Makefile.in 23 Dec 2006 11:10:52 -0000 1.51 --- Makefile.in 23 Dec 2006 11:21:30 -0000 1.52 *************** *** 103,107 **** 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 \ ! wxlua$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxlua___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ --- 103,107 ---- 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 \ ! $(top_builddir)/bin/wxlua$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxlua___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ *************** *** 122,126 **** 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 \ ! wxluaedit$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ --- 122,126 ---- 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 \ ! $(top_builddir)/bin/wxluaedit$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ *************** *** 141,146 **** 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 \ ! $(top_srcdir)/modules/wxbind/setup -o wxluacan$(EXEEXT) \ ! $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluacan___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ --- 141,146 ---- 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 \ ! $(top_srcdir)/modules/wxbind/setup -o \ ! $(top_builddir)/bin/wxluacan$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluacan___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ *************** *** 160,164 **** 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 \ ! wxluafreeze$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxluafreeze___os2_emxbindcmd = $(NM) \ --- 160,164 ---- 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 \ ! $(top_builddir)/bin/wxluafreeze$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd) COND_PLATFORM_OS2_1___app_wxluafreeze___os2_emxbindcmd = $(NM) \ |
|
From: Francesco M. <fr...@us...> - 2006-12-23 11:10:59
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/apps/build/bakefiles Modified Files: apps.bkl Log Message: other mac bundle fixes as noted by Anders Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** apps.bkl 22 Dec 2006 20:45:06 -0000 1.48 --- apps.bkl 23 Dec 2006 11:10:52 -0000 1.49 *************** *** 71,76 **** <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> - - <wx-mac-app-bundle/> </template> --- 71,74 ---- *************** *** 123,126 **** --- 121,126 ---- <mac-res>$(WXLUA_BASEDIR)/art/wxlua.r</mac-res> + <wx-mac-app-bundle>wxLua</wx-mac-app-bundle> + <wxlua-alllibs/> <wx-lib>stc</wx-lib> *************** *** 140,143 **** --- 140,145 ---- <mac-res>$(WXLUA_BASEDIR)/art/wxlua.r</mac-res> + <wx-mac-app-bundle>wxLuaEdit</wx-mac-app-bundle> + <!-- Path to wxStedit headers & libs --> <if cond="TARGETING_WIN32=='1'"> *************** *** 169,172 **** --- 171,176 ---- <mac-res>$(WXLUA_BASEDIR)/art/wxlua.r</mac-res> + <wx-mac-app-bundle>wxLuaCan</wx-mac-app-bundle> + <!-- This app requires wxluasetup.h path --> <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> *************** *** 188,191 **** --- 192,197 ---- <mac-res>$(WXLUA_BASEDIR)/art/wxlua.r</mac-res> + <wx-mac-app-bundle>wxLuaFreeze</wx-mac-app-bundle> + <wxlua-allstdlibs/> <wx-alllibs-req-bywxlua/> |
|
From: Francesco M. <fr...@us...> - 2006-12-23 11:10:59
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/apps Modified Files: Makefile.in Log Message: other mac bundle fixes as noted by Anders Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Makefile.in 22 Dec 2006 20:45:05 -0000 1.50 --- Makefile.in 23 Dec 2006 11:10:52 -0000 1.51 *************** *** 35,39 **** WX_LIBS = @WX_LIBS@ WX_RESCOMP = @WX_RESCOMP@ - WX_VERSION = @WX_VERSION@ WX_PORT = @WX_PORT@ WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ --- 35,38 ---- *************** *** 114,119 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ uninstall_app_wxlua - @COND_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ --- 113,118 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @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_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ *************** *** 132,139 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit - @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ - @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) --- 131,138 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o + @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) *************** *** 171,178 **** @COND_USE_WXLUAFREEZEAPP_1@__uninstall_app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = uninstall_app_wxluafreeze - @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ - @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o ### Targets: ### --- 170,177 ---- @COND_USE_WXLUAFREEZEAPP_1@__uninstall_app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = uninstall_app_wxluafreeze @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o + @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle ### Targets: ### *************** *** 196,206 **** rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) ! rm -rf app_wxlua.app rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) ! rm -rf app_wxluaedit.app rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) ! rm -rf app_wxluacan.app rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) ! rm -rf app_wxluafreeze.app distclean: clean --- 195,205 ---- rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) ! rm -rf wxLua.app rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) ! rm -rf wxLuaEdit.app rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) ! rm -rf wxLuaCan.app rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) ! rm -rf wxLuaFreeze.app distclean: clean *************** *** 232,256 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! app_wxlua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxlua.app/Contents ! mkdir -p app_wxlua.app/Contents/MacOS ! mkdir -p app_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/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxlua.app/Contents/Info.plist ! echo -n "APPL????" >app_wxlua.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxlua$(EXEEXT) app_wxlua.app/Contents/MacOS/app_wxlua ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxlua.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: app_wxlua.app/Contents/PkgInfo @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) --- 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) *************** *** 267,291 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! app_wxluaedit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxluaedit.app/Contents ! mkdir -p app_wxluaedit.app/Contents/MacOS ! mkdir -p app_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/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluaedit.app/Contents/Info.plist ! echo -n "APPL????" >app_wxluaedit.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) app_wxluaedit.app/Contents/MacOS/app_wxluaedit ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluaedit.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: app_wxluaedit.app/Contents/PkgInfo @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___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) *************** *** 302,326 **** @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! app_wxluacan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxluacan.app/Contents ! mkdir -p app_wxluacan.app/Contents/MacOS ! mkdir -p app_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/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluacan.app/Contents/Info.plist ! echo -n "APPL????" >app_wxluacan.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) app_wxluacan.app/Contents/MacOS/app_wxluacan ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluacan.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: app_wxluacan.app/Contents/PkgInfo @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___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) *************** *** 337,361 **** @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_wxluafreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxluafreeze.app/Contents ! mkdir -p app_wxluafreeze.app/Contents/MacOS ! mkdir -p app_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/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluafreeze.app/Contents/Info.plist ! echo -n "APPL????" >app_wxluafreeze.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) app_wxluafreeze.app/Contents/MacOS/app_wxluafreeze ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluafreeze.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: app_wxluafreeze.app/Contents/PkgInfo app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c --- 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 |
|
From: Francesco M. <fr...@us...> - 2006-12-23 11:10:59
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/build/bakefiles Modified Files: mac_bundles.bkl Log Message: other mac bundle fixes as noted by Anders Index: mac_bundles.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/mac_bundles.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mac_bundles.bkl 22 Dec 2006 20:45:07 -0000 1.1 --- mac_bundles.bkl 23 Dec 2006 11:10:52 -0000 1.2 *************** *** 4,7 **** --- 4,19 ---- <makefile> + + <!-- + NOTE: this file is mostly a copy&paste of the mac_bundles.bkl file + from wxWidgets bakefiles. + The following modifications were done: + -> added BUNDLE_DIR, BUNDLE_VERSION and BUNDLE_ICONS_FILENAME + -> make <wx-mac-app-bundle> tag do nothing when FORMAT!=autoconf + -> use $(value) inside <wx-mac-app-bundle> to define the + directory .app to create + --> + + <if cond="FORMAT=='autoconf'"> *************** *** 13,16 **** --- 25,32 ---- $(top_srcdir)/distrib/macbundle </set> + + <set var="BUNDLE_VERSION"> + $(WXLUA_VERSION) + </set> <set var="BUNDLE_ICONS_FILENAME"> *************** *** 22,26 **** </set> <set var="BUNDLE_ICONS"> ! $(BUNDLE_PLIST)/$(BUNDLE_ICONS_FILENAME) </set> --- 38,42 ---- </set> <set var="BUNDLE_ICONS"> ! $(BUNDLE_DIR)/$(BUNDLE_ICONS_FILENAME) </set> *************** *** 46,50 **** <!-- bundle directory: --> ! <set var="BUNDLE">$(id).app/Contents</set> <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set> <set var="BUNDLE_TGT_REF"> --- 62,66 ---- <!-- bundle directory: --> ! <set var="BUNDLE">$(value).app/Contents</set> <set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set> <set var="BUNDLE_TGT_REF"> *************** *** 68,72 **** sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \ -e "s/EXECUTABLE/$(id)/" \ ! -e "s/VERSION/$(WX_VERSION)/" \ $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist --- 84,88 ---- sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \ -e "s/EXECUTABLE/$(id)/" \ ! -e "s/VERSION/$(BUNDLE_VERSION)/" \ $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist *************** *** 92,96 **** <!-- "make clean" should delete the bundle: --> <modify-target target="clean"> ! <command>rm -rf $(id).app</command> </modify-target> --- 108,112 ---- <!-- "make clean" should delete the bundle: --> <modify-target target="clean"> ! <command>rm -rf $(value).app</command> </modify-target> *************** *** 100,106 **** <if cond="FORMAT!='autoconf'"> ! <define-tag name="wx-mac-app-bundle" rules="exe"/> ! </if> --- 116,123 ---- <if cond="FORMAT!='autoconf'"> ! ! <!-- just do nothing --> <define-tag name="wx-mac-app-bundle" rules="exe"/> ! </if> |
|
From: Francesco M. <fr...@us...> - 2006-12-23 11:10:59
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/build/autoconf Modified Files: configure.ac Log Message: other mac bundle fixes as noted by Anders Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** configure.ac 21 Dec 2006 16:53:27 -0000 1.36 --- configure.ac 23 Dec 2006 11:10:52 -0000 1.37 *************** *** 320,324 **** AM_SET_WXLIKE_LIBNAME([wx], [stedit]) - AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h], [$WXLIKE_LIBNAME], [wxSTEditor dummy;], [$minversion], --- 320,323 ---- *************** *** 329,335 **** 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 AM_SET_WXBUILD_STR --- 328,332 ---- |
|
From: Francesco M. <fr...@us...> - 2006-12-23 11:10:59
|
Update of /cvsroot/wxlua/wxLua/distrib/macbundle In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/distrib/macbundle Modified Files: Info.plist.in Log Message: other mac bundle fixes as noted by Anders Index: Info.plist.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/distrib/macbundle/Info.plist.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Info.plist.in 22 Dec 2006 20:45:08 -0000 1.1 --- Info.plist.in 23 Dec 2006 11:10:52 -0000 1.2 *************** *** 6,10 **** <string>6.0</string> <key>CFBundleIdentifier</key> ! <string>org.wxwindows.IDENTIFIER</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> --- 6,10 ---- <string>6.0</string> <key>CFBundleIdentifier</key> ! <string>net.sourceforge.wxlua.IDENTIFIER</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> *************** *** 12,16 **** <string>EXECUTABLE</string> <key>CFBundleIconFile</key> ! <string>wxmac.icns</string> <key>CFBundleName</key> <string>EXECUTABLE</string> --- 12,16 ---- <string>EXECUTABLE</string> <key>CFBundleIconFile</key> ! <string>wxLua.icns</string> <key>CFBundleName</key> <string>EXECUTABLE</string> |
|
From: John L. <jr...@us...> - 2006-12-23 06:16:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23513/wxLua/modules/wxbind/src Modified Files: gdi.cpp Log Message: compilation fix for wxGLXXX update to 2.8 Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** gdi.cpp 23 Dec 2006 05:58:15 -0000 1.41 --- gdi.cpp 23 Dec 2006 06:16:20 -0000 1.42 *************** *** 10454,10460 **** #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_SetCurrent[] = { &s_wxluatag_wxGLContext, 0 }; ! // %wxchkver28 void SetCurrent(const wxGLContext& RC) const ! static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L) { wxLuaState wxlState(L); --- 10454,10460 ---- #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_SetCurrentContext[] = { &s_wxluatag_wxGLContext, 0 }; ! // %wxchkver28 %rename SetCurrentContext void SetCurrent(const wxGLContext& RC) const ! static int LUACALL wxLua_wxGLCanvas_SetCurrentContext(lua_State *L) { wxLuaState wxlState(L); *************** *** 10548,10552 **** #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! { LuaMethod, "SetCurrent", wxLua_wxGLCanvas_SetCurrent, 1, 1, s_wxluatagArray_wxLua_wxGLCanvas_SetCurrent }, #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) --- 10548,10552 ---- #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! { LuaMethod, "SetCurrentContext", wxLua_wxGLCanvas_SetCurrentContext, 1, 1, s_wxluatagArray_wxLua_wxGLCanvas_SetCurrentContext }, #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) |
|
From: John L. <jr...@us...> - 2006-12-23 06:16:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23513/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: compilation fix for wxGLXXX update to 2.8 Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlbind.h 19 Dec 2006 21:12:03 -0000 1.33 --- wxlbind.h 23 Dec 2006 06:16:20 -0000 1.34 *************** *** 271,275 **** void operator = (int *intArr) { m_intArr = intArr; } ! operator const int *() const { return m_intArr; } private: --- 271,275 ---- void operator = (int *intArr) { m_intArr = intArr; } ! operator int *() { return m_intArr; } private: |
|
From: John L. <jr...@us...> - 2006-12-23 06:16:23
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23513/wxLua/bindings/wxwidgets Modified Files: gdi.i Log Message: compilation fix for wxGLXXX update to 2.8 Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** gdi.i 23 Dec 2006 05:58:14 -0000 1.34 --- gdi.i 23 Dec 2006 06:16:19 -0000 1.35 *************** *** 1250,1254 **** wxGLContext* GetContext() const void SetCurrent() ! %wxchkver28 void SetCurrent(const wxGLContext& RC) const void SetColour(const wxString& colour) void SwapBuffers() --- 1250,1254 ---- wxGLContext* GetContext() const void SetCurrent() ! %wxchkver28 %rename SetCurrentContext void SetCurrent(const wxGLContext& RC) const void SetColour(const wxString& colour) void SwapBuffers() |
|
From: John L. <jr...@us...> - 2006-12-23 05:58:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16521/wxLua/modules/wxbind/src Modified Files: gdi.cpp Log Message: update wxGLXXX for 2.8 Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** gdi.cpp 19 Dec 2006 06:18:02 -0000 1.40 --- gdi.cpp 23 Dec 2006 05:58:15 -0000 1.41 *************** *** 10413,10419 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvasFromCCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLCanvas, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, 0 }; ! // %constructor wxGLCanvasFromCCanvas wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! static int LUACALL wxLua_wxGLCanvasFromCCanvas_constructor(lua_State *L) { wxLuaState wxlState(L); --- 10413,10419 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvasFromCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLCanvas, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, 0 }; ! // %constructor wxGLCanvasFromCanvas wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! static int LUACALL wxLua_wxGLCanvasFromCanvas_constructor(lua_State *L) { wxLuaState wxlState(L); *************** *** 10452,10457 **** #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_GetContext[] = { 0 }; ! // wxGLContext* GetContext() static int LUACALL wxLua_wxGLCanvas_GetContext(lua_State *L) { --- 10452,10476 ---- #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette)) && (wxLUA_USE_wxPointSizeRect) + + #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_SetCurrent[] = { &s_wxluatag_wxGLContext, 0 }; + // %wxchkver28 void SetCurrent(const wxGLContext& RC) const + static int LUACALL wxLua_wxGLCanvas_SetCurrent(lua_State *L) + { + wxLuaState wxlState(L); + // const wxGLContext RC + const wxGLContext * RC = (const wxGLContext *)wxlState.GetUserDataType(2, s_wxluatag_wxGLContext); + // get this + wxGLCanvas * self = (wxGLCanvas *)wxlState.GetUserDataType(1, s_wxluatag_wxGLCanvas); + // call SetCurrent + self->SetCurrent(*RC); + + return 0; + } + + #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_GetContext[] = { 0 }; ! // wxGLContext* GetContext() const static int LUACALL wxLua_wxGLCanvas_GetContext(lua_State *L) { *************** *** 10524,10530 **** { LuaConstructor, "wxGLCanvas", wxLua_wxGLCanvas_constructor, 8, 1, s_wxluatagArray_wxLua_wxGLCanvas_constructor }, { LuaConstructor, "wxGLCanvasFromContext", wxLua_wxGLCanvasFromContext_constructor, 9, 2, s_wxluatagArray_wxLua_wxGLCanvasFromContext_constructor }, ! { LuaConstructor, "wxGLCanvasFromCCanvas", wxLua_wxGLCanvasFromCCanvas_constructor, 9, 2, s_wxluatagArray_wxLua_wxGLCanvasFromCCanvas_constructor }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette)) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetContext", wxLua_wxGLCanvas_GetContext, 0, 0, s_wxluatagArray_wxLua_wxGLCanvas_GetContext }, { LuaMethod, "SetCurrent", wxLua_wxGLCanvas_SetCurrent, 0, 0, s_wxluatagArray_wxLua_wxGLCanvas_SetCurrent }, --- 10543,10554 ---- { LuaConstructor, "wxGLCanvas", wxLua_wxGLCanvas_constructor, 8, 1, s_wxluatagArray_wxLua_wxGLCanvas_constructor }, { LuaConstructor, "wxGLCanvasFromContext", wxLua_wxGLCanvasFromContext_constructor, 9, 2, s_wxluatagArray_wxLua_wxGLCanvasFromContext_constructor }, ! { LuaConstructor, "wxGLCanvasFromCanvas", wxLua_wxGLCanvasFromCanvas_constructor, 9, 2, s_wxluatagArray_wxLua_wxGLCanvasFromCanvas_constructor }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette)) && (wxLUA_USE_wxPointSizeRect) + + #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) + { LuaMethod, "SetCurrent", wxLua_wxGLCanvas_SetCurrent, 1, 1, s_wxluatagArray_wxLua_wxGLCanvas_SetCurrent }, + #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) + { LuaMethod, "GetContext", wxLua_wxGLCanvas_GetContext, 0, 0, s_wxluatagArray_wxLua_wxGLCanvas_GetContext }, { LuaMethod, "SetCurrent", wxLua_wxGLCanvas_SetCurrent, 0, 0, s_wxluatagArray_wxLua_wxGLCanvas_SetCurrent }, *************** *** 10547,10553 **** ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette) static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_constructor[] = { &s_wxluaarg_Boolean, &s_wxluatag_wxGLCanvas, &s_wxluatag_wxPalette, 0 }; ! // wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { --- 10571,10638 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_GetWindow[] = { 0 }; ! // !%wxchkver28 const wxWindow* GetWindow() ! static int LUACALL wxLua_wxGLContext_GetWindow(lua_State *L) ! { ! wxLuaState wxlState(L); ! const wxWindow *returns; ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call GetWindow ! returns = self->GetWindow(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SetCurrent[] = { 0 }; ! // !%wxchkver28 void SetCurrent() ! static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call SetCurrent ! self->SetCurrent(); ! ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SetColour[] = { &s_wxluaarg_String, 0 }; ! // !%wxchkver28 void SetColour(const wxString& colour) ! static int LUACALL wxLua_wxGLContext_SetColour(lua_State *L) ! { ! wxLuaState wxlState(L); ! // const wxString colour ! const wxString colour = lua2wx(wxlState.GetStringType(2)); ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call SetColour ! self->SetColour(colour); ! ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SwapBuffers[] = { 0 }; ! // !%wxchkver28 void SwapBuffers() ! static int LUACALL wxLua_wxGLContext_SwapBuffers(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call SwapBuffers ! self->SwapBuffers(); ! ! return 0; ! } ! ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) ! ! ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPalette) static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_constructor[] = { &s_wxluaarg_Boolean, &s_wxluatag_wxGLCanvas, &s_wxluatag_wxPalette, 0 }; ! // !%wxchkver28 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { *************** *** 10574,10578 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContextOther_constructor[] = { &s_wxluaarg_Boolean, &s_wxluatag_wxGLCanvas, &s_wxluatag_wxPalette, &s_wxluatag_wxGLContext, 0 }; ! // %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) static int LUACALL wxLua_wxGLContextOther_constructor(lua_State *L) { --- 10659,10663 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContextOther_constructor[] = { &s_wxluaarg_Boolean, &s_wxluatag_wxGLCanvas, &s_wxluatag_wxPalette, &s_wxluatag_wxGLContext, 0 }; ! // !%wxchkver28 %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) static int LUACALL wxLua_wxGLContextOther_constructor(lua_State *L) { *************** *** 10600,10661 **** } ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_GetWindow[] = { 0 }; ! // const wxWindow* GetWindow() ! static int LUACALL wxLua_wxGLContext_GetWindow(lua_State *L) { wxLuaState wxlState(L); ! const wxWindow *returns; ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call GetWindow ! returns = self->GetWindow(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SetCurrent[] = { 0 }; ! // void SetCurrent() static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) { wxLuaState wxlState(L); // get this wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); // call SetCurrent ! self->SetCurrent(); ! ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SetColour[] = { &s_wxluaarg_String, 0 }; ! // void SetColour(const wxString& colour) ! static int LUACALL wxLua_wxGLContext_SetColour(lua_State *L) ! { ! wxLuaState wxlState(L); ! // const wxString colour ! const wxString colour = lua2wx(wxlState.GetStringType(2)); ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call SetColour ! self->SetColour(colour); return 0; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SwapBuffers[] = { 0 }; ! // void SwapBuffers() ! static int LUACALL wxLua_wxGLContext_SwapBuffers(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get this ! wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); ! // call SwapBuffers ! self->SwapBuffers(); ! ! return 0; ! } static int LUACALL wxLua_wxGLContext_destructor(lua_State *) --- 10685,10731 ---- } ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPalette) ! ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_constructor[] = { &s_wxluatag_wxGLCanvas, &s_wxluatag_wxGLContext, 0 }; ! // %wxchkver28 wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) ! static int LUACALL wxLua_wxGLContext_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxGLContext *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // const wxGLContext other = NULL ! const wxGLContext * other = (argCount >= 2 ? (const wxGLContext *)wxlState.GetUserDataType(2, s_wxluatag_wxGLContext) : NULL); ! // wxGLCanvas win ! wxGLCanvas * win = (wxGLCanvas *)wxlState.GetUserDataType(1, s_wxluatag_wxGLCanvas); ! // call constructor ! returns = new wxGLContext(win, other); ! // add to tracked window list ! if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) ! wxlState.AddTrackedWindow((wxWindow*)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxGLContext, returns); return 1; } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLContext_SetCurrent[] = { &s_wxluatag_wxGLCanvas, 0 }; ! // %wxchkver28 void SetCurrent(const wxGLCanvas& win) const static int LUACALL wxLua_wxGLContext_SetCurrent(lua_State *L) { wxLuaState wxlState(L); + // const wxGLCanvas win + const wxGLCanvas * win = (const wxGLCanvas *)wxlState.GetUserDataType(2, s_wxluatag_wxGLCanvas); // get this wxGLContext * self = (wxGLContext *)wxlState.GetUserDataType(1, s_wxluatag_wxGLContext); // call SetCurrent ! self->SetCurrent(*win); return 0; } ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) static int LUACALL wxLua_wxGLContext_destructor(lua_State *) *************** *** 10671,10683 **** WXLUAMETHOD wxGLContext_methods[] = { ! #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette) ! { LuaConstructor, "wxGLContext", wxLua_wxGLContext_constructor, 3, 2, s_wxluatagArray_wxLua_wxGLContext_constructor }, ! { LuaConstructor, "wxGLContextOther", wxLua_wxGLContextOther_constructor, 4, 3, s_wxluatagArray_wxLua_wxGLContextOther_constructor }, ! #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette) ! { LuaMethod, "GetWindow", wxLua_wxGLContext_GetWindow, 0, 0, s_wxluatagArray_wxLua_wxGLContext_GetWindow }, { LuaMethod, "SetCurrent", wxLua_wxGLContext_SetCurrent, 0, 0, s_wxluatagArray_wxLua_wxGLContext_SetCurrent }, { LuaMethod, "SetColour", wxLua_wxGLContext_SetColour, 1, 1, s_wxluatagArray_wxLua_wxGLContext_SetColour }, { LuaMethod, "SwapBuffers", wxLua_wxGLContext_SwapBuffers, 0, 0, s_wxluatagArray_wxLua_wxGLContext_SwapBuffers }, { LuaDelete, "wxGLContext", wxLua_wxGLContext_destructor, 0, 0, s_wxluaargArray_None }, }; --- 10741,10763 ---- WXLUAMETHOD wxGLContext_methods[] = { ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) { LuaMethod, "GetWindow", wxLua_wxGLContext_GetWindow, 0, 0, s_wxluatagArray_wxLua_wxGLContext_GetWindow }, { LuaMethod, "SetCurrent", wxLua_wxGLContext_SetCurrent, 0, 0, s_wxluatagArray_wxLua_wxGLContext_SetCurrent }, { LuaMethod, "SetColour", wxLua_wxGLContext_SetColour, 1, 1, s_wxluatagArray_wxLua_wxGLContext_SetColour }, { LuaMethod, "SwapBuffers", wxLua_wxGLContext_SwapBuffers, 0, 0, s_wxluatagArray_wxLua_wxGLContext_SwapBuffers }, + #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) + + + #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPalette) + { LuaConstructor, "wxGLContext", wxLua_wxGLContext_constructor, 3, 2, s_wxluatagArray_wxLua_wxGLContext_constructor }, + { LuaConstructor, "wxGLContextOther", wxLua_wxGLContextOther_constructor, 4, 3, s_wxluatagArray_wxLua_wxGLContextOther_constructor }, + #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS))) && (wxLUA_USE_wxPalette) + + + #if (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) + { LuaConstructor, "wxGLContext", wxLua_wxGLContext_constructor, 2, 1, s_wxluatagArray_wxLua_wxGLContext_constructor }, + { LuaMethod, "SetCurrent", wxLua_wxGLContext_SetCurrent, 1, 1, s_wxluatagArray_wxLua_wxGLContext_SetCurrent }, + #endif // (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS)) + { LuaDelete, "wxGLContext", wxLua_wxGLContext_destructor, 0, 0, s_wxluaargArray_None }, }; |
|
From: John L. <jr...@us...> - 2006-12-23 05:58:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16521/wxLua/bindings/wxwidgets Modified Files: gdi.i Log Message: update wxGLXXX for 2.8 Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** gdi.i 19 Dec 2006 06:18:02 -0000 1.33 --- gdi.i 23 Dec 2006 05:58:14 -0000 1.34 *************** *** 1243,1264 **** %class wxGLCanvas, wxWindow wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) %constructor wxGLCanvasFromContext wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! %constructor wxGLCanvasFromCCanvas wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLContext* GetContext() void SetCurrent() void SetColour(const wxString& colour) void SwapBuffers() %endclass %class wxGLContext, wxObject ! wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette) ! %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) - const wxWindow* GetWindow() - void SetCurrent() - void SetColour(const wxString& colour) - void SwapBuffers() %endclass --- 1243,1275 ---- %class wxGLCanvas, wxWindow + // %override Note: attribList[] parameter is a lua table with integer indexes wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) %constructor wxGLCanvasFromContext wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! %constructor wxGLCanvasFromCanvas wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLContext* GetContext() const void SetCurrent() + %wxchkver28 void SetCurrent(const wxGLContext& RC) const void SetColour(const wxString& colour) void SwapBuffers() %endclass + %class wxGLContext, wxObject ! // for <= 2.6 ! !%wxchkver28 wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette) ! !%wxchkver28 %constructor wxGLContextOther wxGLContext(bool isRGB, wxGLCanvas* win, const wxPalette& palette = wxNullPalette, const wxGLContext* other) ! ! !%wxchkver28 const wxWindow* GetWindow() ! !%wxchkver28 void SetCurrent() ! !%wxchkver28 void SetColour(const wxString& colour) ! !%wxchkver28 void SwapBuffers() ! ! // for >= 2.8 ! ! %wxchkver28 wxGLContext(wxGLCanvas *win, const wxGLContext* other = NULL ) ! ! %wxchkver28 void SetCurrent(const wxGLCanvas& win) const %endclass |
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:39
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891 Modified Files: configure Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** configure 21 Dec 2006 16:53:27 -0000 1.45 --- configure 22 Dec 2006 20:45:04 -0000 1.46 *************** *** 5762,5766 **** CFLAGS="$SAVED_CFLAGS" LIBS="$SAVED_LIBS" ! else --- 5762,5766 ---- CFLAGS="$SAVED_CFLAGS" LIBS="$SAVED_LIBS" ! # remove the -llua5.1 piece from $LIBS else |
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:39
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891/apps Modified Files: Makefile.in Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** Makefile.in 22 Dec 2006 18:57:01 -0000 1.49 --- Makefile.in 22 Dec 2006 20:45:05 -0000 1.50 *************** *** 35,38 **** --- 35,39 ---- WX_LIBS = @WX_LIBS@ WX_RESCOMP = @WX_RESCOMP@ + WX_VERSION = @WX_VERSION@ WX_PORT = @WX_PORT@ WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ *************** *** 113,116 **** --- 114,118 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ uninstall_app_wxlua + @COND_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ *************** *** 130,133 **** --- 132,137 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit + @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o *************** *** 148,151 **** --- 152,157 ---- @COND_USE_WXLUACANAPP_1@__uninstall_app_wxluacan___depname \ @COND_USE_WXLUACANAPP_1@ = uninstall_app_wxluacan + @COND_PLATFORM_MACOSX_1@__app_wxluacan_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluacan_bundle @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = app_wxluacan_cansim_rc.o @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ *************** *** 165,168 **** --- 171,176 ---- @COND_USE_WXLUAFREEZEAPP_1@__uninstall_app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = uninstall_app_wxluafreeze + @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o *************** *** 170,174 **** ### Targets: ### ! all: $(top_builddir)/bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) --- 178,182 ---- ### Targets: ### ! all: $(top_builddir)/bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) *************** *** 188,194 **** --- 196,206 ---- rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) + rm -rf app_wxlua.app rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) + rm -rf app_wxluaedit.app rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) + rm -rf app_wxluacan.app rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) + rm -rf app_wxluafreeze.app distclean: clean *************** *** 220,223 **** --- 232,257 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) + app_wxlua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxlua.app/Contents + mkdir -p app_wxlua.app/Contents/MacOS + mkdir -p app_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/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxlua.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxlua.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxlua$(EXEEXT) app_wxlua.app/Contents/MacOS/app_wxlua + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxlua.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: app_wxlua.app/Contents/PkgInfo + @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) *************** *** 233,236 **** --- 267,292 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) + app_wxluaedit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxluaedit.app/Contents + mkdir -p app_wxluaedit.app/Contents/MacOS + mkdir -p app_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/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluaedit.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxluaedit.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) app_wxluaedit.app/Contents/MacOS/app_wxluaedit + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluaedit.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: app_wxluaedit.app/Contents/PkgInfo + @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) *************** *** 246,249 **** --- 302,327 ---- @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) + app_wxluacan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxluacan.app/Contents + mkdir -p app_wxluacan.app/Contents/MacOS + mkdir -p app_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/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluacan.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxluacan.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) app_wxluacan.app/Contents/MacOS/app_wxluacan + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluacan.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: app_wxluacan.app/Contents/PkgInfo + @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) *************** *** 259,262 **** --- 337,362 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) + app_wxluafreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns + mkdir -p app_wxluafreeze.app/Contents + mkdir -p app_wxluafreeze.app/Contents/MacOS + mkdir -p app_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/$(WX_VERSION)/" \ + $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluafreeze.app/Contents/Info.plist + + + echo -n "APPL????" >app_wxluafreeze.app/Contents/PkgInfo + + + ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) app_wxluafreeze.app/Contents/MacOS/app_wxluafreeze + + + cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluafreeze.app/Contents/Resources/wxLua.icns + + @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: app_wxluafreeze.app/Contents/PkgInfo + app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c *************** *** 308,310 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 408,410 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle |
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:14
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891/build/autoconf Modified Files: aclocal.m4 autoconf_inc.m4 Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** autoconf_inc.m4 19 Dec 2006 21:11:59 -0000 1.21 --- autoconf_inc.m4 22 Dec 2006 20:45:07 -0000 1.22 *************** *** 81,85 **** fi AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_1="#" if test "x$PLATFORM_MACOSX" = "x1" ; then --- 81,85 ---- fi AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### COND_PLATFORM_MACOSX_1="#" if test "x$PLATFORM_MACOSX" = "x1" ; then Index: aclocal.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/aclocal.m4,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** aclocal.m4 21 Dec 2006 16:53:27 -0000 1.36 --- aclocal.m4 22 Dec 2006 20:45:06 -0000 1.37 *************** *** 1724,1727 **** --- 1724,1773 ---- dnl --------------------------------------------------------------------------- + dnl Author: wxWidgets development team, + dnl Francesco Montorsi, + dnl Bob McCown (Mac-testing) + dnl Creation date: + dnl RCS-ID: $Id$ + dnl --------------------------------------------------------------------------- + + dnl ========================================================================================================= + dnl Table of Contents of this macro file: + dnl ------------------------------------- + dnl + dnl AM_OPTIONS_WXCONFIG, AM_PATH_WXCONFIG, AM_PATH_WXRC + dnl + dnl SECTION A: generic utilities + dnl - AM_YESNO_OPTCHECK + dnl - AM_SAVE_COREVAR, AM_RESTORE_COREVAR + dnl - AM_SET_WXLIKE_LIBNAME + dnl - AM_SET_WXBUILD_STR + dnl + dnl SECTION B: macros for configure options + dnl - AM_YESNOAUTO_ARG_ENABLE, AM_YESNOAUTO_ARG_WITH + dnl - AM_WXPRESETS_OPTIONS + dnl + dnl SECTION C: macros for options handling + dnl - AM_WXSELECTEDCONFIG_CONTAIN + dnl - AM_WXSELECTEDCONFIG_CHECK + dnl - AM_WXPRESETS_DETECT_WXOPTIONS_VALUES + dnl - AM_CONVERT_WXPRESETS_OPTIONS_TO_WXCONFIG_FLAGS + dnl - AM_GET_GTK_FLAGS + dnl - AM_WXPRESETS_CHECKS + dnl - AM_WXPRESETS_AND_STANDARD_CHECKS + dnl + dnl SECTION D: messages to the user + dnl - AM_BOOLOPT_SUMMARY, AM_2BOOLOPT_SUMMARY, AM_3BOOLOPT_SUMMARY + dnl - AM_WXPRESETS_SUMMARY_MSG + dnl - AM_WXPRESETS_SUMMARY_MSG_BEGIN, AM_WXPRESETS_SUMMARY_MSG_END + dnl + dnl The special "DBG_CONFIGURE" variable can be set to 1 to enable some additional information + dnl printed on stdout when running these macros. + dnl Note that the "public" macros (i.e. those meant to be used by the user) are those prefixed + dnl with the "AM_WXPRESETS" string. + dnl ========================================================================================================= + + + + dnl --------------------------------------------------------------------------- dnl Macros for wxWidgets detection. Typically used in configure.in as: dnl *************** *** 1751,1754 **** --- 1797,1846 ---- dnl --------------------------------------------------------------------------- + + + dnl --------------------------------------------------------------------------- + dnl Macros for wxWidgets build configuration detection. + dnl Typically used in configure.in/ac as: + dnl + dnl # define configure options + dnl AM_WXPRESETS_OPTIONS + dnl + dnl # basic configure checks + dnl ... + dnl + dnl # required library checks + dnl AM_WXPRESETS_AND_STANDARD_CHECKS([2.8.0], [net,xrc,stc]) + dnl ... + dnl + dnl # write the output files + dnl AC_BAKEFILE([m4_include(autoconf_inc.m4)]) + dnl AC_CONFIG_FILES([Makefile ...]) + dnl AC_OUTPUT + dnl + dnl # end of the configure.in script + dnl AM_WXPRESETS_SUMMARY_MSG # optional: just to show a message to the user + dnl + dnl or even more easily: + dnl + dnl # define configure options + dnl AM_WXPRESETS_OPTIONS + dnl + dnl # do all standard checks and wxpresets ones at all once + dnl AM_WXPRESETS_AND_STANDARD_CHECKS([2.8.0], [net,xrc,stc]) + dnl ... + dnl + dnl # write the output files + dnl AC_BAKEFILE([m4_include(autoconf_inc.m4)]) + dnl AC_CONFIG_FILES([Makefile ...]) + dnl AC_OUTPUT + dnl + dnl # end of the configure.in script + dnl AM_WXPRESETS_SUMMARY_MSG # optional: just to show a message to the user + dnl + dnl --------------------------------------------------------------------------- + + + + dnl --------------------------------------------------------------------------- dnl AM_OPTIONS_WXCONFIG *************** *** 2090,2091 **** --- 2182,3036 ---- ]) + + + + dnl ========================================================================================================= + dnl SECTION A: generic utilities + dnl ========================================================================================================= + + dnl --------------------------------------------------------------------------- + dnl AM_YESNO_OPTCHECK([name of the boolean variable to set], + dnl [name of the --enable-option variable with yes/no values], + dnl [name of the --enable option]) + dnl + dnl Converts the $3 variable, suppose to contain a yes/no value to a 1/0 + dnl boolean variable and saves the result into $1. + dnl Outputs also the standard checking-option message. + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_YESNO_OPTCHECK], + [ + AC_MSG_CHECKING([for $3 option]) + if [[ "x$$2" = "xyes" ]]; then + AC_MSG_RESULT([yes]) + $1=1 + else + AC_MSG_RESULT([no]) + $1=0 + fi + ]) + + + dnl --------------------------------------------------------------------------- + dnl AM_SAVE_COREVAR, AM_RESTORE_COREVAR + dnl + dnl Saves the CPPFLAGS, CXXFLAGS, CFLAGS and LIBS variables in some helper + dnl variables which are used to restore them later using AM_RESTORE_COREVAR. + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_SAVE_COREVAR], + [ + SAVED_CPPFLAGS="$CPPFLAGS" + SAVED_CXXFLAGS="$CXXFLAGS" + SAVED_CFLAGS="$CFLAGS" + SAVED_LIBS="$LIBS" + ]) + + AC_DEFUN([AM_RESTORE_COREVAR], + [ + CPPFLAGS="$SAVED_CPPFLAGS" + CXXFLAGS="$SAVED_CXXFLAGS" + CFLAGS="$SAVED_CFLAGS" + LIBS="$SAVED_LIBS" + ]) + + + + + + + dnl --------------------------------------------------------------------------- + dnl WX_LIKE_LIBNAME([output-var] [prefix], [name]) + dnl + dnl Sets the "output-var" variable to the name of a library named with same + dnl wxWidgets rule. + dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets + dnl the $lib variable to: + dnl 'mine_gtk2ud_test-2.8' + dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_VERSION=28 + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_LIKE_LIBNAME], + [ + wx_temp="$2""_""$WX_PORT" + + dnl add the [u][d] string + if test "$WX_UNICODE" = "1"; then + wx_temp="$wx_temp""u" + fi + if test "$WX_DEBUG" = "1"; then + wx_temp="$wx_temp""d" + fi + + dnl complete the name of the lib + wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" + + dnl save it in the user's variable + $1=$wx_temp + ]) + + + + + dnl ========================================================================================================= + dnl SECTION B: macros for configure options + dnl ========================================================================================================= + + dnl --------------------------------------------------------------------------- + dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO + 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_YESNOAUTO], + [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" = "auto" ; then + AC_MSG_RESULT([will be automatically detected]) + $2="auto" + else + AC_MSG_ERROR([ + Unrecognized option value (allowed values: yes, no, auto) ! + ]) + fi + ]) + + AC_DEFUN([WX_ARG_WITH_YESNOAUTO], + [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: by default we don't allow --with-$1=no option + dnl since it does not make much sense ! + elif test "$6" = "1" -a "$withval" = "no" ; then + AC_MSG_RESULT([no]) + $2=0 + elif test "$withval" = "auto" ; then + AC_MSG_RESULT([will be automatically detected]) + $2="auto" + else + AC_MSG_ERROR([ + Unrecognized option value (allowed values: yes, auto) ! + ]) + fi + ]) + + + AC_DEFUN([_WX_STRING_CONTAINS], + [expr "$1" : ".*$2.*" >/dev/null]) + + dnl --------------------------------------------------------------------------- + dnl WX_STDOPTIONS([options-to-add]) + dnl + dnl Adds to the configure script one or more of the following options: + dnl --enable-[debug|unicode|shared|wxshared|wxdebug] + dnl --with-[gtk|msw|motif|x11|mac|mgl|dfb] + dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED, + dnl PORT, WX_SHARED, WX_DEBUG, variables accordingly. + dnl + dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the + dnl --enable-unicode option (in boolean format) while the second indicates + dnl if wxWidgets was built in Unicode mode (and still is in boolean format). + dnl --------------------------------------------------------------------------- + AC_DEFUN([WX_STDOPTIONS], + [ + if test -z "$1"; then + dnl add all possible options in this case + wx_optlist="debug,unicode,shared,ports,wxshared,wxdebug" + else + wx_optlist="$1" + fi + + dnl The default values (and also option names) are the same of wxWidgets' options + _WX_STRING_CONTAINS([$wx_optlist], [debug]) + if test $? = "0"; then + WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Builds in debug mode], [auto]) + fi + _WX_STRING_CONTAINS([$wx_optlist], [unicode]) + if test $? = "0"; then + WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Builds in unicode mode], [auto]) + fi + _WX_STRING_CONTAINS([$wx_optlist], [shared]) + if test $? = "0"; then + WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Builds in shared mode], [auto]) + fi + + dnl ****** IMPORTANT ******* + dnl Unlike for the UNICODE setting, you can build your program in + dnl shared mode against a static build of wxWidgets. Thus we have the + dnl following option which allows these mixtures. E.g. + dnl + dnl ./configure --disable-shared --with-wxshared + dnl + dnl will build your library in static mode against the first available + dnl shared build of wxWidgets. + dnl + dnl Note that's not possible to do the viceversa: + dnl + dnl ./configure --enable-shared --without-wxshared + dnl + dnl Doing so you would try to build your library in shared mode against a static + dnl build of wxWidgets. This is not possible ! + dnl A check for this combination of options is in AM_WXPRESETS_DETECT_WXOPTIONS_VALUES + dnl (where we know what 'auto' should be expanded to). + dnl + dnl If you try to build something in ANSI mode against a UNICODE build + dnl of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets, + dnl then at best you'll get ton of linking errors ! + dnl ************************ + _WX_STRING_CONTAINS([$wx_optlist], [wxshared]) + if test $? = "0"; then + WX_ARG_WITH_YESNOAUTO( + [wxshared], [WX_SHARED], + [Force building against a shared build of wxWidgets, even if --disable-shared is given], + [auto], [], [1]) + fi + + dnl Just like for SHARED and WX_SHARED it may happen that some adventurous + dnl peoples will want to mix a wxWidgets release build with a debug build of + dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables. + _WX_STRING_CONTAINS([$wx_optlist], [wxdebug]) + if test $? = "0"; then + WX_ARG_WITH_YESNOAUTO( + [wxdebug], [WX_DEBUG], + [Force building against a debug build of wxWidgets, even if --disable-debug is given], + [auto], [], [1]) + fi + + _WX_STRING_CONTAINS([$wx_optlist], [ports]) + if test $? = "0"; then + PORT="auto" + WX_ARG_WITH_YESNOAUTO([gtk], [GTKPORT], [Uses the wxGTK2 port], [auto], [PORT="gtk2"]) + + dnl In case we are on Cygwin: + WX_ARG_WITH_YESNOAUTO([msw], [MSWPORT], [Uses the wxMSW port], [auto], [PORT="msw"]) + + WX_ARG_WITH_YESNOAUTO([motif], [MOTIFPORT], [Uses the wxMotif port], [auto], [PORT="motif"]) + WX_ARG_WITH_YESNOAUTO([x11], [X11PORT], [Uses the wxX11 port], [auto], [PORT="x11"]) + WX_ARG_WITH_YESNOAUTO([mac], [MACPORT], [Uses the wxMac port], [auto], [PORT="mac"]) + WX_ARG_WITH_YESNOAUTO([mgl], [MGLPORT], [Uses the wxMGL port], [auto], [PORT="mgl"]) + WX_ARG_WITH_YESNOAUTO([dfb], [MGLPORT], [Uses the wxDFB port], [auto], [PORT="dfb"]) + fi + + dnl FOR DEBUG ONLY + if test "$DBG_CONFIGURE" = "1"; then + echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED" + echo "[[dbg]] DEBUG: $DEBUG, UNICODE: $UNICODE, PORT: $PORT" + echo "[[dbg]] GTKPORT: $GTKPORT, X11PORT: $X11PORT, MACPORT: $MACPORT" + echo "[[dbg]] MOTIFPORT: $MOTIFPORT, MGLPORT: $MGLPORT" + fi + ]) + + + + + + + + dnl ========================================================================================================= + dnl SECTION C: macros for configure options + dnl ========================================================================================================= + + dnl --------------------------------------------------------------------------- + dnl AM_WXSELECTEDCONFIG_CONTAIN([RESULTVAR], [STRING]) + dnl + dnl Sets to nonzero the variable named "WX_$RESULTVAR" if the selected wxWidgets + dnl configuration 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_WXSELECTEDCONFIG_CONTAIN], + [ + WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*") + ]) + + + dnl --------------------------------------------------------------------------- + dnl AM_WXSELECTEDCONFIG_CHECK([RESULTVAR], [STRING], [MSG] [, ACTION-IF-FOUND + dnl [, ACTION-IF-NOT-FOUND]]) + dnl + dnl Works like AM_WXFLAGS_CHECK but uses the wxWidgets-2.6 specific option + dnl of wx-config: --selected_config instead of grepping WX_CPPFLAGS var. + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_WXSELECTEDCONFIG_CHECK], + [ + if test "$$1" = "auto" ; then + + dnl The user does not have particular preferences for this option; + dnl so we will detect the wxWidgets relative build setting and 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_DETECT_WXOPTIONS_VALUES + dnl + dnl Detects the values of the following variables: + dnl 1) WX_UNICODE + dnl 2) WX_DEBUG + dnl 3) WX_SHARED (and also WX_STATIC) + dnl 4) WX_VERSION + dnl 5) WX_VERSION_MAJOR + dnl 6) WX_VERSION_MINOR + dnl 7) WX_*PORT (i.e. WX_MOTIFPORT, WX_MACPORT, WX_X11PORT, WX_MGLPORT, etc) + dnl 8) WX_PORT + dnl from the previously selected wxWidgets build; this macro in fact must be + dnl called *after* calling the AM_PATH_WXCONFIG macro. + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_WXPRESETS_DETECT_WXOPTIONS_VALUES], + [ + dnl be sure that the WX_VERSION variable has the same format of the + dnl WX_VERSION option which is used by wx_win32.bkl + dnl (i.e. 25, 26, 27... instead of 2.5.x, 2.6.x, 2.7.x...) + WX_VERSION_MAJOR=`echo $WX_VERSION | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + WX_VERSION_MINOR=`echo $WX_VERSION | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + WX_VERSION=$wx_config_major_version$wx_config_minor_version + + dnl these are required ! + AC_SUBST(WX_VERSION_MAJOR) + AC_SUBST(WX_VERSION_MINOR) + + + dnl FOR DEBUG ONLY + if test "$DBG_CONFIGURE" = "1"; then + echo "[[dbg]] WX_VERSION: $WX_VERSION" + fi + + dnl we could test directly for WX_SHARED with a line like: + dnl AM_WXSELECTEDCONFIG_CHECK([SHARED], [shared], + dnl [if wxWidgets was built in SHARED mode]) + dnl but wx-config --selected-config DOES NOT outputs the 'shared' + dnl word when wx was built in shared mode; it just outputs the + dnl 'static' word when built in static mode. + if test $WX_SHARED = "1"; then + STATIC=0 + elif test $WX_SHARED = "0"; then + STATIC=1 + elif test $WX_SHARED = "auto"; then + STATIC="auto" + fi + + if test $WX_VERSION -gt 26 ; then + + dnl The wx-config we are using understands the "--selected_config" + dnl option which returns an easy-parseable string ! + WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) + + dnl FOR DEBUG ONLY + if test "$DBG_CONFIGURE" = "1"; then + echo "[[dbg]] Using wx-config --selected_config" + echo "[[dbg]] 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]) + AM_WXSELECTEDCONFIG_CHECK([STATIC], [static], + [if wxWidgets was built in STATIC mode]) + + dnl checks for the wx port used + WX_PORT="unknown" + AM_WXSELECTEDCONFIG_CHECK([GTKPORT1], [gtk1], + [if wxWidgets port is wxGTK1], [WX_PORT="gtk1"]) + AM_WXSELECTEDCONFIG_CHECK([GTKPORT2], [gtk2], + [if wxWidgets port is wxGTK2], [WX_PORT="gtk2"]) + 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"]) + else + + AC_MSG_ERROR([ + Cannot detect the wxWidgets configuration for the selected wxWidgets build + since its version is < 2.6.0 + ]) + fi + + dnl init WX_SHARED from WX_STATIC + if test "$WX_STATIC" != "0"; then + WX_SHARED=0 + else + WX_SHARED=1 + fi + + dnl FOR DEBUG ONLY + if test "$DBG_CONFIGURE" = "1"; then + echo "[[dbg]] WX_SHARED: $WX_SHARED" + echo "[[dbg]] WX_DEBUG: $WX_DEBUG" + echo "[[dbg]] WX_UNICODE: $WX_UNICODE" + echo "[[dbg]] WX_GTKPORT1: $WX_GTKPORT1, WX_GTKPORT2: $WX_GTKPORT2" + echo "[[dbg]] WX_MACPORT: $WX_MACPORT, WX_X11PORT: $WX_X11PORT" + echo "[[dbg]] WX_MGLPORT: $WX_MGLPORT, WX_MSWPORT: $WX_MSWPORT" + echo "[[dbg]] WX_MOTIFPORT: $WX_MOTIFPORT" + echo "[[dbg]] WX_PORT: $WX_PORT" + 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" = "auto" ; then + AC_MSG_ERROR([ + Cannot detect the currently installed wxWidgets port ! + Check your 'wx-config --cxxflags'... + ]) + fi + + checksum="$(expr $WX_GTKPORT1 + $WX_GTKPORT2 + $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 + AC_SUBST(WX_PORT) + + + dnl Avoid problem described in the AM_WXPRESETS_OPTIONS which happens when + dnl the user gives the options: + dnl ./configure --enable-shared --without-wxshared + dnl or just do + dnl ./configure --enable-shared + dnl but there is only a static build of wxWidgets available. + if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then + AC_MSG_ERROR([ + Cannot build in shared mode against a static build of wxWidgets ! + This error happens because the wxWidgets build which was selected + has been detected as STATIC while you asked to build $PACKAGE_NAME + in SHARED mode and this is not possible. + Use the '--disable-shared' option to build $PACKAGE_NAME + as STATIC or '--with-wxshared' to use a SHARED wxWidgets build. + ]) + 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 "auto" + 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 "$WX_SHARED" = "1" ; then + WXCFG_FLAGS="--static=no " + elif test "$WX_SHARED" = "0" ; then + WXCFG_FLAGS="--static=yes " + 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 strip last space out of the string + WXCFG_FLAGS=${WXCFG_FLAGS% } + + dnl FOR DEBUG ONLY + if test "$DBG_CONFIGURE" = "1"; then + echo "[[dbg]] WXCFG_FLAGS: $WXCFG_FLAGS" + fi + ]) + + + dnl --------------------------------------------------------------------------- + dnl AM_GET_GTK_FLAGS + dnl + dnl When using the wxGTK port, this macro creates a GTKPKG_FLAGS variable that + dnl contains the c flags (-I and -D flags) required to compile a program which + dnl uses directly the GTK libraries (instead using the wx layer). + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_GET_GTK_FLAGS], + [ + dnl The commands below were taken from usenet postings by + dnl John Labenski + dnl NB Trying to do GTKPKG_FLAGS=`gtk-config --cflags` fails, + dnl you have to use an intermediate var + if test "$WX_PORT" = "gtk1" ; then + _GTKPKG_FL="gtk-config --cflags" + GTKPKG_FLAGS=`$_GTKPKG_FL` + elif test "$WX_PORT" = "gtk2" ; then + _GTKPKG_FL="pkg-config --cflags gtk+-2.0" + GTKPKG_FLAGS=`$_GTKPKG_FL` + fi + ]) + + + + dnl --------------------------------------------------------------------------- + dnl AM_WXPRESETS_CHECKS([minimum-wx-version], [addwxlibraries], [addgtkflags]) + dnl + dnl This is the CORE macro of this file: it uses the options previously + dnl defined by AM_WXPRESETS_OPTIONS (--enable-debug, --enable-unicode, etc) + dnl to create a string to give to wx-config in order to select a compatible + dnl wxWidgets build (through AM_CONVERT_WXPRESETS_OPTIONS_TO_WXCONFIG_FLAGS). + dnl + dnl Then it calls AM_WXPRESETS_DETECT_WXOPTIONS_VALUES to extract informations returned by + dnl wx-config and convert them into the WX_* variables. + dnl + dnl Thus this acts just as a convenience macro for + dnl AM_PATH_WXCONFIG([minimum-wx-version],,, [addwxlibraries]) + dnl AM_WXPRESETS_DETECT_WXOPTIONS_VALUES + dnl AM_GET_GTK_FLAGS (only when addgtkflags != '') + dnl macros. + dnl + dnl NOTE: "addwxlibraries" are those wxWidgets libraries (when wx is built + dnl in multilib mode) required by the program to link (e.g. core, net, etc); + dnl the 'base' library is already added - don't specify it. + dnl + dnl NOTE2: see AM_GET_GTK_FLAGS for "addgtkflags" parameter. + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_WXPRESETS_CHECKS], + [ + dnl From --enable-* options set by AM_WXPRESETS_OPTIONS, create the + dnl WXCFG_FLAGS string to give to wx-config + AM_CONVERT_WXPRESETS_OPTIONS_TO_WXCONFIG_FLAGS + + dnl save the additional wx libraries required as they could be useful + dnl later from AM_PREPEND_WXLIKE_LIB macro + if test ! -z "$2"; then + WX_ADDITIONAL_LIBS="$2,base" + else + WX_ADDITIONAL_LIBS="base" + fi + + dnl search for the selected wxWidgets build + AM_PATH_WXCONFIG([$1], [wxWin=1], [wxWin=0], + [$WX_ADDITIONAL_LIBS], [$WXCFG_FLAGS]) + if test "$wxWin" != 1; then + + if test ! -z "$WXCFG_FLAGS"; then + + MSG=" + The configuration you asked for $PACKAGE_NAME requires a wxWidgets + build with the following settings: + $WXCFG_FLAGS + but such build is not available. + + Try to use the default build of wxWidgets + (see the command 'wx-config --list') leaving + the --enable-unicode, --enable-static, --enable-debug + and --with-* options to their default values." + fi + + AC_MSG_ERROR([ + The requested wxWidgets build couldn't be found. + $MSG + + 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 + dnl a Makefile.in which merges these two variables with + dnl $WX_CPPFLAGS automatically... + dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" + dnl LIBS="$LIBS $WX_LIBS" + true; dnl no-operation used because empty branchs are not + dnl allowed: else fi; gives an error ! + fi + + dnl save the full wxWidgets version in WX_VERSION_FULL + dnl (to be compatible with win32 bakefiles, AM_WXPRESETS_DETECT_WXOPTIONS_VALUES + dnl overwrites WX_VERSION with only the major and minor digits + dnl of wx-config --version without any dot). + WX_VERSION_FULL="$WX_VERSION" + AC_SUBST(WX_VERSION_FULL) + + dnl Synch our WX_DEBUG,WX_UNICODE,WX_SHARED,WX_VERSION,etc + dnl variables with wx ones + AM_WXPRESETS_DETECT_WXOPTIONS_VALUES + + dnl now we can finally update the DEBUG,UNICODE,SHARED options + dnl to their final values if they were set to 'auto' + if test "$DEBUG" = "auto"; then + DEBUG=$WX_DEBUG + + dnl in case user wants a BUILD=debug/release var... + if test "$DEBUG" = "1"; then + BUILD="debug" + elif test "$DEBUG" = ""; then + BUILD="release" + fi + fi + if test "$UNICODE" = "auto"; then + UNICODE=$WX_UNICODE + fi + if test "$SHARED" = "auto"; then + SHARED=$WX_SHARED + fi + + dnl It doesn't matter what "gtkaddflags" parameter contains, + dnl if it's non-empty it's true + if test -n "$3" ; then + dnl Add gtk-specific flags (useful when compiling wx sources + dnl that directly use the GTK libraries) + AM_GET_GTK_FLAGS + + dnl Update global flags + CXXFLAGS="$CXXFLAGS $GTKPKG_FLAGS" + CFLAGS="$CFLAGS $GTKPKG_FLAGS" + fi + ]) + + + + dnl --------------------------------------------------------------------------- + dnl AM_WXPRESETS_AND_STANDARD_CHECKS([minimum-wx-version], [addwxlibraries], [addgtkflags]) + dnl + dnl Like AM_WXPRESETS_CHECKS but this macro also does those standard checks + dnl to recognize the system and the installed utility programs + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_WXPRESETS_AND_STANDARD_CHECKS], + [ + 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 + dnl "-g -O2" flags; we will add them later, if needed + dnl + dnl NOTE: we cannot simply init them to empty vars because in that + dnl way we could override the user-explicitely-set value + dnl passed on the command line... so we need to check first! + if test -z "$CFLAGS"; then + CFLAGS= + fi + if test -z "$CXXFLAGS"; then + CXXFLAGS= + fi + if test -z "$CPPFLAGS"; then + CPPFLAGS= + fi + + 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_CHECKS([$1], [$2], [$3]) + + dnl add the optimize/debug flags + dnl NOTE1: these checks must be put after AM_WXPRESETS_CHECKS + dnl (which sets the $WX_* variables)... + dnl NOTE2: the CXXFLAGS are merged together with the CPPFLAGS so we + dnl don't need to set them, too + if [[ "$WX_DEBUG" = "1" ]]; then + + dnl NOTE: the -Wundef and -Wno-ctor-dtor-privacy are not enabled + dnl automatically by -Wall + dnl NOTE2: the '-Wno-ctor-dtor-privacy' has sense only when compiling + dnl C++ source files and thus we must be careful to add it only + dnl to CXXFLAGS and not to CFLAGS. Remember that CPPFLAGS is + dnl reserved for both C and C++ compilers while CFLAGS is + dnl intended as flags for C compiler only and CXXFLAGS for + dnl C++ only ! + CXXFLAGS="$CXXFLAGS -g3 -O0 -Wall -Wundef -Wno-ctor-dtor-privacy" + CFLAGS="$CFLAGS -g3 -O0 -Wall -Wundef" + else + CXXFLAGS="$CXXFLAGS -g0 -O2" + CFLAGS="$CFLAGS -g0 -O2" + fi + ]) + + + + + + + dnl ========================================================================================================= + dnl SECTION D: messages to the user + dnl ========================================================================================================= + + dnl --------------------------------------------------------------------------- + dnl AM_BOOLOPT_SUMMARY([name of the boolean variable to show summary for], + dnl [what to print when var is 1], + dnl [what to print when var is 0]) + dnl + dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0. + dnl This macro mainly exists just to make configure.ac scripts more readable. + dnl + dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments + dnl if you want that M4 avoid to throw away the spaces prefixed to the + dnl argument value. + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_BOOLOPT_SUMMARY], + [ + if [[ "x$$1" = "x1" ]]; then + echo $2 + elif [[ "x$$1" = "x0" ]]; then + echo $3 + else + echo "$1 is $$1" + fi + ]) + + dnl same as AM_BOOLOPT_SUMMARY but takes 2 bool options + AC_DEFUN([AM_2BOOLOPT_SUMMARY], + [ + if [[ "x$$1" = "x1" -a "x$$2" = "x1" ]]; then + echo $3 + elif [[ "x$$1" = "x0" -o "x$$2" = "x0" ]]; then + echo $4 + else + echo "$1 is $$1; $2 is $$2" + fi + ]) + + dnl same as AM_BOOLOPT_SUMMARY but takes 3 bool options + AC_DEFUN([AM_3BOOLOPT_SUMMARY], + [ + if [[ "x$$1" = "x1" -a "x$$2" = "x1" -a "x$$3" = "x1" ]]; then + echo $4 + elif [[ "x$$1" = "x0" -o "x$$2" = "x0" -o "x$$3" = "x0" ]]; then + echo $5 + else + echo "$1 is $$1; $2 is $$2; $3 is $$3" + fi + ]) + + + dnl --------------------------------------------------------------------------- + dnl AM_WXPRESETS_SUMMARY_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_SUMMARY_MSG], + [ + AM_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"]) + AM_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) + AM_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"]) + echo " - VERSION: $WX_VERSION_FULL" + echo " - PORT: $WX_PORT" + ]) + + + dnl --------------------------------------------------------------------------- + dnl AM_WXPRESETS_SUMMARY_MSG_BEGIN, AM_WXPRESETS_SUMMARY_MSG_END + dnl + dnl Like AM_WXPRESETS_SUMMARY_MSG macro but these two macros also gives info + dnl about the configuration of the package which used the wxpresets. + dnl + dnl Typical usage: + dnl AM_WXPRESETS_SUMMARY_MSG_BEGIN + dnl echo " - Package setting 1: $SETTING1" + dnl echo " - Package setting 2: $SETTING1" + dnl ... + dnl AM_WXPRESETS_SUMMARY_MSG_END + dnl + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_WXPRESETS_SUMMARY_MSG_BEGIN], + [ + echo + echo " ----------------------------------------------------------------" + echo " Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed." + echo " Summary of main configuration settings for $PACKAGE_NAME:" + AM_BOOLOPT_SUMMARY([DEBUG], [" - DEBUG build"], [" - RELEASE build"]) + AM_BOOLOPT_SUMMARY([UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) + AM_BOOLOPT_SUMMARY([SHARED], [" - SHARED mode"], [" - STATIC mode"]) + ]) + + 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 + ]) + + + |
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:13
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891/build/bakefiles Modified Files: wxluabase.bkl Added Files: mac_bundles.bkl Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxluabase.bkl 19 Dec 2006 21:11:59 -0000 1.30 --- wxluabase.bkl 22 Dec 2006 20:45:07 -0000 1.31 *************** *** 157,161 **** - <!-- ================================================================== --> <!-- TEMPLATES --> --- 157,160 ---- *************** *** 268,270 **** --- 267,278 ---- </template> + + + <!-- ================================================================== --> + <!-- TAGS --> + <!-- ================================================================== --> + + <!-- defines the <wx-mac-app-bundle> tag --> + <include file="mac_bundles.bkl" once="1"/> + </makefile> --- NEW FILE: mac_bundles.bkl --- <?xml version="1.0" ?> <!-- $Id: mac_bundles.bkl,v 1.1 2006/12/22 20:45:07 frm Exp $ --> <makefile> <if cond="FORMAT=='autoconf'"> <!-- =============================================================== --> <!-- project-specific mac-bundle stuff: --> <!-- =============================================================== --> <set var="BUNDLE_DIR"> $(top_srcdir)/distrib/macbundle </set> <set var="BUNDLE_ICONS_FILENAME"> wxLua.icns </set> <set var="BUNDLE_PLIST"> $(BUNDLE_DIR)/Info.plist.in </set> <set var="BUNDLE_ICONS"> $(BUNDLE_PLIST)/$(BUNDLE_ICONS_FILENAME) </set> <!-- =============================================================== --> <!-- DO NOT TOUCH THE FOLLOWING: --> <!-- =============================================================== --> <!-- Support for application bundles, for wxWidgets samples. --> <!-- Nasty hack: use $(srcdir) to obtain usable CFBundleIdentifier suffix; converts $(srcdir) like "../../samples/minimal" to "samples.minimal". --> <set var="BUNDLE_IDENTIFIER"> `echo $(DOLLAR)(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'` </set> <define-tag name="wx-mac-app-bundle" rules="exe"> <!-- bundle directory: --> <set var="BUNDLE">$(id).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: --> <depends>$(id)</depends> <depends-on-file>$(BUNDLE_PLIST)</depends-on-file> <depends-on-file>$(BUNDLE_ICONS)</depends-on-file> <command> <!-- create the directories: --> mkdir -p $(BUNDLE) mkdir -p $(BUNDLE)/MacOS mkdir -p $(BUNDLE)/Resources <!-- Info.plist: --> sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \ -e "s/EXECUTABLE/$(id)/" \ -e "s/VERSION/$(WX_VERSION)/" \ $(BUNDLE_PLIST) >$(BUNDLE)/Info.plist <!-- PkgInfo: --> echo -n "APPL????" >$(BUNDLE)/PkgInfo <!-- make a hardlink to the binary: --> ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id) <!-- ditto resources and icons: --> cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/$(BUNDLE_ICONS_FILENAME) </command> </modify-target> <!-- add pseudo target id_bundle: --> <add-target target="$(id)_bundle" type="phony" cond="PLATFORM_MACOSX=='1'"/> <modify-target target="$(id)_bundle"> <dependency-of>all</dependency-of> <depends>$(BUNDLE_TGT_REF)</depends> </modify-target> <!-- "make clean" should delete the bundle: --> <modify-target target="clean"> <command>rm -rf $(id).app</command> </modify-target> </define-tag> </if> <if cond="FORMAT!='autoconf'"> <define-tag name="wx-mac-app-bundle" rules="exe"/> </if> </makefile> |
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:12
|
Update of /cvsroot/wxlua/wxLua/distrib/macbundle In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891/distrib/macbundle Added Files: Info.plist.in wxLua.icns Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) --- NEW FILE: Info.plist.in --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> <plist version="0.9"> <dict> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleIdentifier</key> <string>org.wxwindows.IDENTIFIER</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleExecutable</key> <string>EXECUTABLE</string> <key>CFBundleIconFile</key> <string>wxmac.icns</string> <key>CFBundleName</key> <string>EXECUTABLE</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>VERSION</string> <key>CFBundleShortVersionString</key> <string>VERSION</string> <key>CFBundleGetInfoString</key> <string>EXECUTABLE version VERSION, (c) 2002-2006 wxWidgets</string> <key>CFBundleLongVersionString</key> <string>VERSION, (c) 2002-2006 wxWidgets</string> <key>NSHumanReadableCopyright</key> <string>Copyright 2002-2006 wxWidgets</string> <key>LSRequiresCarbon</key> <true/> <key>CSResourcesFileMapped</key> <true/> </dict> </plist> --- NEW FILE: wxLua.icns --- (This appears to be a binary file; contents omitted.) |
|
From: Francesco M. <fr...@us...> - 2006-12-22 20:45:11
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28891/apps/build/bakefiles Modified Files: apps.bkl Log Message: added Mac-bundling support (mostly a copy and paste of wxWidgets' mac bundling support code) Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** apps.bkl 22 Dec 2006 18:57:02 -0000 1.47 --- apps.bkl 22 Dec 2006 20:45:06 -0000 1.48 *************** *** 71,74 **** --- 71,76 ---- <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> + + <wx-mac-app-bundle/> </template> *************** *** 112,116 **** <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use as a module target... this would lead to problems when creating global DSW file... --> ! <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> <sources>$(WXLUAAPP_SRC)</sources> --- 114,118 ---- <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use as a module target... this would lead to problems when creating global DSW file... --> ! <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1' and USE_WXBINDSTC=='1' and USE_WXLUADEBUG=='1'"> <sources>$(WXLUAAPP_SRC)</sources> |
