From c6ee92d4a10bf9ec41f6b5001dacbbd1e6443c95 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Tue, 12 Jun 2007 08:37:32 +0000
Subject: [PATCH] SERVER: fix win32 installer

bzr revid: ced-264f923444f1e75970420d037fa5dbf31d80b6d3
---
 {doc => pixmaps}/tinyerp-icon.png | Bin
 pixmaps/tinyerp.ico               | Bin 4286 -> 0 bytes
 setup_py2exe.py                   |  10 +++++++++-
 tinyerp-server-installer.nsi      |  13 +++++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)
 rename {doc => pixmaps}/tinyerp-icon.png (100%)
 delete mode 100644 pixmaps/tinyerp.ico

diff --git a/doc/tinyerp-icon.png b/pixmaps/tinyerp-icon.png
similarity index 100%
rename from doc/tinyerp-icon.png
rename to pixmaps/tinyerp-icon.png
diff --git a/pixmaps/tinyerp.ico b/pixmaps/tinyerp.ico
deleted file mode 100644
index cde3e961e797d6322c3911ba83a559fc70e59422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
zcmeH~TWnNS6o!95L5oPS5kVsz8Y@IiMdi{c$f%KGBgSj+MnP*3HQq3S3Tk*T8U-~G
zP1Gp01}VWyA_i;}Y!HG1N@9%K2Qb<g!Ky?JX`Rk^{QlD!dYqn;4kf<mYQFB7efD1e
z+H2p=Nd5RrB;@~UD3*px8Vgh@39j#h^`q|qI2w+FQmBB*Fb%GNYhf1Dz>V4OuJ`kE
z;dB@UM5jT}AMCd`=5|Lw5gZSvz(lA5>)r<U!y~XHTl)Jvm<f*IY$yZAe-sp|pBsM(
zeMf`+S>Iz`08he8@G88R{qB0_!usRDc^d|Wj-M{ACrT~ke9HuB%@k=_wKV?*+}|rz
zFJ+eNN%MPBWh3QUzP~O_cTCs7c~A~s7RSJm;PDq=!ShlO6h?bH0>l}vm64Rk!ayh_
z_cXT!j5T;g$}~vnPbu5tW7)G`+WLdE@k?oQ6CIP_^^#k6p2yy<JDPSg`tCeQ`t!qh
z{n~A~Cq_L5bHRHg0lB>QMH@G^#=%niYw`M%Hqu}fc<yV#d(Zo>2>Lp9T-e^lS9@K&
z{)7!Q_&4-d{I4Ik9}jE(y;i+f^QiawJJkH=`3ij_(aqe>>(ytK&kW<w)GcQ(9g=>w
ze>b1F{fAlG_l@s~A>gyacn?$eDCbyPU4iS*eSPld`?UXjv%bgc^Kt}u{~CWD%5}#b
zQn0>#`3&$l@_kZuz&z)<yVmzbIaI)zFa|isXPhAI@8SH3U4Op!h&$Bg9t-`9qqNUc
zA!^q5JUQNz;VekPMNkREGllv;>I=w!f_}cYi96J@ANxy!@A0Tv-??|5%E0I647duW
z1MMq_dEd%|=)XZbpTD<&?_T?H&J%DB*pL0$ul+|2{qN6^etS;ZaUW@OoPLM78Mp&=
zF|QxI1MFRW5PhG&x%(%{=hLJ`+(WzSrS<sL^-v4;djUiZ{niV)WA_rnCTaX-Je&o0
z!5u)Kk<+B_-swT#_fG>XgWI7B#!G7%OGlg3yfs^IfA;I~MGgI*nV)ovl-eWB_L%3u
zLU;&>p@es;=5_J<6S<c|{bwoX!__Q%V%SbjGJi>*Y@yD6>~9Xl=<j1~rg!6?_A3|B
zrUo8_B|zU|V*mW3c>PM^5_#4$@BrMzdZ}ejc^~n4{r+a^?8ndScPd1U@wbja|Le~7
zKasD|j92%-Vj!NO3#4ry$Lmja?w7;kKs((kJ-n3McXYO2vw=GMxf{q$xTh$h_UkD0
zzvyhA{#|<eF|Gj5!(8B9d)Pebv!;0cs;6mVUC%G=%hBJpv#aguH#_Tf9VP25{9Qm1
zwI7EwSKGV#q<&#Y_$#WW6?<mHmC`qjUC*QUU=8oX;kYhm+4JuE)p~qo$L@A-dHr7k
z=R*ZB)_iLnf^X(2>NnLQ?S6qc$l1#?Ie#K!iniPF1XFvdwC+yk@dLC|U4AkdX_Ip^
z7RrFLG(2Z0q84!e20g5=s8*q${m$Gx8>JE`hQTlhVk}rl44h+`Rh@LOuKG%<j^8ko
z5F40<arSus^XP!FC&G93xUxUbdP7`a*Zt=$$hW2eL69yz9DJKemzou6v$%9>n)5DS
F?r-wL)Rq7M

diff --git a/setup_py2exe.py b/setup_py2exe.py
index 46deeb415c4..992e5ac11f3 100644
--- a/setup_py2exe.py
+++ b/setup_py2exe.py
@@ -16,11 +16,19 @@ options = {"py2exe": {"compressed": 0,
 data_files = []
 
 os.chdir('bin')
-for (dp,dn,names) in os.walk('addons', 'i18n'):
+for (dp,dn,names) in os.walk('addons'):
+	if '.svn' in dn:
+		dn.remove('.svn')
+	data_files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))
+for (dp,dn,names) in os.walk('i18n'):
 	if '.svn' in dn:
 		dn.remove('.svn')
 	data_files.append((dp, map(lambda x: os.path.join('bin', dp,x), names)))
 os.chdir('..')
+for (dp,dn,names) in os.walk('doc'):
+	if '.svn' in dn:
+		dn.remove('.svn')
+	data_files.append((dp, map(lambda x: os.path.join(dp,x), names)))
 
 setup(
 	name="tinyerp-server",
diff --git a/tinyerp-server-installer.nsi b/tinyerp-server-installer.nsi
index a1206ecc92b..7dca10ad667 100644
--- a/tinyerp-server-installer.nsi
+++ b/tinyerp-server-installer.nsi
@@ -145,13 +145,26 @@ Section "Uninstall"
   Push "$INSTDIR\addons"
   Push ""
   Call un.RmFilesButOne
+  Push "$INSTDIR\i18n"
+  Push ""
+  Call un.RmFilesButOne
   Delete "$INSTDIR\service\*"
+  Push "$INSTDIR\doc"
+  Push ""
+  Call un.RmFilesButOne
   Delete "$INSTDIR\*"
   Delete "$INSTDIR\Uninstall.exe"
 
   Push "$INSTDIR\addons"
   Push ""
   Call un.RmDirsButOne
+  Push "$INSTDIR\i18n"
+  Push ""
+  Call un.RmDirsButOne
+  Push "$INSTDIR\doc"
+  Push ""
+  Call un.RmDirsButOne
+  RMDir "$INSTDIR\doc"
   RMDir "$INSTDIR\addons"
   RMDir "$INSTDIR\service"
   RMDir "$INSTDIR"