ProjectBuilder.st
changeset 3321 08f3a7af6975
parent 3308 5cbec72e27fa
child 3332 37a32de127ba
     1.1 --- a/ProjectBuilder.st	Mon Aug 22 11:26:34 2016 +0200
     1.2 +++ b/ProjectBuilder.st	Mon Aug 22 11:27:31 2016 +0200
     1.3 @@ -1,5 +1,3 @@
     1.4 -"{ Encoding: utf8 }"
     1.5 -
     1.6  "
     1.7   COPYRIGHT (c) 2009 by eXept Software AG
     1.8                All Rights Reserved
     1.9 @@ -344,7 +342,7 @@
    1.10  !ProjectBuilder methodsFor:'building/private'!
    1.11  
    1.12  copyDLLsForLinkage
    1.13 -    |targetBuildDir preRequisites dllRelativeSourcePathes dllRelativeDestPathes|
    1.14 +    |targetBuildDir preRequisites dllRelativeSourcePaths dllRelativeDestPaths|
    1.15  
    1.16      targetBuildDir := buildDirectory / package module / package directory.
    1.17  
    1.18 @@ -359,7 +357,7 @@
    1.19  
    1.20      preRequisites do:[:eachPackageToFileout |
    1.21          |packageId packageDef packageModule packageDirectory packageTargetDir
    1.22 -         dllSource dllSourceDir libraryName dllRelativePathSource 
    1.23 +         dllSource dllSourceDir libraryName dllRelativePathSource
    1.24           dllRelativePathDest objDirSource objDirDest alternativeObjDirSource|
    1.25  
    1.26          packageId := eachPackageToFileout asPackageId.
    1.27 @@ -386,38 +384,38 @@
    1.28                  alternativeObjDirSource := self objDirForUsedCompiler:'vc'.
    1.29                  (dllSourceDir / alternativeObjDirSource / (libraryName, '.dll')) exists ifTrue:[
    1.30                      objDirSource := alternativeObjDirSource.
    1.31 -                    stdErr nextPutLine:(('Warning: using alternative %1 from %2 (%3 version)...' 
    1.32 -                                                bindWith:libraryName 
    1.33 -                                                with:alternativeObjDirSource 
    1.34 +                    stdErr nextPutLine:(('Warning: using alternative %1 from %2 (%3 version)...'
    1.35 +                                                bindWith:libraryName
    1.36 +                                                with:alternativeObjDirSource
    1.37                                                  with:(self class suiteNameOfCompiler:'vc'))
    1.38                                              emphasizeAllWith:(#color -> Color red darkened)).
    1.39                  ] ifFalse:[
    1.40                      alternativeObjDirSource := self objDirForUsedCompiler:'bcc'.
    1.41                      (dllSourceDir / alternativeObjDirSource / (libraryName, '.dll')) exists ifTrue:[
    1.42                          objDirSource := alternativeObjDirSource.
    1.43 -                        stdErr nextPutLine:('Warning: using alternative %1 from %2 (%3 version)...' 
    1.44 -                                    bindWith:libraryName 
    1.45 -                                    with:alternativeObjDirSource 
    1.46 +                        stdErr nextPutLine:('Warning: using alternative %1 from %2 (%3 version)...'
    1.47 +                                    bindWith:libraryName
    1.48 +                                    with:alternativeObjDirSource
    1.49                                      with:(self class suiteNameOfCompiler:'bcc')).
    1.50                      ]
    1.51                  ].
    1.52              ].
    1.53  
    1.54  "/            dllRelativePath := objDir,'/',(libraryName,'.dll').
    1.55 -"/            (dllSourceDir / dllRelativePath) exists 
    1.56 -            dllRelativeSourcePathes := Array with:(objDirSource,'\', libraryName, '.dll').
    1.57 -            dllRelativeDestPathes := Array with:(objDirDest,'\', libraryName, '.dll').
    1.58 +"/            (dllSourceDir / dllRelativePath) exists
    1.59 +            dllRelativeSourcePaths := Array with:(objDirSource,'\', libraryName, '.dll').
    1.60 +            dllRelativeDestPaths := Array with:(objDirDest,'\', libraryName, '.dll').
    1.61          ] ifFalse:[
    1.62 -            dllRelativeSourcePathes := Array with:(libraryName,'.so').
    1.63 -            dllRelativeDestPathes := Array with:(libraryName, '.so').
    1.64 +            dllRelativeSourcePaths := Array with:(libraryName,'.so').
    1.65 +            dllRelativeDestPaths := Array with:(libraryName, '.so').
    1.66              (packageModule = 'stx' and:[packageDirectory = 'libview']) ifTrue:[
    1.67 -                dllRelativeSourcePathes := dllRelativeSourcePathes copyWith:('XWorkstation.so').
    1.68 -                dllRelativeDestPathes := dllRelativeDestPathes copyWith:'XWorkstation.so'.
    1.69 -                dllRelativeSourcePathes := dllRelativeSourcePathes copyWith:('GLXWorkstation.so').
    1.70 -                dllRelativeDestPathes := dllRelativeDestPathes copyWith:'GLXWorkstation.so'.
    1.71 +                dllRelativeSourcePaths := dllRelativeSourcePaths copyWith:('XWorkstation.so').
    1.72 +                dllRelativeDestPaths := dllRelativeDestPaths copyWith:'XWorkstation.so'.
    1.73 +                dllRelativeSourcePaths := dllRelativeSourcePaths copyWith:('GLXWorkstation.so').
    1.74 +                dllRelativeDestPaths := dllRelativeDestPaths copyWith:'GLXWorkstation.so'.
    1.75              ].
    1.76          ].
    1.77 -        dllRelativeSourcePathes with:dllRelativeDestPathes do:[:dllRelativeSourcePath :dllRelativeDestPath|
    1.78 +        dllRelativeSourcePaths with:dllRelativeDestPaths do:[:dllRelativeSourcePath :dllRelativeDestPath|
    1.79              |source dest|
    1.80  
    1.81              source := dllSourceDir / dllRelativeSourcePath.
    1.82 @@ -432,7 +430,7 @@
    1.83                  ]]) ifTrue:[
    1.84                      Transcript showCR:'updating ',dllRelativeDestPath.
    1.85                      dest directory recursiveMakeDirectory.
    1.86 -                    source copyTo:dest.    
    1.87 +                    source copyTo:dest.
    1.88                      self activityNotification:'    ',dest pathName
    1.89                  ] ifFalse:[
    1.90                      Transcript showCR:'already up-to-date: ',dllRelativeDestPath.