X Tutup
Skip to content

Fix macroman encoding lookup#71

Merged
jbrichau merged 3 commits intoSeasideSt:masterfrom
theseion:fix-macroman-encoding-lookup
Dec 15, 2018
Merged

Fix macroman encoding lookup#71
jbrichau merged 3 commits intoSeasideSt:masterfrom
theseion:fix-macroman-encoding-lookup

Conversation

@theseion
Copy link
Member

No description provided.

@theseion theseion requested a review from jbrichau December 11, 2018 21:15
@jbrichau
Copy link
Member

@theseion Hi Max, it seems a lot of files are changed in this PR?

I think it's better to redo against master.

@jbrichau jbrichau changed the base branch from dev to master December 12, 2018 19:16
@jbrichau
Copy link
Member

@theseion Ok, did not know I could that myself :)
After changing against master, only 1 file is changed. I believe that should do it :)

@jbrichau
Copy link
Member

I'm still a bit confused. The change is in the Grease-Pharo20-Core package, but that package is not loaded by the baseline? (which reminds me to clean those old package as well).

@theseion
Copy link
Member Author

I see that I messed that up. Let me redo the PR.

@theseion theseion force-pushed the fix-macroman-encoding-lookup branch from 42fc001 to 607d7ae Compare December 15, 2018 09:26
@theseion
Copy link
Member Author

I've made the same change but this time to Squeak5-Core, Squeak6-Core, and Pharo7-Core.

As for Pharo20-Core, that indeed isn't being loaded in Squeak but is in Pharo 7. I had made the change in a text editor and hadn't realised that there were multiple implementations in different packages.

@theseion
Copy link
Member Author

Arrgh! Looks like I accidentally committed metadataless, which breaks the Pharo3 build 😠

Put back methodProperties.json and version files (required for Pharo 3 build)
@theseion
Copy link
Member Author

Ok, this works now.

@jbrichau jbrichau merged commit 21fab76 into SeasideSt:master Dec 15, 2018
@jbrichau
Copy link
Member

Looks good! Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

X Tutup