Russel Winder avatar Russel Winder committed fa9d18e

Strip out all the Linux specific stuff as not being the right direction to handle all the variation.

Comments (0)

Files changed (2)

src/engine/SCons/Tool/dmd.py

 Tool-specific initialization for the Digital Mars D compiler.
 (http://digitalmars.com/d)
 
-Coded by Andy Friesen (andy@ikagames.com)
+Originally coded by Andy Friesen (andy@ikagames.com)
 15 November 2003
 
-Amended by Russel Winder (russel@russel.org.uk)
-2010-02-07, 2010-11-17, 2011-02, 2011-05-14
+Evolved by Russel Winder (russel@winder.org.uk)
+2010-02-07, 2010-11-17, 2011-02, 2011-05-14, 2012-05-08, 2012-09-02
 
 There are a number of problems with this script at this point in time.
-The one that irritates me the most is the Windows linker setup.  The D
+The one that irritates the most is the Windows linker setup.  The D
 linker doesn't have a way to add lib paths on the commandline, as far
 as I can see.  You have to specify paths relative to the SConscript or
 use absolute paths.  To hack around it, add '#/blah'.  This will link
 import SCons.Scanner.D
 import SCons.Tool
 
-# Adapted from c++.py
 def isD(source):
     if not source:
         return 0
-
     for s in source:
         if s.sources:
             ext = os.path.splitext(str(s.sources[0]))[1]
     env['DFLAGSUFFIX'] = ''
     env['DFILESUFFIX'] = '.d'
 
-    if dc == 'dmd' :
-        #
-        #  We have to know exactly which version of DMD is in use so as to ensure correct behaviour.  DMD has
-        #  no option to return the version number.  The only place it is found is int he first line of the
-        #  help output.  So grab that first line and then scan it.
-        #
-        process = subprocess.Popen ('dmd', stdout=subprocess.PIPE)
-        versionLine = process.stdout.readline()
-        process.kill()
-        #
-        #  Up to and including DMD 1.067 and 2.052 the first line of the help starte "Digital Mars D Compiler
-        #  v" followed by the version number.  As of version 1.068 and 2.053, this string has changed to
-        #  "DMD## D Compiler v" where ## is either 32 or 64 depending on the build of the executable.  So
-        #  instead of a simple replacement, extra work is needed.
-        #
-        #env['DMDVERSIONNUMBER'] = tuple([int(i) for i in versionLine.replace('Digital Mars D Compiler v', '').strip().split('.')])
-        if 'DMD32' in versionLine : stringToReplace = 'DMD32 D Compiler v'
-        elif 'DMD64' in versionLine : stringToReplace = 'DMD64 D Compiler v'
-        else : stringToReplace = 'Digital Mars D Compiler v'
-        env['DMDVERSIONNUMBER'] = tuple([int(i) for i in versionLine.replace(stringToReplace, '').strip().split('.')])
+    env['DLINK'] = '$DC'
+    env['DLINKCOM'] = '$DLINK -of$TARGET $SOURCES $DFLAGS $DLINKFLAGS $_DLINKLIBFLAGS'
+    env['DLIB'] = 'lib'
+    env['DLIBCOM'] = '$DLIB $_DLIBFLAGS -c $TARGET $SOURCES $_DLINKLIBFLAGS'
 
-    # Need to use the Digital Mars linker/lib on windows.
-    # *nix can just use GNU link.
-    if env['PLATFORM'] == 'win32':
-        env['DLINK'] = '$DC'
-        env['DLINKCOM'] = '$DLINK -of$TARGET $SOURCES $DFLAGS $DLINKFLAGS $_DLINKLIBFLAGS'
-        env['DLIB'] = 'lib'
-        env['DLIBCOM'] = '$DLIB $_DLIBFLAGS -c $TARGET $SOURCES $_DLINKLIBFLAGS'
+    env['_DLINKLIBFLAGS'] = '$( ${_concat(DLIBLINKPREFIX, LIBS, DLIBLINKSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
+    env['_DLIBFLAGS'] = '$( ${_concat(DLIBFLAGPREFIX, DLIBFLAGS, DLIBFLAGSUFFIX, __env__)} $)'
+    env['DLINKFLAGS'] = []
+    env['DLIBLINKPREFIX'] = ''
+    env['DLIBLINKSUFFIX'] = '.lib'
+    env['DLIBFLAGPREFIX'] = '-'
+    env['DLIBFLAGSUFFIX'] = ''
+    env['DLINKFLAGPREFIX'] = '-'
+    env['DLINKFLAGSUFFIX'] = ''
 
-        env['_DLINKLIBFLAGS'] = '$( ${_concat(DLIBLINKPREFIX, LIBS, DLIBLINKSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
-        env['_DLIBFLAGS'] = '$( ${_concat(DLIBFLAGPREFIX, DLIBFLAGS, DLIBFLAGSUFFIX, __env__)} $)'
-        env['DLINKFLAGS'] = []
-        env['DLIBLINKPREFIX'] = ''
-        env['DLIBLINKSUFFIX'] = '.lib'
-        env['DLIBFLAGPREFIX'] = '-'
-        env['DLIBFLAGSUFFIX'] = ''
-        env['DLINKFLAGPREFIX'] = '-'
-        env['DLINKFLAGSUFFIX'] = ''
+    SCons.Tool.createStaticLibBuilder(env)
 
-        SCons.Tool.createStaticLibBuilder(env)
+    # Basically, we hijack the link and ar builders with our own.
+    # these builders check for the presence of D source, and swap out
+    # the system's defaults for the Digital Mars tools.  If there's no D
+    # source, then we silently return the previous settings.
+    linkcom = env.get('LINKCOM')
+    try:
+        env['SMART_LINKCOM'] = smart_link[linkcom]
+    except KeyError:
+        def _smartLink(source, target, env, for_signature, defaultLinker=linkcom):
+            if isD(source):
+                # TODO: I'm not sure how to add a $DLINKCOMSTR variable
+                # so that it works with this _smartLink() logic,
+                # and I don't have a D compiler/linker to try it out,
+                # so we'll leave it alone for now.
+                return '$DLINKCOM'
+            else:
+                return defaultLinker
+        env['SMART_LINKCOM'] = smart_link[linkcom] = _smartLink
 
-        # Basically, we hijack the link and ar builders with our own.
-        # these builders check for the presence of D source, and swap out
-        # the system's defaults for the Digital Mars tools.  If there's no D
-        # source, then we silently return the previous settings.
-        linkcom = env.get('LINKCOM')
-        try:
-            env['SMART_LINKCOM'] = smart_link[linkcom]
-        except KeyError:
-            def _smartLink(source, target, env, for_signature,
-                           defaultLinker=linkcom):
-                if isD(source):
-                    # XXX I'm not sure how to add a $DLINKCOMSTR variable
-                    # so that it works with this _smartLink() logic,
-                    # and I don't have a D compiler/linker to try it out,
-                    # so we'll leave it alone for now.
-                    return '$DLINKCOM'
-                else:
-                    return defaultLinker
-            env['SMART_LINKCOM'] = smart_link[linkcom] = _smartLink
+    arcom = env.get('ARCOM')
+    try:
+        env['SMART_ARCOM'] = smart_lib[arcom]
+    except KeyError:
+        def _smartLib(source, target, env, for_signature, defaultLib=arcom):
+            if isD(source):
+                # TODO: I'm not sure how to add a $DLIBCOMSTR variable
+                # so that it works with this _smartLib() logic, and
+                # I don't have a D compiler/archiver to try it out,
+                # so we'll leave it alone for now.
+                return '$DLIBCOM'
+            else:
+                return defaultLib
+        env['SMART_ARCOM'] = smart_lib[arcom] = _smartLib
 
-        arcom = env.get('ARCOM')
-        try:
-            env['SMART_ARCOM'] = smart_lib[arcom]
-        except KeyError:
-            def _smartLib(source, target, env, for_signature,
-                         defaultLib=arcom):
-                if isD(source):
-                    # XXX I'm not sure how to add a $DLIBCOMSTR variable
-                    # so that it works with this _smartLib() logic, and
-                    # I don't have a D compiler/archiver to try it out,
-                    # so we'll leave it alone for now.
-                    return '$DLIBCOM'
-                else:
-                    return defaultLib
-            env['SMART_ARCOM'] = smart_lib[arcom] = _smartLib
-
-        # It is worth noting that the final space in these strings is
-        # absolutely pivotal.  SCons sees these as actions and not generators
-        # if it is not there. (very bad)
-        env['ARCOM'] = '$SMART_ARCOM '
-        env['LINKCOM'] = '$SMART_LINKCOM '
-    else: # assuming linux
-        linkcom = env.get('LINKCOM')
-        try:
-            env['SMART_LINKCOM'] = smart_link[linkcom]
-        except KeyError:
-            def _smartLink(source, target, env, for_signature,
-                           defaultLinker=linkcom, dc=dc):
-                if isD(source):
-                    try:
-                        libs = env['LIBS']
-                    except KeyError:
-                        libs = []
-                    if dc == 'dmd':
-                        #
-                        #  TODO: This assumes that the dmd executable is in the bin (or as of 1.068 and 2.053
-                        #  possible bin32 or bin64 -- at least on Linux) directory and that the libraries
-                        #  are in a peer directory lib (for versions prior to 1.067 and 2.052) or lib32 and
-                        #  lib64 (for version 1.067 and 2.052 and later on Linux, Mac OS X remains with
-                        #  lib as there is no 64-bit backend or build for DMD on this platform).  This is
-                        #  true of the Digital Mars distribution but what about Debian, Ubuntu, Fedora,
-                        #  FreeBSD, etc. packagings?
-                        #
-                        platformName , _ , _ , _ , architectureName = os.uname ( )
-                        mode64bit = False
-                        if architectureName == 'x86_64' and '-m32' not in env['DFLAGS']:
-                            mode64bit = True
-                        if mode64bit and '-m64' not in env['DFLAGS']:
-                            env.Append(DFLAGS = ['-m64'])
-                        dHome = env.WhereIs(dc).replace('/dmd' , '/..')
-                        if (env['DMDVERSIONNUMBER'][0] == 1 and env['DMDVERSIONNUMBER'][1] < 67 ) or \
-                               (env['DMDVERSIONNUMBER'][0] == 2 and env['DMDVERSIONNUMBER'][1] < 52 ):
-                            libComponent = 'lib'
-                        else:
-                            if platformName == 'Linux' :
-                                libComponent = 'lib64' if mode64bit else 'lib32'
-                            else :
-                                libComponent = 'lib'
-                        import glob
-                        if glob.glob(dHome + '/' + libComponent + '/*phobos2*'):
-                            if 'phobos2' not in libs:
-                                env.Append(LIBPATH = [dHome + '/' + libComponent])
-                                env.Append(LIBS = ['phobos2'])
-                                if (env['DMDVERSIONNUMBER'][0] == 1 and env['DMDVERSIONNUMBER'][1] < 67 ) or \
-                                       (env['DMDVERSIONNUMBER'][0] == 2 and env['DMDVERSIONNUMBER'][1] < 52 ) :
-                                    env.Append(LINKFLAGS = ['-m32'])
-                                else:
-                                    pass
-                        else:
-                            if 'phobos' not in libs:
-                                env.Append(LIBS = ['phobos'])
-                    elif dc is 'gdmd':
-                        env.Append(LIBS = ['gphobos'])
-                    if 'pthread' not in libs:
-                        env.Append(LIBS = ['pthread'])
-                    if 'm' not in libs:
-                        env.Append(LIBS = ['m'])
-                    if (env['DMDVERSIONNUMBER'][0] == 1 and env['DMDVERSIONNUMBER'][1] >= 67 ) or \
-                           (env['DMDVERSIONNUMBER'][0] == 2 and env['DMDVERSIONNUMBER'][1] >= 52 ):
-                        if platformName == 'Linux' and 'rt' not in libs :
-                            env.Append(LIBS = ['rt'])
-                return defaultLinker
-            env['SMART_LINKCOM'] = smart_link[linkcom] = _smartLink
-
-        env['LINKCOM'] = '$SMART_LINKCOM '
+    # It is worth noting that the final space in these strings is
+    # absolutely pivotal.  SCons sees these as actions and not generators
+    # if it is not there. (very bad)
+    env['ARCOM'] = '$SMART_ARCOM '
+    env['LINKCOM'] = '$SMART_LINKCOM '
 
 def exists(env):
     return env.Detect(['dmd', 'gdmd'])
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+#  Amended by Russel Winder <russel@russel.org.uk> 2010-05-05
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import TestSCons
+
+_exe = TestSCons._exe
+test = TestSCons.TestSCons()
+
+if not test.where_is('dmd') and not test.where_is('gdmd'):
+    test.skip_test("Could not find 'dmd' or 'gdmd'; skipping test.\n")
+
+test.write('SConstruct', """\
+import os
+env = Environment(ENV=os.environ)
+if env['PLATFORM'] == 'cygwin': env['OBJSUFFIX'] = '.obj'  # trick DMD
+env.Program('foo', 'foo.d')
+""")
+
+test.write('foo.d', """\
+import std.stdio;
+int main(string[] args) {
+    printf("Hello!");
+    return 0;
+}
+""")
+
+test.run()
+
+test.run(program=test.workpath('foo'+_exe))
+
+test.fail_test(not test.stdout() == 'Hello!')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.