jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge pull request #240 from dblugeon/issu-238

Browse source 
Fixe for Issue 238 and issue 228
This commit is contained in:
Jeena Paradies 2013-07-03 10:27:24 -07:00
commit bf33cfe0b2
3 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Qt/Bungloo.py
View file

@ -309,6 +309,15 @@ Usage: bungloo [option [text]]
""" """
sys.exit(1) 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) app = SingleApplication.SingleApplicationWithMessaging(sys.argv, key)
if app.isRunning(): if app.isRunning():
app.sendMessage(json.dumps(sys.argv[1:])) app.sendMessage(json.dumps(sys.argv[1:]))

1
Windows/deploy.ps1
View file

@ -9,4 +9,5 @@ Copy-Item msvcp90.dll bungloo
cd bungloo cd bungloo
python setup.py py2exe python setup.py py2exe
cd .. cd ..
iscc.exe "installer.iss"
rm bungloo rm bungloo

18
Windows/installer.iss
View file

@ -22,9 +22,9 @@ AppUpdatesURL={#MyAppURL}
DefaultDirName={pf}\{#MyAppName} DefaultDirName={pf}\{#MyAppName}
DefaultGroupName={#MyAppName} DefaultGroupName={#MyAppName}
AllowNoIcons=yes AllowNoIcons=yes
LicenseFile=C:\Users\Jeena\Documents\GitHub\Bungloo\LICENSE.txt LicenseFile=..\LICENSE.txt
OutputBaseFilename=setup OutputBaseFilename=setup
SetupIconFile=C:\Users\Jeena\Documents\GitHub\Bungloo\images\Icon.ico SetupIconFile=..\images\Icon.ico
Compression=lzma Compression=lzma
SolidCompression=yes 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 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
[Files] [Files]
Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\Bungloo.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "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: "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: "bungloo\dist\*.pyd"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\w9xpopen.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "bungloo\dist\*.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\images\*"; DestDir: "{app}\images"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "bungloo\dist\w9xpopen.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\Jeena\Documents\GitHub\Bungloo\Windows\bungloo\dist\WebKit\*"; DestDir: "{app}\WebKit"; Flags: ignoreversion recursesubdirs createallsubdirs 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 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Icons] [Icons]