Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase on tagged 4.8 shiboken #10

Open
wants to merge 66 commits into
base: improve-template-support
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
2f8abc0
Fix buffer overrun processing macro definitions
mwoehlke-kitware Oct 15, 2013
0490b30
Only use fields in PyTypeObject when defining types
jpe Nov 12, 2013
faa44f3
Fix compilation issue on OS X 10.9
jensenb Oct 26, 2013
a527dd5
Fix for containers with 'const' values
mwoehlke-kitware Dec 31, 2013
cb06719
doc: Stop requiring sphinx.ext.refcounting.
rakuco Dec 25, 2013
5b39f7f
Fix building with python 3.3 and 3.4.
Mar 26, 2014
35d006a
Fix function rejections (i.e. support overloads)
mwoehlke-kitware Nov 10, 2013
ebf3ba5
Add parsing of 'noexcept' keyword
mwoehlke-kitware Apr 16, 2014
bca7c11
Remove protected from samblebinding test
jpe Apr 16, 2014
e2897e1
Remove rejection lines that cause the sample_list test to fail
jcummings2 Apr 17, 2014
4e00312
Version bump
jpe Apr 22, 2014
4978122
Return enums in declaration order (order added)
mwoehlke-kitware Feb 17, 2015
0fd6bc3
Process global enums in declaration order
mwoehlke-kitware Feb 17, 2015
aa39374
Don't ignore classes in topology
mwoehlke-kitware Feb 20, 2015
64b024f
Start implementing template class support
mwoehlke-kitware Aug 6, 2013
228a918
(Partly) implement wrappers for instantiations
mwoehlke-kitware Aug 6, 2013
87c6001
Implement type look-up for template instantiatons
mwoehlke-kitware Aug 6, 2013
8d1dfc2
Implement instantiation resolutions
mwoehlke-kitware Aug 6, 2013
e04cb82
Fix adding functions to instantiations
mwoehlke-kitware Aug 6, 2013
faaffc5
Test resolution of typedefs of type-templates
mwoehlke-kitware Aug 28, 2013
3166291
Fix container argument resolution corner case
mwoehlke-kitware Aug 29, 2013
8b8163e
Fix scoped resolution of instantiations
mwoehlke-kitware Aug 29, 2013
ea8820b
Fix type alias creation for instantiations
mwoehlke-kitware Aug 29, 2013
b794b3d
Fix resolution of instantiation arguments
mwoehlke-kitware Sep 4, 2013
0212dde
Fix instantiation naming
mwoehlke-kitware Sep 4, 2013
888df1e
Omit redirections for protected members
mwoehlke-kitware Sep 4, 2013
8a920a3
Always sanitize name of wrapper classes
mwoehlke-kitware Sep 4, 2013
5f9ac1a
Use qualified name for wrapper class name
mwoehlke-kitware Sep 5, 2013
e7ee10a
Support type-template function modifications
mwoehlke-kitware Sep 16, 2013
5cac414
Remove unneeded code
mwoehlke-kitware Sep 17, 2013
fadb8c8
Fix type resolution for type-template functions
mwoehlke-kitware Sep 17, 2013
a3a2ada
Fix type template function additions
mwoehlke-kitware Sep 17, 2013
60673f5
Fix late resolution of instantiation arguments
mwoehlke-kitware Sep 19, 2013
40d167c
Reject container types with unknown arguments
mwoehlke-kitware Sep 19, 2013
48462f9
Fix redirections of base class methods
mwoehlke-kitware Sep 19, 2013
6db96db
Fix creation of duplicate redirections
mwoehlke-kitware Sep 20, 2013
76854ee
Improve pointer-like template wrapping
mathstuf Sep 16, 2013
a6fdc41
Add a 'const' in the reinterpret_cast
mathstuf Sep 18, 2013
ad050f9
Add conversion to python None in the C++ to Python copy conversion fu…
johnkit Sep 23, 2013
9f68e94
Add test for wraps-pointer-as inheritance
mathstuf Oct 1, 2013
5912b32
Support adding a base class to a metaclass
mathstuf Oct 2, 2013
77b0af4
Store the pointer argument index
mathstuf Oct 2, 2013
5948139
Output base class information piecemeal
mathstuf Oct 2, 2013
24daa88
Make wraps-pointer-as inherit over the wrapped type
mathstuf Sep 26, 2013
1f52db3
Check the baseClasses variable for its size
mathstuf Oct 2, 2013
2a39906
Set the base class if it is not already set
mathstuf Oct 8, 2013
3444020
Use the qualified name of the base class
mathstuf Oct 8, 2013
b3cd806
Mark a metaclass which has injected dependencies
mathstuf Oct 8, 2013
5315776
Sort classes with injected dependencies
mathstuf Oct 8, 2013
eac1bab
Look up full names when sorting
mathstuf Oct 8, 2013
86477e5
fix a compilation error in mac
judajake Sep 25, 2013
bc7152b
Remove output to cerr that looks to be left over debugging code.
Aug 29, 2013
9348940
Correctly assign m_handle to ptr.
Aug 15, 2013
c4c3219
Correct forward declare of SbkObject to be of type struct.
Aug 15, 2013
32b682c
add setting install_name_dir property
judajake Oct 17, 2013
549528f
add rpath so libshiboken can be found when in same dir
judajake Oct 24, 2013
2bb6524
add control and protection
judajake Oct 24, 2013
a997bb0
Fix for Mavericks (and other systems using libc++).
vibraphone Nov 11, 2013
abc5a7b
Eliminate warnings in headers and generated code.
vibraphone Dec 7, 2013
32fdeee
Generate code that generates fewer warnings.
vibraphone Dec 17, 2013
9469d27
Fix broken file-existence tests.
vibraphone Feb 20, 2014
db11f04
Provide a way to skip parsing statements.
vibraphone Sep 9, 2014
ea007f9
shiboken: support response files
mathstuf Apr 15, 2015
d2d421c
cmake: provide PYTHONPATH component needed to use the module
mathstuf Apr 23, 2015
acd0c97
cmake: ensure forward slashes in the python path
mathstuf Apr 27, 2015
c09e3f8
operators: skip nullary operators
mathstuf Jun 1, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
shiboken: support response files
mathstuf authored and tjcorona committed Oct 21, 2016
commit ea007f98771b1b230e4d82acc0d043bec738b807
27 changes: 21 additions & 6 deletions generator/main.cpp
Original file line number Diff line number Diff line change
@@ -215,13 +215,8 @@ static QMap<QString, QString> getInitializedArguments()
return args;
}

static QMap<QString, QString> getCommandLineArgs()
static void parseCommandLine(QMap<QString, QString>& args, QStringList arguments, int& argNum)
{
QMap<QString, QString> args = getInitializedArguments();
QStringList arguments = QCoreApplication::arguments();
arguments.removeFirst();

int argNum = 0;
foreach (QString arg, arguments) {
arg = arg.trimmed();
if (arg.startsWith("--")) {
@@ -232,11 +227,31 @@ static QMap<QString, QString> getCommandLineArgs()
args[arg.mid(2)] = QString();
} else if (arg.startsWith("-")) {
args[arg.mid(1)] = QString();
} else if (arg.startsWith("@")) {
QFile responseFile(arg.mid(1));
if (responseFile.open(QIODevice::ReadOnly)) {
QTextStream stream(&responseFile);
QStringList responseArgs;
while (!stream.atEnd()) {
responseArgs << stream.readLine();
}
parseCommandLine(args, responseArgs, argNum);
}
} else {
argNum++;
args[QString("arg-%1").arg(argNum)] = arg;
}
}
}

static QMap<QString, QString> getCommandLineArgs()
{
QMap<QString, QString> args = getInitializedArguments();
QStringList arguments = QCoreApplication::arguments();
arguments.removeFirst();

int argNum = 0;
parseCommandLine(args, arguments, argNum);
return args;
}