Commit 6484c1e7 authored by Marcel Huber's avatar Marcel Huber
Browse files

isort reformattings

parent 24ccf2c7
......@@ -27,10 +27,12 @@ TARGET_LIBS_AND_HEADERS = [(INCLUDE_TARGET_NAME, 'include', 'boost/version.hpp',
('system', 'boost_system', 'boost/system/error_code.hpp', 'CXX')]
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import cloneBaseEnv, createTargets
from SomeUtils import listFiles
from os import path
from SomeUtils import listFiles
from SConsider import cloneBaseEnv, createTargets
buildSettings = {packagename: {'linkDependencies': [], 'requires': []}}
_package_link_dependencies = buildSettings.get(packagename, {}).get('linkDependencies', [])
_package_requires = buildSettings.get(packagename, {}).get('requires', [])
......@@ -77,8 +79,9 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from SomeUtils import listFiles
from os import path
from SomeUtils import listFiles
from TargetHelpers import createPackageSharedLibrary
from TargetMaker import EnvBuilder
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('.'))]).build().RegisterPackageTarget(
......
......@@ -10,8 +10,10 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
from SomeUtils import listFiles
Import('*')
_sconsider_dist = pkg_resources.get_distribution("SConsider").parsed_version
......@@ -42,8 +44,8 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetHelpers import createAlias, createPackageProgram, createPackageProgramScript, createPackageTestTarget
from TargetMaker import EnvBuilder
from TargetHelpers import createPackageProgram, createPackageTestTarget, createPackageProgramScript, createAlias
def setUp(target, source, env):
pass
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -22,7 +23,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
env = cloneBaseEnv()
conf = Configure(env)
if conf.CheckCHeader('cute.h'):
......@@ -34,6 +36,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
buildSettings['include'] = {}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_header_target
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -21,8 +22,9 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import createTargets
from ThirdParty import getBinaryDistDir
from SConsider import createTargets
buildSettings = {
packagename: {
'linkDependencies': [packagename + '.ldap50'],
......@@ -36,11 +38,11 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'targetType': 'PrecompiledLibrary',
},
}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from TargetHelpers import installPrecompiledLibraries
from TargetMaker import EnvBuilder
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('include'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -22,7 +23,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
env = cloneBaseEnv()
conf = Configure(env)
if conf.CheckLibWithHeader('ldap50', 'ldap.h', 'C'):
......@@ -43,9 +45,10 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target
from ThirdParty import add_3rdparty_system_header_target, add_3rdparty_system_lib_target
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('ldap.h'))
......
......@@ -10,8 +10,10 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
from SomeUtils import listFiles
Import('*')
_sconsider_dist = pkg_resources.get_distribution("SConsider").parsed_version
......@@ -37,11 +39,11 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
'sourceFiles': listFiles(['src/*.cpp']),
},
}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from TargetHelpers import createPackageSharedLibrary
from TargetMaker import EnvBuilder
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('include'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -41,9 +42,10 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target
from ThirdParty import add_3rdparty_system_header_target, add_3rdparty_system_lib_target
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('loki/SmartPtr.h'))
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -21,8 +22,9 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import createTargets
from ThirdParty import getBinaryDistDir
from SConsider import createTargets
buildSettings = {
packagename: {
'linkDependencies': [
......@@ -50,9 +52,10 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from TargetHelpers import installPrecompiledLibraries
from TargetMaker import EnvBuilder
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('inc'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -22,7 +23,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
env = cloneBaseEnv()
conf = Configure(env)
if conf.CheckCHeader('cmqc.h') and conf.CheckMultipleLibs(['mqic', 'mqiz', 'mqmcs']):
......@@ -63,7 +65,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target
from ThirdParty import add_3rdparty_system_header_target, add_3rdparty_system_lib_target
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('cmqc.h'))
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -21,8 +22,9 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import createTargets
from ThirdParty import getBinaryDistDir
from SConsider import createTargets
buildSettings = {
packagename: {
'linkDependencies': [
......@@ -53,8 +55,13 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetHelpers import (
createPackageProgramScripts,
createPackageRunTarget,
installPrecompiledBinaries,
installPrecompiledLibraries,
)
from TargetMaker import EnvBuilder
from TargetHelpers import createPackageRunTarget, createPackageProgramScripts, installPrecompiledBinaries, installPrecompiledLibraries
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('include'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -22,7 +23,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
env = cloneBaseEnv()
conf = Configure(env)
if conf.CheckLibWithHeader('mysqlclient', 'mysql/mysql.h', 'C'):
......@@ -60,9 +62,13 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target, add_3rdparty_system_binary_target
from TargetHelpers import createPackageProgramScript, createPackageRunTarget
from TargetMaker import EnvBuilder
from ThirdParty import (
add_3rdparty_system_binary_target,
add_3rdparty_system_header_target,
add_3rdparty_system_lib_target,
)
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('mysql/mysql.h'))
......
......@@ -27,10 +27,11 @@ TARGET_LIBS_AND_HEADERS = [(INCLUDE_TARGET_NAME, 'include', 'openssl/ssl.h', 'C'
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ThirdParty import (
getBinaryDistDir,
determine_3rdparty_bin_node,
determine_3rdparty_lib_node,
getBinaryDistDir,
)
from SConsider import cloneBaseEnv, createTargets
buildSettings = {packagename: {'linkDependencies': [], 'requires': []}}
......
......@@ -35,11 +35,8 @@ TARGET_LIBS_AND_HEADERS = [
]
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ThirdParty import (
getBinaryDistDir,
determine_3rdparty_bin_node,
determine_3rdparty_lib_node,
)
from ThirdParty import determine_3rdparty_bin_node, determine_3rdparty_lib_node, getBinaryDistDir
from SConsider import cloneBaseEnv, createTargets
buildSettings = {packagename: {'linkDependencies': [], 'requires': []}}
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -21,8 +22,9 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import createTargets
from ThirdParty import getBinaryDistDir
from SConsider import createTargets
buildSettings = {
packagename: {
'linkDependencies': [
......@@ -40,9 +42,10 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
}
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from TargetHelpers import installPrecompiledLibraries
from TargetMaker import EnvBuilder
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('include'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -22,7 +23,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
env = cloneBaseEnv()
conf = Configure(env)
if conf.CheckLibWithHeader('aceclnt', 'acclnt.h', 'C'):
......@@ -47,7 +49,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target
from ThirdParty import add_3rdparty_system_header_target, add_3rdparty_system_lib_target
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('acclnt.h'))
......
......@@ -10,11 +10,13 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
import os
from SomeUtils import listFiles
from stat import *
from SomeUtils import listFiles
Import('*')
_sconsider_dist = pkg_resources.get_distribution("SConsider").parsed_version
......@@ -25,9 +27,10 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ThirdParty import getBinaryDistDir
from SConsider import createTargets
from SConsider.PackageRegistry import PackageRegistry
from ThirdParty import getBinaryDistDir
buildSettings = {
packagename: {
'linkDependencies': [
......@@ -101,8 +104,15 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
import os
from TargetHelpers import (
createCopyFilesTarget,
createPackageProgramScripts,
createPackageRunTarget,
installPrecompiledBinaries,
installPrecompiledLibraries,
)
from TargetMaker import EnvBuilder
from TargetHelpers import createPackageProgramScripts, installPrecompiledBinaries, installPrecompiledLibraries, createPackageRunTarget, createCopyFilesTarget
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('include'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,10 +10,13 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
import os
from stat import *
from SomeUtils import listFiles
Import('*')
_sconsider_dist = pkg_resources.get_distribution("SConsider").parsed_version
......@@ -25,7 +28,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
from SConsider.PackageRegistry import PackageRegistry
env = cloneBaseEnv()
conf = Configure(env)
......@@ -124,9 +128,14 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
import os
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target, add_3rdparty_system_binary_target
from TargetHelpers import createPackageProgramScript, createPackageRunTarget
from TargetMaker import EnvBuilder
from ThirdParty import (
add_3rdparty_system_binary_target,
add_3rdparty_system_header_target,
add_3rdparty_system_lib_target,
)
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('sybdb.h'))
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -21,8 +22,9 @@ else:
createFulltargetname = PackageRegistry.createFulltargetname
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from SConsider import createTargets
from ThirdParty import getBinaryDistDir
from SConsider import createTargets
buildSettings = {
packagename: {
'linkDependencies': [
......@@ -86,8 +88,8 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from TargetHelpers import installPrecompiledLibraries
from TargetMaker import EnvBuilder
includeTarget = EnvBuilder(export=[EnvBuilder().include(Dir('inc'))]).build().RegisterPackageTarget(
packagename=packagename, targetname='include')
......
......@@ -10,6 +10,7 @@
# -------------------------------------------------------------------------
import pkg_resources
pkg_resources.require(["SConsider"])
Import('*')
......@@ -22,7 +23,8 @@ else:
if _sconsider_dist < pkg_resources.parse_version("0.5"):
from ConfigureHelper import Configure
from SConsider import createTargets, cloneBaseEnv
from SConsider import cloneBaseEnv, createTargets
env = cloneBaseEnv()
conf = Configure(env)
if conf.CheckCHeader('xms.h') and conf.CheckMultipleLibs([
......@@ -123,7 +125,7 @@ if _sconsider_dist < pkg_resources.parse_version("0.5"):
createTargets(packagename, buildSettings)
elif _sconsider_dist >= pkg_resources.parse_version("0.5"):
from TargetMaker import EnvBuilder
from ThirdParty import add_3rdparty_system_lib_target, add_3rdparty_system_header_target
from ThirdParty import add_3rdparty_system_header_target, add_3rdparty_system_lib_target
includeTarget = add_3rdparty_system_header_target(EnvBuilder().build(), packagename,
lambda conf: conf.CheckCHeader('xms.h'))
......
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