|
 |
0290444 |
From c4b4ce60763ffa8f47598906bbd5abd221bf3a3e Mon Sep 17 00:00:00 2001
|
|
|
5804b9a |
From: Scott Talbert <swt@techie.net>
|
|
|
0290444 |
Date: Fri, 25 Oct 2019 22:34:41 -0400
|
|
|
5804b9a |
Subject: [PATCH] Unbundle sip
|
|
|
5804b9a |
|
|
|
5804b9a |
---
|
|
|
0290444 |
buildtools/config.py | 4 ----
|
|
|
0290444 |
wscript | 23 +----------------------
|
|
|
0290444 |
2 files changed, 1 insertion(+), 26 deletions(-)
|
|
|
5804b9a |
|
|
|
0290444 |
diff --git a/buildtools/config.py b/buildtools/config.py
|
|
|
0290444 |
index e7691a69..435aaca0 100644
|
|
|
0290444 |
--- a/buildtools/config.py
|
|
|
0290444 |
+++ b/buildtools/config.py
|
|
|
0290444 |
@@ -968,10 +968,6 @@ def updateLicenseFiles(cfg):
|
|
|
0290444 |
copy_file(opj(cfg.WXDIR, 'docs', filename), opj('license',filename),
|
|
|
0290444 |
update=1, verbose=1)
|
|
|
0290444 |
|
|
|
0290444 |
- # Get the sip license too
|
|
|
0290444 |
- copy_file(opj('sip', 'siplib', 'LICENSE'), opj('license', 'sip-license.txt'),
|
|
|
0290444 |
- update=1, verbose=1)
|
|
|
0290444 |
-
|
|
|
0290444 |
# Combine the relevant files into a single LICENSE.txt file
|
|
|
0290444 |
text = ''
|
|
|
0290444 |
for filename in ['preamble.txt', 'licence.txt', 'lgpl.txt', 'sip-license.txt']:
|
|
|
5804b9a |
diff --git a/wscript b/wscript
|
|
|
0290444 |
index 5ea9cb2e..36d2819b 100644
|
|
|
5804b9a |
--- a/wscript
|
|
|
5804b9a |
+++ b/wscript
|
|
|
0290444 |
@@ -115,7 +115,7 @@ def configure(conf):
|
|
|
5804b9a |
conf.env.msvc_relwithdebug = conf.options.msvc_relwithdebug
|
|
|
5804b9a |
|
|
|
5804b9a |
# Ensure that the headers in siplib and Phoenix's src dir can be found
|
|
|
ef788ff |
- conf.env.INCLUDES_WXPY = ['sip/siplib', 'wx/include', 'src']
|
|
|
ef788ff |
+ conf.env.INCLUDES_WXPY = ['wx/include', 'src']
|
|
|
5804b9a |
|
|
|
5804b9a |
if isWindows:
|
|
|
5804b9a |
# Windows/MSVC specific stuff
|
|
|
0290444 |
@@ -577,28 +577,7 @@ def build(bld):
|
|
|
0290444 |
for name in ['src/__init__.py', 'src/gizmos.py',]:
|
|
|
0290444 |
copy_file(name, cfg.PKGDIR, update=1, verbose=1)
|
|
|
5804b9a |
|
|
|
0290444 |
- # Copy sip's sip.h for distribution with wxPython's header
|
|
|
0290444 |
- copy_file('sip/siplib/sip.h', 'wx/include/wxPython', update=1, verbose=1)
|
|
|
0290444 |
-
|
|
|
5804b9a |
# Create the build tasks for each of our extension modules.
|
|
|
5804b9a |
- addRelwithdebugFlags(bld, 'siplib')
|
|
|
5804b9a |
- siplib = bld(
|
|
|
5804b9a |
- features = 'c cxx cshlib cxxshlib pyext',
|
|
|
5804b9a |
- target = makeTargetName(bld, 'siplib'),
|
|
|
5804b9a |
- source = ['sip/siplib/apiversions.c',
|
|
|
5804b9a |
- 'sip/siplib/array.c',
|
|
|
5804b9a |
- 'sip/siplib/bool.cpp',
|
|
|
5804b9a |
- 'sip/siplib/descriptors.c',
|
|
|
5804b9a |
- 'sip/siplib/int_convertors.c',
|
|
|
5804b9a |
- 'sip/siplib/objmap.c',
|
|
|
5804b9a |
- 'sip/siplib/qtlib.c',
|
|
|
5804b9a |
- 'sip/siplib/siplib.c',
|
|
|
5804b9a |
- 'sip/siplib/threads.c',
|
|
|
5804b9a |
- 'sip/siplib/voidptr.c',
|
|
|
5804b9a |
- ],
|
|
|
5804b9a |
- uselib = 'siplib WX WXPY',
|
|
|
5804b9a |
- )
|
|
|
5804b9a |
- makeExtCopyRule(bld, 'siplib')
|
|
|
5804b9a |
|
|
|
5804b9a |
# Add build rules for each of our ETG generated extension modules
|
|
|
5804b9a |
makeETGRule(bld, 'etg/_core.py', '_core', 'WX')
|
|
|
5804b9a |
--
|
|
|
91e543a |
2.21.0
|
|
|
5804b9a |
|