Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ifs
sconsider
Commits
6d3beb71
Commit
6d3beb71
authored
Oct 30, 2019
by
Marcel Huber
Browse files
WIP: prepared for multiple library versions
- how can we chose between library versions
parent
dc3195b4
Changes
1
Hide whitespace changes
Inline
Side-by-side
SConsider/3rdparty/oracle/oracle.bin.sconsider
View file @
6d3beb71
...
...
@@ -33,7 +33,6 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
},
'lib_occi': {
'sourceFiles': [getBinaryDistDir(packagename).File('occi')],
'libVersion': '.11.1',
'targetType': 'PrecompiledLibrary',
},
'lib_clntsh': {
...
...
@@ -41,8 +40,20 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'libVersion': '.11.1',
'targetType': 'PrecompiledLibrary',
},
'lib_clntsh': {
'sourceFiles': [getBinaryDistDir(packagename).File('clntsh')],
'libVersion': '.19.1',
'targetType': 'PrecompiledLibrary',
'linkDependencies': [
packagename + '.lib_clntshcore',
],
},
'lib_clntshcore': {
'sourceFiles': [getBinaryDistDir(packagename).File('clntshcore')],
'targetType': 'PrecompiledLibrary',
},
'lib_nnz': {
'sourceFiles': [getBinaryDistDir(packagename).File('nnz
11
')],
'sourceFiles': [getBinaryDistDir(packagename).File('nnz')],
'targetType': 'PrecompiledLibrary',
},
'lib_ociicus': { # us language support library
...
...
@@ -97,7 +108,7 @@ elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('include'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
libnames = [('occi', 'lib_occi'), ('clntsh', 'lib_clntsh'), ('nnz
11
', 'lib_nnz'),
libnames = [('occi', 'lib_occi'), ('clntsh', 'lib_clntsh'),
('clntshcore', 'lib_clntshcore'),
('nnz', 'lib_nnz'),
('ociicus', 'lib_ociicus'), ('ociei', 'lib_ociei'), ('sqlplus', 'lib_sqlplus'),
('sqlplusic', 'lib_sqlplusic')]
libs_installed = installPrecompiledLibraries(packagename, libnames)
...
...
@@ -106,7 +117,7 @@ elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
binnames = [('sqlplus', 'bin_sqlplus', {
'require': [
'oracle.lib_sqlplus', 'oracle.lib_sqlplusic', 'oracle.lib_clntsh', 'oracle.lib_nnz',
'oracle.lib_sqlplus', 'oracle.lib_sqlplusic', 'oracle.lib_clntsh',
'oracle.lib_clntshcore',
'oracle.lib_nnz',
'oracle.lib_ociicus'
]
})]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment