1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
--- configure.py.orig Mon Feb 19 04:39:13 2007
+++ configure.py Tue Feb 20 16:58:29 2007
@@ -133,21 +133,21 @@
}
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("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\")")
- check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
- check_module("QAxContainer", "qaxobject.h", "new QAxObject()", "QAxContainer")
+ #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\")")
+ #check_module("QtDesigner", "QExtensionFactory", "new QExtensionFactory()")
+ #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.
@@ -201,31 +201,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.
@@ -278,7 +278,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(
@@ -309,7 +309,7 @@
)
makefile.generate()
- tool.append("pyuic")
+ tool.append("pyuic")"""
if "QtXml" in pyqt_modules:
sipconfig.inform("Creating pylupdate4 Makefile...")
@@ -428,7 +428,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.")
@@ -761,7 +761,8 @@
sipfiles = []
for s in glob.glob("sip/" + mname + "/*.sip"):
- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
+ if mname == "QtSql":
+ sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
installs.append([sipfiles, os.path.join(opt_pyqtsipdir, mname)])
@@ -825,7 +826,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."
@@ -847,7 +848,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):
@@ -1367,16 +1368,18 @@
scidir = os.path.join(qt_datadir, "qsci")
if opt_api or os.path.isdir(scidir):
- installs.append(("PyQt4.api", os.path.join(scidir, "api", "python")))
+ installs.append(("QtSql.api", os.path.join(scidir, "api", "python")))
+
+ pyqt_modules = ["QtSql"]
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)
###############################################################################
|
