ProjectBuilder.st
changeset 3338 c62417f88241
parent 3333 32dc40dc06cf
child 3343 ad0041b8f3d2
     1.1 --- a/ProjectBuilder.st	Sat Oct 08 23:14:46 2016 +0200
     1.2 +++ b/ProjectBuilder.st	Sun Oct 09 11:29:12 2016 +0200
     1.3 @@ -424,7 +424,7 @@
     1.4                  dest := packageTargetDir / dllRelativeDestPath.
     1.5                  (dest exists not
     1.6                   or:[source fileSize ~= dest fileSize
     1.7 -                 or:[source modificationTime >= dest modificationTime
     1.8 +                 or:[source modificationTime > dest modificationTime
     1.9                   "/ or:[ ((dllSourceDir / dllRelativePath) sameContentsAs:(packageTargetDir / dllRelativePath)) not ]
    1.10                  ]]) ifTrue:[
    1.11                      Transcript showCR:'updating ',dllRelativeDestPath.
    1.12 @@ -598,7 +598,7 @@
    1.13  copySupportFilesForLinkage
    1.14      "copy additional files which are req'd for linkage to the build directory"
    1.15  
    1.16 -    |files|
    1.17 +    |files fn|
    1.18  
    1.19      OperatingSystem isMSWINDOWSlike ifTrue:[
    1.20          files := #( 
    1.21 @@ -652,11 +652,22 @@
    1.22      files := files asOrderedCollection.
    1.23  
    1.24      OperatingSystem isMSWINDOWSlike ifTrue:[
    1.25 -        projectDefinitionClass applicationIconFileName notNil ifTrue:[
    1.26 -            files add:('projects/smalltalk/',projectDefinitionClass applicationIconFileName,'.ico')
    1.27 +        (fn := projectDefinitionClass applicationIconFileNameWindows) notNil ifTrue:[
    1.28 +            fn asFilename suffix isEmptyOrNil ifTrue:[
    1.29 +                fn := fn,'.ico'
    1.30 +            ].    
    1.31 +            files add:('projects/smalltalk/',fn)
    1.32          ].
    1.33 -        projectDefinitionClass splashFileName notNil ifTrue:[
    1.34 -            files add:('projects/smalltalk/',projectDefinitionClass splashFileName,'.bmp')
    1.35 +        (fn := projectDefinitionClass splashFileName) notNil ifTrue:[
    1.36 +            files add:('projects/smalltalk/',fn,'.bmp')
    1.37 +        ].
    1.38 +    ].
    1.39 +    OperatingSystem isOSXlike ifTrue:[
    1.40 +        (fn := projectDefinitionClass applicationIconFileNameOSX) notNil ifTrue:[
    1.41 +            fn asFilename suffix isEmptyOrNil ifTrue:[
    1.42 +                fn := fn,'.icns'
    1.43 +            ].    
    1.44 +            files add:('projects/smalltalk/',fn)
    1.45          ].
    1.46      ].
    1.47