[Commits] (john) fixed a bug in gizmos project file and other build
related bugs in robin's default build settings
commits at osafoundation.org
commits at osafoundation.org
Fri Apr 9 17:47:17 PDT 2004
Commit by: john
Modified files:
wxPythonSrc-2.5.1.5/wxPython/setup.py 2.1.5.1 2.2
wxPythonSrc-2.5.1.5/wxPython/config.py 2.2 2.3
wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj 1.1 1.2
Log message:
fixed a bug in gizmos project file and other build related bugs in robin's default build settings
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/wxPython/setup.py.diff?r1=text&tr1=2.1.5.1&r2=text&tr2=2.2
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/wxPython/config.py.diff?r1=text&tr1=2.2&r2=text&tr2=2.3
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
Index: wxPythonSrc-2.5.1.5/wxPython/config.py
diff -u wxPythonSrc-2.5.1.5/wxPython/config.py:2.2 wxPythonSrc-2.5.1.5/wxPython/config.py:2.3
--- wxPythonSrc-2.5.1.5/wxPython/config.py:2.2 Fri Apr 9 15:58:59 2004
+++ wxPythonSrc-2.5.1.5/wxPython/config.py Fri Apr 9 17:46:46 2004
@@ -15,7 +15,7 @@
# Author: Robin Dunn
#
# Created: 23-March-2004
-# RCS-ID: $Id: config.py,v 2.2 2004/04/09 22:58:59 morgen Exp $
+# RCS-ID: $Id: config.py,v 2.3 2004/04/10 00:46:46 john Exp $
# Copyright: (c) 2004 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------
@@ -140,11 +140,11 @@
# Some MSW build settings
-FINAL = 0 # Mirrors use of same flag in wx makefiles,
+FINAL = 1 # Mirrors use of same flag in wx makefiles,
# (0 or 1 only) should probably find a way to
# autodetect this...
-HYBRID = 1 # If set and not debug or FINAL, then build a
+HYBRID = 0 # If set and not debug or FINAL, then build a
# hybrid extension that can be used by the
# non-debug version of python, but contains
# debugging symbols for wxWidgets and wxPython.
Index: wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj
diff -u wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj:1.1 wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj:1.2
--- wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj:1.1 Fri Apr 9 13:35:39 2004
+++ wxPythonSrc-2.5.1.5/contrib/build/gizmos/wxPythonGizmos/wxPythonGizmos.vcproj Fri Apr 9 17:46:46 2004
@@ -34,7 +34,7 @@
<Tool
Name="VCNMakeTool"
BuildCommandLine="cd ..
-nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=debug UNICODE=0 MSLU=0"
+nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0"
ReBuildCommandLine="cd ..
nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0 clean
nmake -f makefile.vc OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=0 USE_OPENGL=1 BUILD=release UNICODE=0 MSLU=0
Index: wxPythonSrc-2.5.1.5/wxPython/setup.py
diff -u wxPythonSrc-2.5.1.5/wxPython/setup.py:2.1.5.1 wxPythonSrc-2.5.1.5/wxPython/setup.py:2.2
--- wxPythonSrc-2.5.1.5/wxPython/setup.py:2.1.5.1 Thu Apr 8 18:17:22 2004
+++ wxPythonSrc-2.5.1.5/wxPython/setup.py Fri Apr 9 17:46:46 2004
@@ -6,7 +6,7 @@
# Author: Robin Dunn
#
# Created: 12-Oct-2000
-# RCS-ID: $Id: setup.py,v 2.1.5.1 2004/04/09 01:17:22 markie Exp $
+# RCS-ID: $Id: setup.py,v 2.2 2004/04/10 00:46:46 john Exp $
# Copyright: (c) 2000 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------
@@ -503,31 +503,32 @@
# Define the ACTIVEX extension module (experimental)
#----------------------------------------------------------------------
-if BUILD_ACTIVEX:
- msg('Preparing ACTIVEX...')
- location = 'contrib/activex'
- axloc = opj(location, "wxie")
-
- swig_files = ['activex.i', ]
-
- swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps +
- [ '%s/_activex_ex.py' % location])
-
-
- ext = Extension('_activex', ['%s/IEHtmlWin.cpp' % axloc,
- '%s/wxactivex.cpp' % axloc,
- ] + swig_sources,
-
- include_dirs = includes + [ axloc ],
- define_macros = defines,
-
- library_dirs = libdirs,
- libraries = libs,
-
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
+# sources don't include activex, so I commented it out -- DJA
+#if BUILD_ACTIVEX:
+# msg('Preparing ACTIVEX...')
+# location = 'contrib/activex'
+# axloc = opj(location, "wxie")
+#
+# swig_files = ['activex.i', ]
+#
+# swig_sources = run_swig(swig_files, location, '', PKGDIR,
+# USE_SWIG, swig_force, swig_args, swig_deps +
+# [ '%s/_activex_ex.py' % location])
+#
+#
+# ext = Extension('_activex', ['%s/IEHtmlWin.cpp' % axloc,
+# '%s/wxactivex.cpp' % axloc,
+# ] + swig_sources,
+#
+# include_dirs = includes + [ axloc ],
+# define_macros = defines,
+#
+# library_dirs = libdirs,
+# libraries = libs,
+#
+# extra_compile_args = cflags,
+# extra_link_args = lflags,
+# )
wxpExtensions.append(ext)
More information about the Commits
mailing list