From 7739ea4c67458af2b61fea3ba027f0ad5d69b30f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 17 Jun 2003 07:10:21 +0000 Subject: [PATCH] Switched back to "PyCrust.ico" because Windows explorer can apparently only associate one "py.ico" at a time, even if they are located in different directories. Also added Linux /usr/lib/menu entries for the Py apps and XRCed when building the RPMs. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/distrib/make_installer.py | 2 +- wxPython/distrib/wxPythonFull.spec.in | 47 +++++++++++++++++---- wxPython/wxPython/py/PyCrust.ico | Bin 0 -> 4710 bytes wxPython/wxPython/py/PyCrust_16.png | Bin 0 -> 706 bytes wxPython/wxPython/py/PyCrust_32.png | Bin 0 -> 1273 bytes wxPython/wxPython/tools/XRCed/XRCed_16.png | Bin 0 -> 542 bytes wxPython/wxPython/tools/XRCed/XRCed_32.png | Bin 0 -> 677 bytes 7 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 wxPython/wxPython/py/PyCrust.ico create mode 100644 wxPython/wxPython/py/PyCrust_16.png create mode 100644 wxPython/wxPython/py/PyCrust_32.png create mode 100644 wxPython/wxPython/tools/XRCed/XRCed_16.png create mode 100644 wxPython/wxPython/tools/XRCed/XRCed_32.png diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index f0b0379a0a..c9944be23c 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -96,7 +96,7 @@ Source: "wxPython\lib\colourchooser\*.py"; DestDir: "{app}\wxPython\lib\colourc Source: "wxPython\py\*.py"; DestDir: "{app}\wxPython\py"; Components: core Source: "wxPython\py\*.txt"; DestDir: "{app}\wxPython\py"; Components: core Source: "wxPython\py\*.ico"; DestDir: "{app}\wxPython\py"; Components: core -Source: "wxPython\py\Py.ico"; DestDir: "{app}\wxPython\py"; DestName: "PyCrust.ico"; Components: core +Source: "wxPython\py\PyCrust.ico"; DestDir: "{app}\wxPython\py"; Components: core Source: "wxPython\py\tests\*.py"; DestDir: "{app}\wxPython\py\tests"; Components: core Source: "wxPython\py\wxd\*.py"; DestDir: "{app}\wxPython\py\wxd"; Components: core diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in index 9a8848842d..aeed61ea57 100644 --- a/wxPython/distrib/wxPythonFull.spec.in +++ b/wxPython/distrib/wxPythonFull.spec.in @@ -47,7 +47,6 @@ Packager: Robin Dunn Group: Development/Python BuildRoot: %{_tmppath}/%{name}-buildroot Prefix: %{pref} -#BuildRequires: %{python} Provides: wxPython = %{version} Provides: wxPython%{port} = %{version} @@ -58,7 +57,6 @@ Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so Provides: libwx_%{lcport}%{uniflg}%{dbgflg}_gl-%{ver2}.so(WX%{port}%{UNIFLG}%{DBGFLG}_%{ver2}) - # old wxPython packages Obsoletes: wxPython wxPython%{port} @@ -138,8 +136,6 @@ cd $WXDIR/wxPython WX_CONFIG="$WXDIR/build/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/build" \ build -## WX_CONFIG="$WXDIR/build/wx-config --inplace --prefix=$RPM_BUILD_ROOT%{wxpref}" \ - # Build wxrc (XRC resource tool) but don't use the makefiles since they expect @@ -149,7 +145,7 @@ WX_CONFIG="$WXDIR/build/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/build" wCC=`$WX_CONFIG --cc` wCXX=`$WX_CONFIG --cxx` -for f in wxrc.cpp ../../src/xrc/*.cpp; do +for f in wxrc.cpp ../../src/xrc/xml.cpp ../../src/xrc/xmlres.cpp; do echo $f $wCXX `$WX_CONFIG --cxxflags` -I ../../include -I ../../src/xrc/expat/xmlparse -I ../../src/xrc/expat/xmltok -c $f done @@ -158,9 +154,6 @@ for f in ../../src/xrc/expat/xmlparse/xmlparse.c ../../src/xrc/expat/xmltok/xmlr $wCC `$WX_CONFIG --cxxflags` -I ../../include -I ../../src/xrc/expat/xmlparse -I ../../src/xrc/expat/xmltok -c $f done -# the handlers are not needed -rm xh_*.o xmlrsall.o - $wCXX `$WX_CONFIG --libs` *.o -o wxrc strip wxrc @@ -214,6 +207,35 @@ done cp $WXDIR/contrib/utils/wxrc/wxrc $RPM_BUILD_ROOT/%{pref}/bin +# Copy icons and make menu entries +mkdir -p $RPM_BUILD_ROOT/%{_iconsdir} +mkdir -p $RPM_BUILD_ROOT/%{_miconsdir} +mkdir -p $RPM_BUILD_ROOT/%{_menudir} +install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_32.png $RPM_BUILD_ROOT/%{_iconsdir}/PyCrust.png +install -p -m 644 $WXDIR/wxPython/wxPython/py/PyCrust_16.png $RPM_BUILD_ROOT/%{_miconsdir}/PyCrust.png +install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_32.png $RPM_BUILD_ROOT/%{_iconsdir}/XRCed.png +install -p -m 644 $WXDIR/wxPython/wxPython/tools/XRCed/XRCed_16.png $RPM_BUILD_ROOT/%{_miconsdir}/XRCed.png + +cat > $RPM_BUILD_ROOT/%{_menudir}/%{name} <> FILELIST $GFL $RPM_BUILD_ROOT %{wxpref}/lib >> FILELIST $GFL $RPM_BUILD_ROOT "%{wxpref}/lib/libwx*" >> FILELIST $GFL -r $RPM_BUILD_ROOT %{wxpref}/share >> FILELIST +#GFL -r $RPM_BUILD_ROOT %{_iconsdir} >> FILELIST +$GFL -r $RPM_BUILD_ROOT %{_menudir} >> FILELIST $GFL $RPM_BUILD_ROOT %{wxpref}/include > DEVELLIST $GFL -r $RPM_BUILD_ROOT %{wxpref}/include/wx >> DEVELLIST @@ -239,6 +263,13 @@ $GFL $RPM_BUILD_ROOT %{wxconfigname} >> DEVELLIST $GFL $RPM_BUILD_ROOT %{wxpref}/bin/wx-config >> DEVELLIST +#---------------------------------------------------------------- +%post +%{update_menus} + +%postun +%{clean_menus} + #---------------------------------------------------------------- %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT diff --git a/wxPython/wxPython/py/PyCrust.ico b/wxPython/wxPython/py/PyCrust.ico new file mode 100644 index 0000000000000000000000000000000000000000..eae6180e103f0c480023dabb654fa3cfb1202fe7 GIT binary patch literal 4710 zcmeHKUu;`f8UGn4O*-4FTL&d+igKH(s6dJ@q$3{Du$RG_7O(c&N=Y*f`-x<1tuKnS zlm*GRse}`vVIvp~h|QP34c)*OWoje-+3>Qy*-x}_9%9~jizQz6P;vO3~do^!r`_dDM`x!*5<18wkny^wUm0X)gEzQlApaD_5WtLgv#5#X=;H`-s3)U7)&Nb(uJAxYgjH^S+)9*1*;wD4QNxw^XQG8o1+GSXqoc+T3I zli@YF2IfpPyvwbTiOlAmY*JPszfJxpS(xO%k^e!i)6P1vc%%^P+oWyt$h3(>DkCEy zp3ER!*hIFtg=9Lb>Xe*KqWD%3IGsQ!VIo%%NZKXDuBNehZxdG50;aP-G7lqdAs&k( zw~|ApQUL-nAYDQ*orihDLTD<9&CM;?Z-NmZ&Jt+7^; ziHSakhgsF>(BUq4*brLehUejrww6FUANN7&Kk=Q__|Oo!(T_~_t_FD<6E&J_Dx9$Q zsDXD*-*-Qvr=(7FI@QDphlAI(h2eneqdxYiI$i5v)7nO=e<_^-9K1ebDE&d^+zBDMB7thcv={jpBInXk7N zlpRdzPN~wlt)Zcj5uJNvmmFdTRkV;Y0ohmU6qw^K(9o`~F3d{LmW4h?ds4%~yc1As zZ{5FRPAwZ2YaMqQYZW7~WT<#b$QY*VGff%^bk1FGu82m=RLfn;dsKEU3nyC9TG9_V zW2bitQ~rtWjS6(Dk{^(Tpvb_T>`s2Np^Q&8CsPTTy-7&e^Ek-{Ovfgc>>6^wa4lw`336 zh|*8IEl^l1V5?H4Uj>19?dt2N?0g*WC&=X`#jdm4m(M}6Rx%MJLtYww> z>}4DM+?Ta%A;KDDh`&P8Zz`+s4!nNa`(YI;z(l%+k)|@xiKU`u26;Z;U=5J4_ysrl z0Z)?YKVc%yeABF9l+VId8{U`+jo2hcxkZd;5QFJGd`HAXAz~q&m`K;Nv|&yYbL(erUg|)5f5>1==GISUjuN|t4v;%dWEo3hK!Y{Tv4+;& zP1tIzAe|>(yThCrqd$;<=I5UMj6r{WmU$9W=8Ckx$9G0sd$S6Q=OKQx2#tC8c~<>X zCX5?7zDMTBcOkK0mh)_}ib#UF@LbzGpNVCj6Z%GZej~(vNuCXp?=dFVwE1t4`|_J; z|C;sxhl%`W-)p;n{)_yOJkwJD@fr1Hsogov6JLZ2vKveKop|WTNebNI-_OtAKJIf% zIvx)HL5QWWi*n!XMYoT1=k}uOwr_rIX=&}{#l>)!5L7DT#piFm{`wogzV#c11Ni?K zQg2HAkH=qqEo=Scr(NeM{u$Z%^I!b(^774>R^0BzE+ISXclmh~;(OnJ-L=-*WkUsiuDJn~9pd zTwX7)udh$8i+P{>y10A=G-n-OoGrh&E>)B3lN*y88yjMD)c35wB#AN#H#Rtt!^YHw za=9$dj6eT^z{R8LHyNXc3UsEtQ7#`nIxwIKaptQk6jnn; z_#5c!6XQc&HFt=uRRg)T1vF@3EO_1{ub11|3AubhOES&`k>6psaRwe5rVaL)P8`+e_w&Vm0b z_BGTD^!1!HFSOJRtnMlQLaZz%boq#FFq4dwSMNT=#kQm6(!z-P@^ke5-?*W66?5Ra z&3thK^W9C%=3SVnFOSSSJsqZ%-!J`v*xh*;gvethOas1thnd1l98~Ms-q_jwyM<8K z3ESYUwyfF|%oAn#S5mUtxwpX3aF_$ltxQc$t74T{SK;oy))J$tEWPPsOx+sR6>$XS2Y`l;jqkfWERonC}mMh zky=uin1lK4jxkD<#iT;Y@^ki70QXiqMJ^YjFyY>4ShwSe`|#k)ufur+)*UH0 zZ>iLEl6o33>>1^4GKRlMkkWKKF7VoYh&jV}pF_HOI$+iWgQTsB z{$ejxwLyHv+j7q)RzMbEy}vHma$R#SEyOcv`g-rN=_fw8dnMH0dpkET@%so*M%Hrv oidwa@sz!C%vq(bW$-~F$PXsj8B~~=~9RL6T07*qoM6N<$f&>;ui2wiq literal 0 HcmV?d00001 diff --git a/wxPython/wxPython/py/PyCrust_32.png b/wxPython/wxPython/py/PyCrust_32.png new file mode 100644 index 0000000000000000000000000000000000000000..0496f5f5156592cfe94752d8c04ba56fcef0fb78 GIT binary patch literal 1273 zcmV9(E6o9|m89LM0c<&?_x*(a?1QAWh8x{~)7={J09T!t} z$cAEq8W*-*_!ErjV4_hr)C~(vuq-r{#I#*l7A}}dh{P`12@4F6bS8mV5|gE8h?SbCCHDl^EbGkRl=^pstIAmNnay-ZM+&oF8aJn7d9~y3f{KpwEb-P$T2W3A= zB3?qq009{Ic+6(P6ej?~^lX9jv0S(xo;m}jZX?d;taBwH5ii-O;vizy?(=>-mKMr@ z!0C1v9~lV2pLi2CM;wTftz#&SN@rY{y*W*?uMZVhB$A2HWYYjE9j|h>hBRj(H8{$| z4u|ZaREy1qB{21xdGBazsyE}jWewkEK`#^maJn7xV>wK{X4VA=YCQf?l2biT=QwZ< zHVaoqM?<~VWnhgA1dcN<%$*a~c`d)cJXIqrT`kw$K zUswW`Gw4;}+_;^$Cmhm;Qx;(4?N-uV?Va3vyvVNhP5|ybUS#LCj_~>YrAlZ6v^)cd zc2+2tK}5ENx+^!9XiqqdoX;VF>A5*Bj*K9NyHX}$B!ds9!-!T!_gSw(Ybdon!hQZZ z9z3!U{!y#4JrWBc1E`(bI=H`7X#u-*y~4L+<6%ZTp*WE}g2=d-qlGN%iwDYp5&Y!j zTWi^n(RXd6+as|SsAjMWKQHp#_oK*|Y;;J)>)9il>4XyOejxxoy27G-!H!ql$p+xk z3X4SsdXmVv0%O2{_UyS4Jy1w*%&gKl$;BUnks5YE8 zHMM7VDHV;QQGlt~n(lttCHi6)3>79ryMe6Yt4V8+X=+Bh6E4yKMFmw5z5s)b%HQ~q zP+cjA%MhYCU*yj10@1q*kRKbwc_{@#VtkLGvkH8Tsgx=CfbTIenP+A;&s3=a+M~Gp zyAHpIf!6>pNunY!01p+SqCgm=RyeYV3_4_N`Cb|YaQ4_UI;j98HZ%!H5OsYT5afmcV=x346pv2Xzv3X-il{$ z{9wjMbIjbFTMc8L{vkt0Li)!}t965)aHDj6KC)`}tc z@h#u?@#Ft}|1W1|2LBUFTI*mX7^S23^Y+$@Eg^*GdY}FIyKHpGkP`O?mgv*_R387?us+ z2O$`x_?Y6JeT%;Z)N5F_p*7qpwzpBQfiWmG2Nue>&v0?o2O$N7 z6u3|KNUoX$!lpt*Rogwu+RzviKMnxb%eCr6L||qxa|Brfbx6|mr?tl?A@?{CQl8c| z*mZrE`PaA=Gr$*yF$TKPVCGngwr#(>skT{su9s_^1ICzm&&+uSYHgRcjkR_+14^lE zw?tH(17&B#Nf>IGUWo{HvN1E^T{`iUQrqbUpzAvbDRw8}%g&J{)vQh#wCZBkfKlrUYi_%=v5=vTk!^5dHiQoDSeGrge!+LXS9400000 LNkvXXu0mjf