$NetBSD: patch-aa,v 1.4 2005/10/06 17:57:49 drochner Exp $ --- configure.py.orig 2005-08-30 19:42:52.000000000 +0200 +++ configure.py @@ -38,7 +38,7 @@ pyqt_version_str = "3.15" sip_min_v3_version = 0x030c00 sip_min_v4_version = 0x040300 -pyqt_modules = ["qt"] +pyqt_modules = [] qt_sip_flags = [] qtext_sip_flags = [] qtpe_sip_flags = [] @@ -733,7 +733,7 @@ def check_license(): print "Type 'no' to decline the terms of the license." print - while 1: + while 0: try: resp = raw_input("Do you accept the terms of the license? ") except: @@ -767,64 +767,64 @@ def create_makefiles(): # The Professional Edition needs special handling. prof = (sipcfg.qt_edition == "professional") - sipconfig.inform("Creating pyuic Makefile...") - - if prof or "qtxml" not in pyqt_modules: - buildfile= "pyuic-prof.sbf" - - for xml in ("qdom.cpp", "qxml.cpp"): - shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml) - else: - buildfile= "pyuic.sbf" - - makefile = sipconfig.ProgramMakefile( - configuration=sipcfg, - build_file=buildfile, - dir="pyuic3", - install_dir=opt_pyqtbindir, - console=1, - qt=1, - warnings=1 - ) - - makefile.extra_defines.append("UIC") - makefile.extra_defines.append("QT_INTERNAL_XML") - - if prof or "qtxml" not in pyqt_modules: - makefile.extra_defines.append("QT_MODULE_XML") +# sipconfig.inform("Creating pyuic Makefile...") - if sipcfg.qt_version < 0x030100: - makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib") +# if prof or "qtxml" not in pyqt_modules: +# buildfile= "pyuic-prof.sbf" - makefile.generate() - subdirs.append("pyuic3") - - sipconfig.inform("Creating pylupdate Makefile...") +# for xml in ("qdom.cpp", "qxml.cpp"): +# shutil.copyfile(sipcfg.qt_dir + "/src/xml/" + xml, "pyuic3/" + xml) +# else: +# buildfile= "pyuic.sbf" + +# makefile = sipconfig.ProgramMakefile( +# configuration=sipcfg, +# build_file=buildfile, +# dir="pyuic3", +# install_dir=opt_pyqtbindir, +# console=1, +# qt=1, +# warnings=1 +# ) + +# makefile.extra_defines.append("UIC") +# makefile.extra_defines.append("QT_INTERNAL_XML") + +# if prof or "qtxml" not in pyqt_modules: +# makefile.extra_defines.append("QT_MODULE_XML") + +# if sipcfg.qt_version < 0x030100: +# makefile.extra_include_dirs.append(sipcfg.qt_dir + "/src/3rdparty/zlib") + +# makefile.generate() +# subdirs.append("pyuic3") + +# sipconfig.inform("Creating pylupdate Makefile...") + +# if prof or "qtxml" not in pyqt_modules: +# buildfile= "pylupdate-prof.sbf" + +# shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp") +# else: +# buildfile= "pylupdate.sbf" + +# makefile = sipconfig.ProgramMakefile( +# configuration=sipcfg, +# build_file=buildfile, +# dir="pylupdate3", +# install_dir=opt_pyqtbindir, +# console=1, +# qt=1, +# warnings=1 +# ) - if prof or "qtxml" not in pyqt_modules: - buildfile= "pylupdate-prof.sbf" +# makefile.extra_defines.append("QT_INTERNAL_XML") - shutil.copyfile(sipcfg.qt_dir + "/src/xml/qxml.cpp", "pylupdate3/qxml.cpp") - else: - buildfile= "pylupdate.sbf" +# if prof or "qtxml" not in pyqt_modules: +# makefile.extra_defines.append("QT_MODULE_XML") - makefile = sipconfig.ProgramMakefile( - configuration=sipcfg, - build_file=buildfile, - dir="pylupdate3", - install_dir=opt_pyqtbindir, - console=1, - qt=1, - warnings=1 - ) - - makefile.extra_defines.append("QT_INTERNAL_XML") - - if prof or "qtxml" not in pyqt_modules: - makefile.extra_defines.append("QT_MODULE_XML") - - makefile.generate() - subdirs.append("pylupdate3") +# makefile.generate() +# subdirs.append("pylupdate3") elif sipcfg.qt_version >= 0x020000: sipconfig.inform("Creating pyuic Makefile...") @@ -940,20 +940,20 @@ def main(argv): check_qscintilla() # Check which modules to build. - check_module("qtcanvas", "qcanvas.h", "QCanvas()") - check_module("qtnetwork", "qsocket.h", "QSocket()") - check_module("qttable", "qtable.h", "QTable()") - check_module("qtxml", "qdom.h", "QDomImplementation()") - check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) +# check_module("qtcanvas", "qcanvas.h", "QCanvas()") +# check_module("qtnetwork", "qsocket.h", "QSocket()") +# check_module("qttable", "qtable.h", "QTable()") +# check_module("qtxml", "qdom.h", "QDomImplementation()") +# check_module("qtgl", "qgl.h", "QGLWidget()", opengl=1) - if sipcfg.qt_version >= 0x030000: - check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") +# if sipcfg.qt_version >= 0x030000: +# check_module("qtui", "qwidgetfactory.h", "QWidgetFactory()", lib="qui") - if sipcfg.qt_edition in ("enterprise", "free"): - check_module("qtsql", "qsql.h", "QSql()") +# if sipcfg.qt_edition in ("enterprise", "free"): +# check_module("qtsql", "qsql.h", "QSql()") - if sys.platform == "win32" and sipcfg.sip_version >= 0x040200: - check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer") +# if sys.platform == "win32" and sipcfg.sip_version >= 0x040200: +# check_module("qtaxcontainer", "qaxobject.h", "QAxObject()", lib="qaxcontainer") if qsci_version: check_module("qtext", "qextscintillabase.h", "QextScintillaBase()", define=qsci_define, include_dir=opt_qsciincdir, lib_dir=opt_qscilibdir, lib="qscintilla")