summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b6e8e24)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31037
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
# Use non-default python?
case $1 in
# Use non-default python?
case $1 in
- 21 | 2.1) VER=21 ;;
- 22 | 2.2) VER=22 ;;
- 23 | 2.3) VER=23 ;;
+ 21 | 2.1) VER=21; shift ;;
+ 22 | 2.2) VER=22; shift ;;
+ 23 | 2.3) VER=23; shift ;;
+ 24 | 2.4) VER=24; shift ;;
- *) echo You must specify the Python version as first parameter.
- exit -1
esac
PYTHON=$TOOLS/python$VER/python.exe
esac
PYTHON=$TOOLS/python$VER/python.exe
SETUP="$PYTHON -u setup.py"
$PYTHON -c "import sys;print '\n', sys.version, '\n'"
SETUP="$PYTHON -u setup.py"
$PYTHON -c "import sys;print '\n', sys.version, '\n'"
;;------------------------------------------------------------
[Files]
;;------------------------------------------------------------
[Files]
-Source: "distrib\msw\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-Source: "distrib\msw\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-Source: "distrib\msw\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-
Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
%(MSLU)s
Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
%(MSLU)s
os.path.walk('wx\\locale', walk_helper, stringlst)
return '\n'.join(stringlst)
os.path.walk('wx\\locale', walk_helper, stringlst)
return '\n'.join(stringlst)
def get_system_dir():
for p in [r"C:\WINNT\SYSTEM32",
r"C:\WINDOWS\SYSTEM32",
def get_system_dir():
for p in [r"C:\WINNT\SYSTEM32",
r"C:\WINDOWS\SYSTEM32",
return p
raise IOError, "System dir not found"
return p
raise IOError, "System dir not found"
def get_batch_files():
globs = {}
execfile("scripts/CreateBatchFiles.py", globs)
def get_batch_files():
globs = {}
execfile("scripts/CreateBatchFiles.py", globs)
scripts = ['Type: files; Name: "{code:GetPythonDir}\Scripts\%s.bat";' % i[0] for i in scripts]
return '\n'.join(scripts)
scripts = ['Type: files; Name: "{code:GetPythonDir}\Scripts\%s.bat";' % i[0] for i in scripts]
return '\n'.join(scripts)
+
+runtime_template = 'Source: "%s"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core'
+
+def get_runtime_dlls(PYVER):
+ if PYVER == "py24":
+ source = [ r"distrib\msw\msvcr71.dll",
+ r"distrib\msw\msvcp71.dll" ]
+ else:
+ source = [ r"distrib\msw\MSVCRT.dll",
+ r"distrib\msw\MSVCIRT.dll",
+ r"distrib\msw\MSVCP60.dll" ]
+ DLLs = [runtime_template % dll for dll in source]
+ return '\n'.join(DLLs)
+
+
#----------------------------------------------------------------------
def main():
#----------------------------------------------------------------------
def main():
UNINSTALL_BATCH = get_batch_files()
PKGDIR = open('src/wx.pth').read()
LOCALE = build_locale_string(PKGDIR)
UNINSTALL_BATCH = get_batch_files()
PKGDIR = open('src/wx.pth').read()
LOCALE = build_locale_string(PKGDIR)
+ RTDLL = get_runtime_dlls(PYVER)
+
print """Building Win32 installer for wxPython:
VERSION = %(VERSION)s
SHORTVER = %(SHORTVER)s
print """Building Win32 installer for wxPython:
VERSION = %(VERSION)s
SHORTVER = %(SHORTVER)s
SYSDIR = %(SYSDIR)s
""" % vars()
SYSDIR = %(SYSDIR)s
""" % vars()
+ if PYTHONVER >= "2.4":
+ IF22 = r"InstallDir := InstallDir + 'Lib\site-packages';"
+ elif PYTHONVER >= "2.2":
IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';"
else:
IF22 = ""
IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';"
else:
IF22 = ""
f = open(ISSDEMOFILE, "w")
f.write(ISS_DocDemo_Template % vars())
f.close()
f = open(ISSDEMOFILE, "w")
f.write(ISS_DocDemo_Template % vars())
f.close()
TOOLS = os.environ['TOOLS']
if TOOLS.startswith('/cygdrive'):
TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash
TOOLS = os.environ['TOOLS']
if TOOLS.startswith('/cygdrive'):
TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash
-COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1"
-HYBRID_FLAGS="DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h"
+COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1 CXXFLAGS=/D__NO_VC_CRTDBG__ "
+HYBRID_FLAGS="DEBUG_FLAG=1 WXDEBUGFLAG=h"