# HG changeset patch # User Jan Vrany # Date 1431365353 -3600 # Node ID 76de2febe7d293aa18b5b0de4b9e222a0dacd3f8 # Parent 59a88a51f46a4812b749f94f998a76983977862f Oops, merged lost Smalltalk/X compatibility fixes (again) diff -r 59a88a51f46a -r 76de2febe7d2 compiler/tests/extras/PPCResources.st --- a/compiler/tests/extras/PPCResources.st Mon May 11 12:19:13 2015 +0100 +++ b/compiler/tests/extras/PPCResources.st Mon May 11 18:29:13 2015 +0100 @@ -54,7 +54,14 @@ !PPCResources methodsFor:'private utilities'! files: files withExtension: extension - ^ files select: [ :f | f extension = extension ] + ( (Smalltalk respondsTo: #isSmalltalkX) and:[ Smalltalk isSmalltalkX ] ) ifTrue:[ + ^ files select: [ :f | f suffix = extension ] + ] ifFalse:[ + "Assuming Pharo..." + ^ files select: [ :f | f extension = extension ] + ] + + "Modified: / 11-05-2015 / 16:37:05 / Jan Vrany " ! readDirectory: directory @@ -91,7 +98,9 @@ files := self readDirectory: directory. files := self files: files withExtension: 'st'. - ^ files collect: [ :f | (FileStream fileNamed: f) contents ] + ^ files collect: [ :f | (FileStream fileNamed: f) contents asString ] + + "Modified: / 11-05-2015 / 16:38:00 / Jan Vrany " ! smalltalkObjectMethods