Pull Requests

[mwieder]

I just mangled some things and pushed the repo again.
If you pull the main repo from github you should be good to go.

[mwieder]

The thing about "not having to deal with git" is that git/github etc is the way to submit changes, especially if there's more than one person working on a system of files.

We can be making changes simultaneously and then merging the changes is mostly a matter of accepting pull requests, no more having to go line-by-line through the code figuring out what's changed.

Stick with it. You'll thank me later.

[tperry2x]

Anyway, the point of me wanting to edit bits is to try out a compile, to see if I can fix the MacOS systemversion function, and also any other annoying bugs that are embedded in-engine.
I think this would fix it (untested of course), but needless to say - the mac recompile would also be a separate issue altogether.
I'll pin this here for a possible MacOS systemversion fix. Can you add it to your git code as a possible fix?

git/github etc is the way to submit changes, especially if there's more than one person working on a system of files.

If you love git or understand it, that is.

We can be making changes simultaneously and then merging the changes is mostly a matter of accepting pull requests

I don't understand 'pull requests'. WTAF, but it's like someone has placed a brick wall in front of me. I've tried and tried to get my head around it, but I'm sorry - I just don't get it.

It feels like a solution for a non-existent problem.
I like the old-fashioned, old-skool way:
"Here's the source. Download it. Make a note of what you changed as you change it. Tell me the line numbers and the file path.... test, verify... done. Here's my changed file..."

no more having to go line-by-line through the code figuring out what's changed.

That's what I prefer, to edit the code directly on the computer - as I know what lines i changed.

Stick with it. You'll thank me later.

Hahahaha, I really won't

systemversion mac edit.7z

(38.59 KiB) Downloaded 104 times

[tperry2x]

Don't worry about it, just look at dskmac.cpp in that archive, and all my changes have the word tperry next to them.

[tperry2x]

One last go, and compiling is still very broken:

next-error.png (39.13 KiB) Viewed 4580 times

Now seems I'm missing "grammar_full.c" which then spawns other errors.

Also worth mentioning probably. While it was trying (and failing) to compile - I grabbed this screenshot.
Chromium is used for the CEF browser engine, but Chromium 74 was released early 2019.

how-old.png (36.1 KiB) Viewed 4561 times

[mwieder]

Yeah. I haven't been able to upgrade the CEF library past version 74. Since it doesn't work on linux anyway I'm not too concerned. Someday we'll figure out a good replacement library. I see LC is moving away from it on OSX and Windows anyway.

[mwieder]

Meanwhile, to make life with git easier, do these two things. I can no longer imagine git work without them:

1. install git-aware-terminal through npm. This will give you a nice color display of the current branch and status. (I had to upgrade my older node and npm first).
https://www.npmjs.com/package/git-aware-terminal

2. install git-completion-bash from https://github.com/git/git/blob/master/ ... etion.bash
just that one file. Mine is saved in my home directory as .git-completion-bash.
Then add the following to your .bashrc file

Code: Select all

if [ -f ~/.git-completion.bash ]; then
    . ~/.git-completion.bash
fi

This will give you shortcut aliases for git commands and type-ahead for completion.

Execute this command in a terminal window:

Code: Select all

source ~/.bash_profile

Then open a new terminal prompt and navigate to the livecode directory.

[tperry2x]

Thank you for the file link you sent me. As promised, I downloaded it and tried it out this evening.
I'm running into the following errors. (hard to grab as they scroll past so fast, and there's only so much scrollback available).

a.png (12.58 KiB) Viewed 4541 times

b.png (13.09 KiB) Viewed 4541 times

c.png (30.69 KiB) Viewed 4541 times

d.png (51.77 KiB) Viewed 4541 times

[mwieder]

Interesting that you're seeing errors from cc1plus. That's the backend compiler to g++.
What version of g++ do you have installed? I'm using 10.5.0.

[tperry2x]

Not sure at the moment, (whatever comes with xUbuntu 24 at the time of writing this). I'll try and check tomorrow evening. Many thanks