Commit 03da6bf9 authored by Marcel Huber's avatar Marcel Huber
Browse files

combine package and targetname using helper function

parent 6484c1e7
......@@ -34,8 +34,8 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'tests': {
'targetType': 'ProgramTest',
'linkDependencies': [
PackageRegistry.createFulltargetname(packagename, 'include'),
PackageRegistry.createFulltargetname('boost', 'include'),
createFulltargetname(packagename, 'include'),
createFulltargetname('boost', 'include'),
],
'includeSubdir': 'cute_tests',
'sourceFiles': listFiles(['cute_tests/*.cpp']),
......
......@@ -27,8 +27,9 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import createTargets
buildSettings = {
packagename: {
'linkDependencies': [packagename + '.ldap50'],
'targetType': 'IncludeOnly',
'linkDependencies': [
createFulltargetname(packagename, 'ldap50')
],
'public': {
'includeSubdir': 'include',
},
......
......@@ -34,7 +34,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'objects': {
'targetType': 'LibraryShared',
'linkDependencies': [
PackageRegistry.createFulltargetname(packagename, 'include'),
createFulltargetname(packagename, 'include'),
],
'sourceFiles': listFiles(['src/*.cpp']),
},
......
......@@ -28,9 +28,9 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings = {
packagename: {
'linkDependencies': [
packagename + '.mqic',
packagename + '.mqiz',
packagename + '.mqmcs',
createFulltargetname(packagename, 'mqic'),
createFulltargetname(packagename, 'mqiz'),
createFulltargetname(packagename, 'mqmcs'),
],
'targetType': 'IncludeOnly',
'public': {
......
......@@ -35,9 +35,9 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
if 'HAS_MQM' in env['CPPDEFINES']:
buildSettings[packagename] = {
'linkDependencies': [
packagename + '.mqic',
packagename + '.mqiz',
packagename + '.mqmcs',
createFulltargetname(packagename, 'mqic'),
createFulltargetname(packagename, 'mqiz'),
createFulltargetname(packagename, 'mqmcs'),
],
}
buildSettings['mqic'] = {
......
......@@ -28,7 +28,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings = {
packagename: {
'linkDependencies': [
packagename + '.mysqlclient',
createFulltargetname(packagename, 'mysqlclient'),
],
'targetType': 'IncludeOnly',
'public': {
......@@ -47,9 +47,9 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'targetType': 'ProgramApp',
'runConfig': {},
'requires': [
packagename + '.mysqlclient',
createFulltargetname(packagename, 'mysqlclient'),
],
'usedTarget': packagename + '.mysqlbin',
'usedTarget': createFulltargetname(packagename, 'mysqlbin'),
},
}
......
......@@ -36,7 +36,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
if 'HAS_MYSQL' in env['CPPDEFINES']:
buildSettings[packagename] = {
'linkDependencies': [
packagename + '.mysqlclient',
createFulltargetname(packagename, 'mysqlclient'),
],
}
buildSettings['mysqlclient'] = {
......@@ -55,9 +55,9 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'targetType': 'ProgramApp',
'runConfig': {},
'requires': [
packagename + '.mysqlclient',
createFulltargetname(packagename, 'mysqlclient'),
],
'usedTarget': packagename + '.mysqlbin',
'usedTarget': createFulltargetname(packagename, 'mysqlbin'),
},
createTargets(packagename, buildSettings)
......
......@@ -28,7 +28,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings = {
packagename: {
'linkDependencies': [
packagename + '.aceclnt',
createFulltargetname(packagename, 'aceclnt'),
],
'targetType': 'IncludeOnly',
'public': {
......
......@@ -35,7 +35,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
if 'HAS_RSA' in env['CPPDEFINES']:
buildSettings[packagename] = {
'linkDependencies': [
packagename + '.aceclnt',
createFulltargetname(packagename, 'aceclnt'),
],
}
buildSettings['aceclnt'] = {
......
......@@ -34,15 +34,14 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings = {
packagename: {
'linkDependencies': [
packagename + '.sybunic',
packagename + '.sybcs',
packagename + '.sybct',
packagename + '.sybintl',
packagename + '.sybtcl',
packagename + '.sybcomn',
createFulltargetname(packagename, 'sybunic'),
createFulltargetname(packagename, 'sybcs'),
createFulltargetname(packagename, 'sybct'),
createFulltargetname(packagename, 'sybintl'),
createFulltargetname(packagename, 'sybtcl'),
createFulltargetname(packagename, 'sybcomn'),
],
'requires': [packagename + '.config'],
'targetType': 'IncludeOnly',
'requires': [createFulltargetname(packagename, 'config')],
'public': {
'includeSubdir': 'include',
},
......@@ -97,7 +96,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'script_isql': {
'targetType': 'ProgramApp',
'runConfig': {},
'usedTarget': packagename + '.isql',
'usedTarget': createFulltargetname(packagename, 'isql'),
},
}
......
......@@ -43,14 +43,14 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
if 'HAS_SYBASE' in env['CPPDEFINES']:
buildSettings[packagename] = {
'linkDependencies': [
packagename + '.sybunic',
packagename + '.sybcs',
packagename + '.sybct',
packagename + '.sybintl',
packagename + '.sybtcl',
packagename + '.sybcomn',
createFulltargetname(packagename, 'sybunic'),
createFulltargetname(packagename, 'sybcs'),
createFulltargetname(packagename, 'sybct'),
createFulltargetname(packagename, 'sybintl'),
createFulltargetname(packagename, 'sybtcl'),
createFulltargetname(packagename, 'sybcomn'),
],
'requires': [packagename + '.config'],
'requires': [createFulltargetname(packagename, 'config')],
'targetType': 'IncludeOnly',
}
buildSettings['config'] = {
......@@ -122,7 +122,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings['script_isql'] = {
'targetType': 'ProgramApp',
'runConfig': {},
'usedTarget': packagename + '.isql',
'usedTarget': createFulltargetname(packagename, 'isql'),
}
createTargets(packagename, buildSettings)
......
......@@ -28,21 +28,20 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings = {
packagename: {
'linkDependencies': [
packagename + '.gxi',
packagename + '.gxibasicmatch',
packagename + '.gxical',
packagename + '.gxiosa',
packagename + '.gxiplugin',
packagename + '.gxiwmqmsg',
packagename + '.gxiwmqprot',
packagename + '.gxixil',
packagename + '.icudata',
packagename + '.icuuc',
createFulltargetname(packagename, 'gxi'),
createFulltargetname(packagename, 'gxibasicmatch'),
createFulltargetname(packagename, 'gxical'),
createFulltargetname(packagename, 'gxiosa'),
createFulltargetname(packagename, 'gxiplugin'),
createFulltargetname(packagename, 'gxiwmqmsg'),
createFulltargetname(packagename, 'gxiwmqprot'),
createFulltargetname(packagename, 'gxixil'),
createFulltargetname(packagename, 'icudata'),
createFulltargetname(packagename, 'icuuc'),
],
'targetType': 'IncludeOnly',
'public': {
'includeSubdir': 'inc',
}
'includeSubdir': 'include',
},
},
'gxi': {
'sourceFiles': [getBinaryDistDir(packagename).File('gxi')],
......
......@@ -38,16 +38,16 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
if 'HAS_XMS' in env['CPPDEFINES']:
buildSettings[packagename] = {
'linkDependencies': [
packagename + '.gxi',
packagename + '.gxibasicmatch',
packagename + '.gxical',
packagename + '.gxiosa',
packagename + '.gxiplugin',
packagename + '.gxiwmqmsg',
packagename + '.gxiwmqprot',
packagename + '.gxixil',
packagename + '.icudata',
packagename + '.icuuc',
createFulltargetname(packagename, 'gxi'),
createFulltargetname(packagename, 'gxibasicmatch'),
createFulltargetname(packagename, 'gxical'),
createFulltargetname(packagename, 'gxiosa'),
createFulltargetname(packagename, 'gxiplugin'),
createFulltargetname(packagename, 'gxiwmqmsg'),
createFulltargetname(packagename, 'gxiwmqprot'),
createFulltargetname(packagename, 'gxixil'),
createFulltargetname(packagename, 'icudata'),
createFulltargetname(packagename, 'icuuc'),
],
'targetType': 'IncludeOnly',
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment