Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMIGAOS: Fixes to the automatic installation #2721

Merged
merged 6 commits into from Jan 9, 2021
Merged

Conversation

@raziel-
Copy link
Contributor

@raziel- raziel- commented Jan 9, 2021

Updated the readme converter script and amigaos.mk

Someone has to please update rm2ag.rexx.in as i have no idea what to do there and don´t want to break anything

raziel- added 5 commits Jan 9, 2021
switch to AmigaOS makedir, as mkdir seems to break pathes/dirs
New tables have been introduced which start with a bunch of minus (-) signs.
That broke the script at exactly 3.10 (where the tables are) by leaving it.

Updated the complete condition.
Fix some comment oversights
Fix an oversight
Last oversight
@lotharsm
Copy link
Member

@lotharsm lotharsm commented Jan 9, 2021

Looks like the only difference in the RM2AG.rexx.in compared to RM2AG.rexx is a different way to describe the version numer, since the .in files are usually used for building the final "product" by our Perl maintenance/versioning scripts:

# diff dists/amigaos/RM2AG.rexx dists/amigaos/RM2AG.rexx.in
81c81
< CALL WRITELN guide_write,'@$VER: ScummVM Readme 2.3.0git'
---
> CALL WRITELN guide_write,'@$VER: ScummVM Readme @VERSION@'
126a127
@deepcode-ci-bot
Copy link

@deepcode-ci-bot deepcode-ci-bot bot commented Jan 9, 2021

Congratulations 🎉. DeepCode analyzed your code in 0.04 seconds and we found no issues. Enjoy a moment of no bugs ☀️.

👉 View analysis in DeepCode’s Dashboard | Configure the bot

@raziel-
Copy link
Contributor Author

@raziel- raziel- commented Jan 9, 2021

@lotharsm

Would that be correct?

@lotharsm
Copy link
Member

@lotharsm lotharsm commented Jan 9, 2021

Yes, that's correct. Merging :-)

@lotharsm lotharsm merged commit c4d0f4f into scummvm:master Jan 9, 2021
3 checks passed
3 checks passed
Codacy Static Code Analysis Codacy Static Code Analysis
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deepcode-ci-bot Well done, no issues found!
Details
@raziel-
Copy link
Contributor Author

@raziel- raziel- commented Jan 9, 2021

Thank you

@raziel- raziel- deleted the raziel-:patch-1 branch Jan 9, 2021
@criezy
Copy link
Member

@criezy criezy commented Jan 14, 2021

The changes in this pull request have broken the AmigaOS daily builds on buildbot:

makedir ALL FORCE Games:ScummVM
make: makedir: Command not found
make: *** [../../src-master/src/backends/platform/sdl/amigaos/amigaos.mk:12: amigaosdist] Error 127
@raziel-
Copy link
Contributor Author

@raziel- raziel- commented Jan 14, 2021

Yeah.

Makedir is not a program from the SDK toolchain, but a system program.

I dont know how to solve this, mkdir is broken and unusable for automatic installation, at least locally.

Otoh, amigaos.mk is not really needed for daily builds, isn't it?
Could the amigaos.mk simply be flagged as "do not use" for buildbot?

Thank you

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jan 15, 2021

For newer buildbot (still testing), I introduced shims for Amiga commands which can be found at https://github.com/lephilousophe/dockerized-bb/tree/master/toolchains/amigaos4/packages/amiga-shims.
Maybe they can be installed on old buildbot in /opt/toolchains/amigaos4-gcc-8.3.0/bin.
They are not perfect but they seem to work properly for the packaging scripts (Makefile and REXX)

@lotharsm
Copy link
Member

@lotharsm lotharsm commented Jan 16, 2021

@lephilousophe if it's just a matter of copying all the files from the amiga-shims directory to the buildbot, then I can do it. Is there any further adjustment to be made?

@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jan 16, 2021

Normally none. They are just shell scripts which parse AmigaOS arguments and try to map them on POSIX commands

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.