From d61eb7c9cbce02826a5376c3e03a6c98b1a8dee1 Mon Sep 17 00:00:00 2001 From: Max Leske Date: Fri, 14 Dec 2018 17:50:32 +0100 Subject: [PATCH 1/3] Fix macroman encoding lookup in Grease-Pharo70-Core --- .../Behavior.extension/methodProperties.json | 6 ------ .../class/supportedEncodingNames.st | 3 +-- .../Grease-Pharo70-Core.package/monticello.meta/version | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json delete mode 100644 repository/Grease-Pharo70-Core.package/monticello.meta/version diff --git a/repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json b/repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json deleted file mode 100644 index 1fcfd666..00000000 --- a/repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "instance" : { - "fullName" : "JohanBrichau 12/9/2017 13:17" - }, - "class" : { } -} \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st index e6a8ceb0..12de1caf 100644 --- a/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ b/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st @@ -2,7 +2,6 @@ private supportedEncodingNames "answers the names of the encodings supported by this class" - ^ TextConverter allEncodingNames - removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; + ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asOrderedCollection removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; removeAllFoundIn: UTF8TextConverter encodingNames; yourself \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/monticello.meta/version b/repository/Grease-Pharo70-Core.package/monticello.meta/version deleted file mode 100644 index a434eaec..00000000 --- a/repository/Grease-Pharo70-Core.package/monticello.meta/version +++ /dev/null @@ -1 +0,0 @@ -(name 'Grease-Pharo70-Core-pmm.3' message 'Remove GRWorkingWriteStream from Pharo 6+ - fixes #51' id '6941951f-d231-0d00-becb-c6e70e3dc98b' date '9 September 2018' time '3:40:40.007217 pm' author 'pmm' ancestors ((name 'Grease-Pharo70-Core-JohanBrichau.2' message 'Moved TBehavior>>fullName to Behavior>>fullName' id 'cd354707-491c-0d00-89b9-23ec01d5c93f' date '9 December 2017' time '1:17:57.536518 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo70-Core-JohanBrichau.1' message 'branch from Grease-Pharo60-Core-JohanBrichau.4 to start supporting Pharo7 specifics' id '6aaa3511-a51a-0d00-a9b8-5e8804322501' date '18 November 2017' time '4:15:57.894626 pm' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file From 607d7ae6c3ead1401d6f9ca11b9de6aff3620b3f Mon Sep 17 00:00:00 2001 From: Max Leske Date: Sat, 15 Dec 2018 10:26:08 +0100 Subject: [PATCH 2/3] Fix macroman encoding lookup in Grease-Squeak5-Core and Grease-Squeak6-Core --- .../GRPharoGenericCodec.class/class/supportedEncodingNames.st | 2 +- .../GRPharoGenericCodec.class/class/supportedEncodingNames.st | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st index e6a8ceb0..8af2d208 100644 --- a/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ b/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st @@ -2,7 +2,7 @@ private supportedEncodingNames "answers the names of the encodings supported by this class" - ^ TextConverter allEncodingNames + ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asOrderedCollection removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; removeAllFoundIn: UTF8TextConverter encodingNames; yourself \ No newline at end of file diff --git a/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st index e6a8ceb0..8af2d208 100644 --- a/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ b/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st @@ -2,7 +2,7 @@ private supportedEncodingNames "answers the names of the encodings supported by this class" - ^ TextConverter allEncodingNames + ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asOrderedCollection removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; removeAllFoundIn: UTF8TextConverter encodingNames; yourself \ No newline at end of file From d170a3f7f95de3ae9df483e919aa100448200abf Mon Sep 17 00:00:00 2001 From: Max Leske Date: Sat, 15 Dec 2018 11:07:21 +0100 Subject: [PATCH 3/3] Remove duplicates from encoding names. Put back methodProperties.json and version files (required for Pharo 3 build) --- .../Behavior.extension/methodProperties.json | 6 ++++++ .../class/supportedEncodingNames.st | 3 ++- .../Grease-Pharo70-Core.package/monticello.meta/version | 1 + .../class/supportedEncodingNames.st | 2 +- .../class/supportedEncodingNames.st | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json create mode 100644 repository/Grease-Pharo70-Core.package/monticello.meta/version diff --git a/repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json b/repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json new file mode 100644 index 00000000..1fcfd666 --- /dev/null +++ b/repository/Grease-Pharo70-Core.package/Behavior.extension/methodProperties.json @@ -0,0 +1,6 @@ +{ + "instance" : { + "fullName" : "JohanBrichau 12/9/2017 13:17" + }, + "class" : { } +} \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st index 12de1caf..d1c6d00b 100644 --- a/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ b/repository/Grease-Pharo70-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st @@ -2,6 +2,7 @@ private supportedEncodingNames "answers the names of the encodings supported by this class" - ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asOrderedCollection removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; + ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asSet asOrderedCollection + removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; removeAllFoundIn: UTF8TextConverter encodingNames; yourself \ No newline at end of file diff --git a/repository/Grease-Pharo70-Core.package/monticello.meta/version b/repository/Grease-Pharo70-Core.package/monticello.meta/version new file mode 100644 index 00000000..a434eaec --- /dev/null +++ b/repository/Grease-Pharo70-Core.package/monticello.meta/version @@ -0,0 +1 @@ +(name 'Grease-Pharo70-Core-pmm.3' message 'Remove GRWorkingWriteStream from Pharo 6+ - fixes #51' id '6941951f-d231-0d00-becb-c6e70e3dc98b' date '9 September 2018' time '3:40:40.007217 pm' author 'pmm' ancestors ((name 'Grease-Pharo70-Core-JohanBrichau.2' message 'Moved TBehavior>>fullName to Behavior>>fullName' id 'cd354707-491c-0d00-89b9-23ec01d5c93f' date '9 December 2017' time '1:17:57.536518 pm' author 'JohanBrichau' ancestors ((name 'Grease-Pharo70-Core-JohanBrichau.1' message 'branch from Grease-Pharo60-Core-JohanBrichau.4 to start supporting Pharo7 specifics' id '6aaa3511-a51a-0d00-a9b8-5e8804322501' date '18 November 2017' time '4:15:57.894626 pm' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ()) \ No newline at end of file diff --git a/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st index 8af2d208..d1c6d00b 100644 --- a/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ b/repository/Grease-Squeak5-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st @@ -2,7 +2,7 @@ private supportedEncodingNames "answers the names of the encodings supported by this class" - ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asOrderedCollection + ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asSet asOrderedCollection removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; removeAllFoundIn: UTF8TextConverter encodingNames; yourself \ No newline at end of file diff --git a/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st b/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st index 8af2d208..d1c6d00b 100644 --- a/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st +++ b/repository/Grease-Squeak6-Core.package/GRPharoGenericCodec.class/class/supportedEncodingNames.st @@ -2,7 +2,7 @@ private supportedEncodingNames "answers the names of the encodings supported by this class" - ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asOrderedCollection + ^ (TextConverter allSubclasses gather: [ :class | class encodingNames ]) asSet asOrderedCollection removeAllFoundIn: GRPharoLatin1Codec supportedEncodingNames; removeAllFoundIn: UTF8TextConverter encodingNames; yourself \ No newline at end of file