diff options
| author | ced <> | 2007-06-12 08:37:32 +0000 |
|---|---|---|
| committer | ced <> | 2007-06-12 08:37:32 +0000 |
| commit | c6ee92d4a10bf9ec41f6b5001dacbbd1e6443c95 (patch) | |
| tree | 438ef264ce79d475b9bf465670775548874dbd34 | |
| parent | 1900b9a6a8372342880b14f4dc2d1a1537c028b3 (diff) | |
SERVER: fix win32 installer
bzr revid: ced-264f923444f1e75970420d037fa5dbf31d80b6d3
| -rw-r--r-- | pixmaps/tinyerp-icon.png (renamed from doc/tinyerp-icon.png) | bin | 1663 -> 1663 bytes | |||
| -rw-r--r-- | pixmaps/tinyerp.ico | bin | 4286 -> 0 bytes | |||
| -rw-r--r-- | setup_py2exe.py | 10 | ||||
| -rw-r--r-- | tinyerp-server-installer.nsi | 13 |
4 files changed, 22 insertions, 1 deletions
diff --git a/doc/tinyerp-icon.png b/pixmaps/tinyerp-icon.png Binary files differindex 9057d12d51e..9057d12d51e 100644 --- a/doc/tinyerp-icon.png +++ b/pixmaps/tinyerp-icon.png diff --git a/pixmaps/tinyerp.ico b/pixmaps/tinyerp.ico Binary files differdeleted file mode 100644 index cde3e961e79..00000000000 --- a/pixmaps/tinyerp.ico +++ /dev/null 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" |
