Skip to content

Commit

Permalink
MSVC support removed
Browse files Browse the repository at this point in the history 
git-svn-id: https://ipvs.informatik.uni-stuttgart.de/SGpp/repos/trunk@5513 4eea3252-f0fb-4393-894d-40516dce545b
  • Loading branch information
Fabian Franzelin committed Feb 8, 2016
1 parent ac2769d commit 3eb3dc8
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 238 deletions.
39 changes: 4 additions & 35 deletions base/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,36 +51,9 @@ if env['USE_STATICLIB']:
source=objs,
LIBS=moduleDependencies)
else:
# building of shared libraries differs
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])

env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBS=moduleDependencies)

libInstall = env.Install(BUILD_DIR, lib)

Expand All @@ -97,11 +70,7 @@ if env['COMPILE_BOOST_TESTS']:
Import('boostTestTargetList')
test_env = env.Clone()
boostlib = "boost_unit_test_framework"
if env['COMPILER'] == 'vcc':
test_env.Append(CPPFLAGS=['/DBOOST_ALL_DYN_LINK', '/MD', '/D _WIN32'])
test_env.AppendUnique(LIBS=moduleDependencies + [libname])
else:
test_env.AppendUnique(LIBS=moduleDependencies + [libname, boostlib])
test_env.AppendUnique(LIBS=moduleDependencies + [libname, boostlib])

testObjects = []
for currentFolder, subdirNames, fileNames in os.walk("tests", topdown=True):
Expand Down
33 changes: 4 additions & 29 deletions datadriven/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,35 +70,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down
33 changes: 4 additions & 29 deletions finance/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,35 +44,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down
33 changes: 4 additions & 29 deletions misc/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down
33 changes: 4 additions & 29 deletions optimization/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,35 +96,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down
33 changes: 4 additions & 29 deletions pde/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down
33 changes: 4 additions & 29 deletions quadrature/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down
33 changes: 4 additions & 29 deletions solver/SConscript
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,35 +45,10 @@ if env['USE_STATICLIB']:
else:
# building of shared libraries differs
libsuffix = env['SHLIBSUFFIX']
if (env['PLATFORM'] == 'cygwin') or (env['COMPILER'] == 'vcc'):
# remove old moduleDependencies if they exist already
for ext in ['lib', 'exp', 'dll', 'def']:
newlibFilename = "%s.%s" % (libname, ext)
if os.path.exists(newlibFilename):
os.remove(newlibFilename)

def buildDefFile(target, source, env):
# load all object files
win32objs = []
for currentFolder, subdirNames, fileNames in os.walk(os.path.join(moduleName, "src")):
for fileName in fnmatch.filter(fileNames, '*.obj'):
win32objs.append(os.path.join(currentFolder, fileName))
# build windows module definition file (def-file)
subprocess.call(['bindexplib.exe', '-o', os.path.join(moduleName, '%s.def' % libname), os.path.join(moduleName, '%s.dll' % libname)] + win32objs)

cmd = env.Command('buildDefFile', [], buildDefFile)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies,
LINKFLAGS=['/DEF:' + os.path.join(moduleName, '%s.def' % libname)])
env.Depends(cmd, objs)
env.Depends(lib, cmd)
else:
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)
lib = env.SharedLibrary(target=libname,
source=objs,
LIBPATH=BUILD_DIR,
LIBS=moduleDependencies)

for lib_str in moduleDependencies:
if lib_str.startswith("sgpp"):
Expand Down

0 comments on commit 3eb3dc8

Please sign in to comment.