Skip to content

Commit

Permalink
Remove obsolete Windows items.
Browse files Browse the repository at this point in the history
  • Loading branch information
topher800 committed Nov 25, 2024
1 parent 3920e0a commit a6fab4b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 19 deletions.
8 changes: 4 additions & 4 deletions eol_scons/tools/boost.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,9 @@ def generate(env):
# env.Append(DEPLOY_SHARED_LIBS=['boost_date_time'])
# env.Append(DEPLOY_SHARED_LIBS=['boost_serialization'])
if 'BOOST_LIBRARY_SUFFIX' not in env:
if env['PLATFORM'] == 'win32':
env['BOOST_LIBRARY_SUFFIX'] = '-vc71-mt-gd-1_33_1'
else:
env['BOOST_LIBRARY_SUFFIX'] = ''
# We don't have any platform specific suffix at this time.
env['BOOST_LIBRARY_SUFFIX'] = ''

if 'BOOST_DIR' in env:
bdir = env['BOOST_DIR']
if bdir and bdir != "/usr" and bdir != "":
Expand All @@ -105,6 +104,7 @@ def generate(env):
env.Append(CPPPATH=[os.path.join(bdir)])
env.AppendUnique(LIBPATH=[os.path.join(bdir, "lib")])
env.AppendUnique(RPATH=[os.path.join(bdir, "lib")])

# Override the _LIBFLAGS variable so we can append the suffix for
# boost libraries.
if '_boost_save_libflags' not in env:
Expand Down
3 changes: 0 additions & 3 deletions eol_scons/tools/gitinfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@ def generate(env):
emitter=gitinfo_emitter_value)
env['BUILDERS']['GitInfo'] = gitinfobuilder
env['GIT'] = "git"
if env['PLATFORM'] == 'win32':
gitbin = r'c:\Tools\git\bin'
env.PrependENVPath('PATH', gitbin)

env.AddMethod(LoadGitInfo, "LoadGitInfo")
env.LoadGitInfo('#')
Expand Down
2 changes: 1 addition & 1 deletion eol_scons/tools/nidas.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def _addOptions(env, inside=False):
def generate(env):
# It is not (yet) possible to build against NIDAS on anything
# except Linux, so don't even give anyone the option.
if sys.platform == 'win32' or sys.platform == 'darwin':
if sys.platform == 'cygwin' or sys.platform == 'win32' or sys.platform == 'darwin':
env.EnableNIDAS = (lambda: 0)
return

Expand Down
6 changes: 0 additions & 6 deletions eol_scons/tools/qt5.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,12 +402,6 @@ def generate(env):
pass
elif ('QT5DIR' in os.environ):
env['QT5DIR'] = os.environ['QT5DIR']
elif (env['PLATFORM'] == 'win32'):
print("""
For Windows, QT5DIR must be set on the command line or in the environment.
E.g.:
scons QT5DIR='/c/QtSDK/Desktop/Qt/4.7.4/mingw'
""")
elif checkPkgConfig(env):
env['QT5DIR'] = USE_PKG_CONFIG
else:
Expand Down
5 changes: 0 additions & 5 deletions eol_scons/tools/svninfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,6 @@ def generate(env):
env['BUILDERS']['SvnInfo'] = svninfobuilder
env['SVN'] = "svn"
env['SVNVERSION'] = "svnversion"
# Use the default location for the subversion Windows installer.
if env['PLATFORM'] == 'win32':
svnbin=r'c:\Tools\svn\bin'
env['SVN'] = os.path.join(svnbin, "svn")
env['SVNVERSION'] = os.path.join(svnbin, "svnversion")

env.AddMethod(LoadSvnInfo, "LoadSvnInfo")
env.LoadSvnInfo('#')
Expand Down

0 comments on commit a6fab4b

Please sign in to comment.