[Vm-dev] Proposal | Clean-up source tree's *src folders

[Jakob Reschke]

That comforts me a bit more. I have mostly the case in mind where a
Squeaker wants to pull a feature of Pharo back into the OpenSmalltalk
repo. Some of the stuff they presented as "We wanted to do this but
Squeak put roadblocks in our way" in their document stating the
reasons for the fork sounded interesting. I remember something like
improved headless operations or being able to embed the VM into other
languages (i. e. embed a Smalltalk in a C++ program or similar),
though it has been a while since I've read it and I might remember it
wrong.

But now that I have had another look at their default branch, I see
what Nicolas means. Seems like cherry-picking will already run into
inevitable conflicts at the file level before one could even begin
merging at the line level.

So I guess it will not become worse if we move our directories around as well.

Kind regards,
Jakob


Am Sa., 24. Juli 2021 um 16:29 Uhr schrieb David T. Lewis <lewis at mail.msen.com>:
>
>
> Also, the src directories only store the generated sources from VMMaker,
> so reorganizing that directory structure will not make it harder to
> merge or compare the actual VMMaker source, and it does not impact
> the ./platforms directories.
>
> So no worries :-)
>
> Dave
>
>
> On Sat, Jul 24, 2021 at 04:14:51PM +0200, Nicolas Cellier wrote:
> >
> > Hi Jakob,
> > Pharo fork already has made its own incompatible changes well before us
> > with this respect.
> > We can't make it fully compatible because they simplify the architecture so
> > as to maintain only one flavour, which we don't want to.
> > Since there is close to zero retro-contribution (except from Ronie), i
> > would not worry too much.
> >
> > Nicolas
> >
> >
> > Le sam. 24 juil. 2021 ?? 13:24, Jakob Reschke <jakres+squeak at gmail.com> a
> > ??crit :
> >
> > >
> > > One other thing has crossed my mind: will the moving of the directories
> > > make it harder to copy features and refactorings from or to the Pharo fork?
> > >
> > > Kind regards,
> > > Jakob
> > >
> > >
> > > David T. Lewis <lewis at mail.msen.com> schrieb am Di., 20. Juli 2021, 18:51:
> > >
> > >>
> > >> On Tue, Jul 20, 2021 at 02:35:38PM +0200, Marcel Taeumel wrote:
> > >> >
> > >> > Hi all --
> > >> >
> > >> > "It's ready" again. Now with an explanation on how to review this:
> > >> > https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/573
> > >> >
> > >> >
> > >>
> > >> Hi Marcel,
> > >>
> > >> The various shell scripts in the ./building directory are missing execute
> > >> permission, possibly because they were moved to their new location on a
> > >> non-unix system.
> > >>
> > >> On Linux you can see the problem files with:
> > >>
> > >>   $ grep -rl '#!.*/bin/' building | xargs ls -l | less
> > >>
> > >> I did not check each file versus the Cog branch, but a quick fix is this:
> > >>
> > >>   $ grep -rl '#!.*/bin/' building | xargs chmod +x
> > >>
> > >> This finds all the files in the ./building directory that start with a
> > >> shebang line and sets them executable.
> > >>
> > >> Finally, do a git commit, which will save the files with execute
> > >> permissions.
> > >>
> > >> Dave
> > >>
> > >>
>