From 873ac33a5efdca9a9bb5ccfccd89a082af1e53cb Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 28 May 2005 08:18:04 +0000 Subject: [PATCH] fix in windows installation: data is now in ../data --- gajim.iss | 40 ++++++++++++++++++++-------------------- setup_win32.py | 22 +++++++++++----------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gajim.iss b/gajim.iss index daec8534f..2f200740d 100644 --- a/gajim.iss +++ b/gajim.iss @@ -8,7 +8,7 @@ AppName=Gajim AppVerName=Gajim version 0.7 DefaultDirName={pf}\Gajim DefaultGroupName=Gajim -UninstallDisplayIcon={app}\Gajim.exe +UninstallDisplayIcon={app}\src\Gajim.exe Compression=lzma SolidCompression=yes @@ -19,27 +19,27 @@ Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixe Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; Components: main [Files] -Source: "dist\*.pyd"; DestDir: "{app}" -Source: "dist\*.dll"; DestDir: "{app}" -Source: "dist\*.zip"; DestDir: "{app}" -Source: "dist\gajim.exe"; DestDir: "{app}"; components: main +Source: "dist\*.pyd"; DestDir: "{app}\src" +Source: "dist\*.dll"; DestDir: "{app}\src" +Source: "dist\*.zip"; DestDir: "{app}\src" +Source: "dist\gajim.exe"; DestDir: "{app}\src"; components: main Source: "*.ico"; DestDir: "{app}" -Source: "dist\*.glade"; DestDir: "{app}" -Source: "dist\data\iconsets\sun\*"; DestDir: "{app}\data\iconsets\sun" -Source: "dist\data\iconsets\stellar\*"; DestDir: "{app}\data\iconsets\stellar" -Source: "dist\data\iconsets\gossip\*"; DestDir: "{app}\data\iconsets\gossip" -Source: "dist\data\iconsets\transports\aim\*"; DestDir: "{app}\data\iconsets\transports\aim" -Source: "dist\data\iconsets\transports\gadugadu\*"; DestDir: "{app}\data\iconsets\transports\gadugadu" -Source: "dist\data\iconsets\transports\icq\*"; DestDir: "{app}\data\iconsets\transports\icq" -Source: "dist\data\iconsets\transports\msn\*"; DestDir: "{app}\data\iconsets\transports\msn" -Source: "dist\data\iconsets\transports\yahoo\*"; DestDir: "{app}\data\iconsets\transports\yahoo" -Source: "dist\data\emoticons\*"; DestDir: "{app}\data\emoticons" -Source: "dist\data\pixmaps\*"; DestDir: "{app}\data\pixmaps" -Source: "dist\data\sounds\*"; DestDir: "{app}\data\sounds" +Source: "dist\*.glade"; DestDir: "{app}\src" +Source: "data\iconsets\sun\*"; DestDir: "{app}\data\iconsets\sun" +Source: "data\iconsets\stellar\*"; DestDir: "{app}\data\iconsets\stellar" +Source: "data\iconsets\gossip\*"; DestDir: "{app}\data\iconsets\gossip" +Source: "data\iconsets\transports\aim\*"; DestDir: "{app}\data\iconsets\transports\aim" +Source: "data\iconsets\transports\gadugadu\*"; DestDir: "{app}\data\iconsets\transports\gadugadu" +Source: "data\iconsets\transports\icq\*"; DestDir: "{app}\data\iconsets\transports\icq" +Source: "data\iconsets\transports\msn\*"; DestDir: "{app}\data\iconsets\transports\msn" +Source: "data\iconsets\transports\yahoo\*"; DestDir: "{app}\data\iconsets\transports\yahoo" +Source: "data\emoticons\*"; DestDir: "{app}\data\emoticons" +Source: "data\pixmaps\*"; DestDir: "{app}\data\pixmaps" +Source: "data\sounds\*"; DestDir: "{app}\data\sounds" [Icons] -Name: "{group}\Gajim"; Filename: "{app}\Gajim.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico" -Name: "{userdesktop}\Gajim"; Filename: "{app}\gajim.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico"; Components: main; Tasks: desktopicon +Name: "{group}\Gajim"; Filename: "{app}\src\Gajim.exe"; WorkingDir: "{app}\src"; IconFilename: "{app}\gajim.ico" +Name: "{userdesktop}\Gajim"; Filename: "{app}\src\gajim.exe"; WorkingDir: "{app}\src"; IconFilename: "{app}\gajim.ico"; Components: main; Tasks: desktopicon [Run] -Filename: "{app}\gajim.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent +Filename: "{app}\src\gajim.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent diff --git a/setup_win32.py b/setup_win32.py index 927cc9e96..d16225d7f 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -49,16 +49,16 @@ setup( options=opts, data_files=[('.', glob.glob('src/gtkgui.glade')), - ('data/iconsets/sun', glob.glob('data/iconsets/sun/*.*')), - ('data/iconsets/stellar', glob.glob('data/iconsets/stellar/*.*')), - ('data/iconsets/gossip', glob.glob('data/iconsets/gossip/*.*')), - ('data/iconsets/transports/aim', glob.glob('data/iconsets/transports/aim/*.*')), - ('data/iconsets/transports/gadugadu', glob.glob('data/iconsets/transports/gadugadu/*.*')), - ('data/iconsets/transports/icq', glob.glob('data/iconsets/transports/icq/*.*')), - ('data/iconsets/transports/msn', glob.glob('data/iconsets/transports/msn/*.*')), - ('data/iconsets/transports/yahoo', glob.glob('data/iconsets/transports/yahoo/*.*')), - ('data/emoticons', glob.glob('data/emoticons/*.*')), - ('data/pixmaps', glob.glob('data/pixmaps/*.*')), - ('data/sounds', glob.glob('data/sounds/*.*')) +# ('data/iconsets/sun', glob.glob('data/iconsets/sun/*.*')), +# ('data/iconsets/stellar', glob.glob('data/iconsets/stellar/*.*')), +# ('data/iconsets/gossip', glob.glob('data/iconsets/gossip/*.*')), +# ('data/iconsets/transports/aim', glob.glob('data/iconsets/transports/aim/*.*')), +# ('data/iconsets/transports/gadugadu', glob.glob('data/iconsets/transports/gadugadu/*.*')), +# ('data/iconsets/transports/icq', glob.glob('data/iconsets/transports/icq/*.*')), +# ('data/iconsets/transports/msn', glob.glob('data/iconsets/transports/msn/*.*')), +# ('data/iconsets/transports/yahoo', glob.glob('data/iconsets/transports/yahoo/*.*')), +# ('data/emoticons', glob.glob('data/emoticons/*.*')), +# ('data/pixmaps', glob.glob('data/pixmaps/*.*')), +# ('data/sounds', glob.glob('data/sounds/*.*')) ], )