Skip to content

Commit

Permalink
- generate SIP build files in build directory, not in source dir
Browse files Browse the repository at this point in the history
- show command line used to run SIP binary
- remove ignore flags from python/core and python/gui - not needed anymore


git-svn-id: http://svn.osgeo.org/qgis/trunk@8192 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Mar 6, 2008
1 parent 244c451 commit 403e095
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions python/configure.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ if not os.path.isdir("./gui"):

# The name of the SIP build file generated by SIP and used by the build
# system.
build_file_core = src_path + "/python/core/core.sbf"
build_file_gui = src_path + "/python/gui/gui.sbf"
build_file_core = build_path + "/python/core/core.sbf"
build_file_gui = build_path + "/python/gui/gui.sbf"

# Get the SIP configuration information.
config = PyQt4.pyqtconfig.Configuration()
Expand All @@ -66,9 +66,14 @@ sip_dir_gui = os.path.join(config.default_sip_dir, "qgis/gui")

# Run SIP to generate the code.
print "Parsing SIP files for 'core' library..."
os.system(" ".join([config.sip_bin, "-c", "core", "-b", build_file_core, "-I", config.pyqt_sip_dir, qt_sip_flags, python_path + "/core/core.sip"]))
cmd = " ".join([config.sip_bin, "-c", "core", "-b", build_file_core, "-I", config.pyqt_sip_dir, qt_sip_flags, python_path + "/core/core.sip"])
print cmd
os.system(cmd)

print "Parsing SIP files for 'gui' library..."
os.system(" ".join([config.sip_bin, "-c", "gui", "-b", build_file_gui, "-I", python_path, "-I", config.pyqt_sip_dir, qt_sip_flags, python_path + "/gui/gui.sip"]))
cmd = " ".join([config.sip_bin, "-c", "gui", "-b", build_file_gui, "-I", python_path, "-I", config.pyqt_sip_dir, qt_sip_flags, python_path + "/gui/gui.sip"])
print cmd
os.system(cmd)


##########################################################################
Expand Down

0 comments on commit 403e095

Please sign in to comment.