187 lines
7.1 KiB
Python
187 lines
7.1 KiB
Python
--- configure.py.orig Tue Apr 10 17:59:52 2007
|
|
+++ configure.py Thu Apr 12 20:50:50 2007
|
|
@@ -138,26 +138,26 @@
|
|
}
|
|
|
|
def check_modules(self):
|
|
- pyqt_modules.append("QtCore")
|
|
+ #pyqt_modules.append("QtCore")
|
|
|
|
- check_module("QtGui", "qwidget.h", "new QWidget()")
|
|
- check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
|
|
- check_module("QtOpenGL", "qgl.h", "new QGLWidget()")
|
|
- check_module("QtSql", "qsqldatabase.h", "new QSqlDatabase()")
|
|
- check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
|
|
- check_module("QtTest", "QtTest", "QTest::qSleep(0)")
|
|
- check_module("QtXml", "qdom.h", "new QDomDocument()")
|
|
+ #check_module("QtGui", "qwidget.h", "new QWidget()")
|
|
+ #check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()")
|
|
+ #check_module("QtOpenGL", "qgl.h", "new QGLWidget()")
|
|
+ #check_module("QtSql", "qsqldatabase.h", "new QSqlDatabase()")
|
|
+ #check_module("QtSvg", "qsvgwidget.h", "new QSvgWidget()")
|
|
+ #check_module("QtTest", "QtTest", "QTest::qSleep(0)")
|
|
+ #check_module("QtXml", "qdom.h", "new QDomDocument()")
|
|
check_module("QtAssistant", "qassistantclient.h", "new QAssistantClient(\"foo\")")
|
|
|
|
- if sipcfg.universal:
|
|
- sipconfig.inform("QtDesigner module disabled with universal binaries")
|
|
- else:
|
|
- check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
|
|
+ #if sipcfg.universal:
|
|
+ # sipconfig.inform("QtDesigner module disabled with universal binaries")
|
|
+ #else:
|
|
+ # check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
|
|
|
|
- check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
|
|
+ #check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
|
|
|
|
- if os.path.isdir("dbus"):
|
|
- check_dbus()
|
|
+ #if os.path.isdir("dbus"):
|
|
+ # check_dbus()
|
|
|
|
def code(self):
|
|
# Note that the order of the dependent modules is important.
|
|
@@ -211,31 +211,31 @@
|
|
generate_code("QAxContainer", ["QAxContainer", "QtGui", "QtCore"])
|
|
|
|
# Generate the consolidated module.
|
|
- sipconfig.inform("Creating Qt consolidated module...")
|
|
- f = open("Qt.py", "w")
|
|
+ #sipconfig.inform("Creating Qt consolidated module...")
|
|
+ #f = open("Qt.py", "w")
|
|
|
|
- for m in pyqt_modules:
|
|
- f.write("from PyQt4.%s import *\n" % m)
|
|
+ #for m in pyqt_modules:
|
|
+ # f.write("from PyQt4.%s import *\n" % m)
|
|
|
|
- f.close()
|
|
+ #f.close()
|
|
|
|
# Generate the QScintilla API file.
|
|
- sipconfig.inform("Creating QScintilla API file...")
|
|
- f = open("PyQt4.api", "w")
|
|
+ #sipconfig.inform("Creating QScintilla API file...")
|
|
+ #f = open("PyQt4.api", "w")
|
|
|
|
- for m in pyqt_modules:
|
|
- api = open(m + ".api")
|
|
+ #for m in pyqt_modules:
|
|
+ # api = open(m + ".api")
|
|
|
|
- for l in api:
|
|
- f.write("PyQt4." + l)
|
|
+ # for l in api:
|
|
+ # f.write("PyQt4." + l)
|
|
|
|
- api.close()
|
|
- os.remove(m + ".api")
|
|
+ # api.close()
|
|
+ # os.remove(m + ".api")
|
|
|
|
- f.close()
|
|
+ #f.close()
|
|
|
|
def module_installs(self):
|
|
- return ["__init__.py", "Qt.py", "pyqtconfig.py"]
|
|
+ return []
|
|
|
|
def qpylibs(self):
|
|
# See which QPy libraries to build.
|
|
@@ -308,7 +308,7 @@
|
|
tool.append("dbus")
|
|
|
|
# Only include ElementTree for older versions of Python.
|
|
- if sipcfg.py_version < 0x020500:
|
|
+ """if sipcfg.py_version < 0x020500:
|
|
sipconfig.inform("Creating elementtree Makefile...")
|
|
|
|
makefile = sipconfig.PythonModuleMakefile(
|
|
@@ -339,7 +339,7 @@
|
|
)
|
|
|
|
makefile.generate()
|
|
- tool.append("pyuic")
|
|
+ tool.append("pyuic")"""
|
|
|
|
if "QtXml" in pyqt_modules:
|
|
sipconfig.inform("Creating pylupdate4 Makefile...")
|
|
@@ -376,7 +376,8 @@
|
|
makefile.generate()
|
|
tool.append("pyrcc")
|
|
else:
|
|
- sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
|
|
+ #sipconfig.inform("pylupdate4 and pyrcc4 will not be built because the Qt XML module is missing.")
|
|
+ pass
|
|
|
|
if "QtDesigner" in pyqt_modules:
|
|
enabled = True
|
|
@@ -460,7 +461,7 @@
|
|
sipconfig.inform("The Qt mkspecs directory is in %s." % qt_datadir)
|
|
sipconfig.inform("These PyQt modules will be built: %s." % string.join(pyqt_modules))
|
|
sipconfig.inform("The PyQt modules will be installed in %s." % opt_pyqtmoddir)
|
|
- sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
|
|
+ #sipconfig.inform("The Designer plugin will be installed in %s." % os.path.join(opt_plugindir, "designer"))
|
|
|
|
if opt_api:
|
|
sipconfig.inform("The QScintilla API file will be installed in %s." % os.path.join(opt_qscidir, "api", "python"))
|
|
@@ -470,7 +471,7 @@
|
|
|
|
sipconfig.inform("The PyQt .sip files will be installed in %s." % opt_pyqtsipdir)
|
|
|
|
- sipconfig.inform("pyuic4, pyrcc4 and pylupdate4 will be installed in %s." % opt_pyqtbindir)
|
|
+ #sipconfig.inform("pyuic4, pyrcc4 and pylupdate4 will be installed in %s." % opt_pyqtbindir)
|
|
|
|
if opt_vendorcheck:
|
|
sipconfig.inform("PyQt will only be usable with signed interpreters.")
|
|
@@ -808,7 +809,8 @@
|
|
sipfiles = []
|
|
|
|
for s in glob.glob("sip/" + mname + "/*.sip"):
|
|
- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
|
|
+ if mname == "QtAssistant":
|
|
+ sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
|
|
|
|
installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
|
|
|
|
@@ -873,7 +875,7 @@
|
|
sipconfig.error("This version of PyQt and the %s edition of Qt have incompatible licenses." % qted)
|
|
|
|
# Confirm the license.
|
|
- print
|
|
+ """print
|
|
print "Type 'L' to view the license."
|
|
print "Type 'yes' to accept the terms of the license."
|
|
print "Type 'no' to decline the terms of the license."
|
|
@@ -895,7 +897,7 @@
|
|
|
|
if resp == "l":
|
|
os.system("more LICENSE")
|
|
-
|
|
+ """
|
|
# If there should be a license file then check it is where it should be.
|
|
if lfile:
|
|
if os.access(os.path.join("sip", lfile), os.F_OK):
|
|
@@ -1434,16 +1436,18 @@
|
|
installs=[(pyqt.module_installs(), opt_pyqtmoddir)]
|
|
|
|
if opt_api:
|
|
- installs.append(("PyQt4.api", os.path.join(opt_qscidir, "api", "python")))
|
|
+ installs.append(("QtAssistant.api", os.path.join(opt_qscidir, "api", "python")))
|
|
+
|
|
+ pyqt_modules = ["QtAssistant"]
|
|
|
|
sipconfig.ParentMakefile(
|
|
configuration=sipcfg,
|
|
- subdirs=pyqt.qpylibs() + pyqt_modules + pyqt.tools(),
|
|
+ subdirs=pyqt_modules,
|
|
installs=installs
|
|
).generate()
|
|
|
|
# Install the configuration module.
|
|
- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
|
|
+ #create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
|
|
|
|
|
|
###############################################################################
|