Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged modifications from the 2.6 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wxPython/distrib/make_installer_inno4.py
View File

@@ -23,17 +23,11 @@ will be created.
import sys, os, time
KEEP_TEMPS = 1
ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s"
# default InnoSetup installer location
ISCC = r"C:\progra~1\innose~1\ISCC.exe %s"
# see if we can find Inno Setup 4 and use that if so
USING_INNO4=False
try:
import _winreg as wreg
key = wreg.OpenKey(wreg.HKEY_CURRENT_USER, "Software\Bjornar Henden\ISTool4\Prefs")
INNO_FOLDER = wreg.QueryValueEx(key,'InnoFolder')[0]
USING_INNO4=True
except:
pass
if os.environ.has_key("INNO4"):
ISCC = os.environ["INNO4"]
#----------------------------------------------------------------------
@@ -403,7 +397,7 @@ Source: "demo\data\*.mpg"; DestDir: "{app}\demo\data";
;;Source: "demo\dllwidget\makefile.*"; DestDir: "{app}\demo\dllwidget";
Source: "licence\*.txt"; DestDir: "{app}\docs\licence";
Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\docs";
;;Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\docs";
;;Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\docs";
Source: "docs\README.txt"; DestDir: "{app}\docs"; Flags: isreadme;
Source: "docs\*.txt"; DestDir: "{app}\docs";
@@ -628,8 +622,7 @@ def main():
ISSDEMOFILE = "__wxPythonDemo.iss"
IFSFILE = "__wxPython.ifs"
IFSFILEREF = "CodeFile = " + IFSFILE
if USING_INNO4:
IFSFILEREF = ""
IFSFILEREF = ""
UNINSTALL_BATCH = get_batch_files()
PKGDIR = open('src/wx.pth').read()
LOCALE = build_locale_string(PKGDIR)
@@ -669,18 +662,12 @@ def main():
global IFS_Template
global ISS_DocDemo_Template
if USING_INNO4:
ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
f = open(ISSFILE, "w")
f.write(ISS_Template % vars())
f.close()
if not USING_INNO4:
f = open(IFSFILE, "w")
f.write(IFS_Template % vars())
f.close()
f = open(ISSDEMOFILE, "w")
f.write(ISS_DocDemo_Template % vars())
f.close()
@@ -688,16 +675,9 @@ def main():
TOOLS = os.environ['TOOLS']
if TOOLS.startswith('/cygdrive'):
TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash
if USING_INNO4:
print "Hello world!"
ISCC = os.path.join(INNO_FOLDER, "iscc.exe")
ISCC = r'"' + ISCC + '" %s'
os.system(ISCC % (ISSFILE))
#os.system(ISCC % (ISSDEMOFILE))
else:
print "not found..."
os.system(ISCC % (TOOLS, ISSFILE))
os.system(ISCC % (TOOLS, ISSDEMOFILE))
os.system(ISCC % (ISSFILE))
os.system(ISCC % (ISSDEMOFILE))
if not KEEP_TEMPS:
time.sleep(1)