From 8cd73ac37869309e1ce43b75fa15346f535ef4e6 Mon Sep 17 00:00:00 2001
From: dblugeon <dblugeongh@blunet.fr>
Date: Wed, 3 Jul 2013 18:15:37 +0200
Subject: [PATCH 1/2] update windows script build and setup.exe generation

installer.iss use now relative paths instead of absolute.
the generated setup include all needed dll and python files.
---
 Windows/deploy.ps1    |  1 +
 Windows/installer.iss | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Windows/deploy.ps1 b/Windows/deploy.ps1
index 8441559..f4ec800 100644
--- a/Windows/deploy.ps1
+++ b/Windows/deploy.ps1
@@ -9,4 +9,5 @@ Copy-Item msvcp90.dll bungloo
 cd bungloo
 python setup.py py2exe
 cd ..
+iscc.exe "installer.iss"
 rm bungloo
\ No newline at end of file
diff --git a/Windows/installer.iss b/Windows/installer.iss
index 51cf08d..0459aa4 100644
--- a/Windows/installer.iss
+++ b/Windows/installer.iss
@@ -22,9 +22,9 @@ AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
-LicenseFile=C:\Users\Jeena\Documents\GitHub\Bungloo\LICENSE.txt
+LicenseFile=..\LICENSE.txt
 OutputBaseFilename=setup
-SetupIconFile=C:\Users\Jeena\Documents\GitHub\Bungloo\images\Icon.ico
+SetupIconFile=..\images\Icon.ico
 Compression=lzma
 SolidCompression=yes
 
@@ -36,12 +36,14 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
 
 [Files]
-Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\Bungloo.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\library.zip"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\python27.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\w9xpopen.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\images\*"; DestDir: "{app}\images"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\WebKit\*"; DestDir: "{app}\WebKit"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "bungloo\dist\Bungloo.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "bungloo\dist\library.zip"; DestDir: "{app}"; Flags: ignoreversion
+Source: "bungloo\dist\*.pyd"; DestDir: "{app}"; Flags: ignoreversion
+Source: "bungloo\dist\*.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "bungloo\dist\w9xpopen.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "bungloo\dist\images\*"; DestDir: "{app}\images"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "bungloo\dist\imageformats\*"; DestDir: "{app}\imageformats"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "bungloo\dist\WebKit\*"; DestDir: "{app}\WebKit"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

From 44c210e9baa7527e0d4b45a3a54630a62ace6994 Mon Sep 17 00:00:00 2001
From: dblugeon <dblugeongh@blunet.fr>
Date: Wed, 3 Jul 2013 19:13:06 +0200
Subject: [PATCH 2/2] adding a redirect for py2exe logging

now, on windows, log files are stored into %TMP%/BUNGLOO/BUNGLOO.log and

%TMP%/BUNGLOO/BUNGLOO_err.log

see also http://www.py2exe.org/index.cgi/StderrLog

close #238
---
 Qt/Bungloo.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Qt/Bungloo.py b/Qt/Bungloo.py
index 6a065e7..4545b5d 100755
--- a/Qt/Bungloo.py
+++ b/Qt/Bungloo.py
@@ -309,6 +309,15 @@ Usage: bungloo [option [text]]
 			"""
 		sys.exit(1)
 
+	if RUNNING_ON_WINDOWS and not RUNNING_LOCAL:
+		import sys
+		from os import path, environ, makedirs
+		appdata = path.join(environ["TMP"], key)
+		if not path.exists(appdata):
+			makedirs(appdata)
+		sys.stdout = open(path.join(appdata, key + ".log"), "w")
+		sys.stderr = open(path.join(appdata, key + "_err.log"), "w")
+
 	app = SingleApplication.SingleApplicationWithMessaging(sys.argv, key)
 	if app.isRunning():
 		app.sendMessage(json.dumps(sys.argv[1:]))