Commit Graph

1011 Commits

Author SHA1 Message Date
Mark Cave-Ayland
6931631adc Dockerfile: add logic for optional install Universal interfaces on startup
Define a docker-entrypoint.sh that checks for the environment variables INTERFACES.
If INTERFACES is set to "universal" then we do the following:

  - If the universal/RIncludes directory is not empty, assume that the Universal
    interfaces are already installed. Call interfaces-and-libraries.sh to link
    the Universal interfaces instead of the default multiversal interfaces.

  - Otherwise check the INTERFACESFILE environment variable to locate a suitable
    Macbinary DiskCopy image of MPW-GM.img.bin containing the
    "Interfaces&Libraries" directory, which can be a path within the container
    image itself or an external URL. If the file is a URL then download it first,
    then decompress the file using ConvertDiskImage and then use the in-built
    hfsutils to extract the relevant files under /tmp/InterfacesAndLibraries.
    Finally call interfaces-and-libraries.sh to link the Universal interfaces
    instead of the default multiversal interfaces.

Otherwise use the multiversal interfaces which are included by default.
2023-12-17 21:13:01 +00:00
Mark Cave-Ayland
4042463991 Dockerfile: add macutils and interfaces-and-libraries.sh to image
These files will be required in order to download and install the Universal
Interfaces within the created image.
2023-12-17 20:11:54 +00:00
Wolfgang Thaller
9dd5dca1fa fix libelf build 2023-12-17 19:04:58 +01:00
Wolfgang Thaller
b4a91d430f
Merge pull request #213 from Thesola10/patch-1
Use global nixpkgs to allow immutable builds
2023-12-17 01:20:13 +01:00
Wolfgang Thaller
4116be4acc Merge branch 'docker-build' - finally incorporate PR #193 :-) 2023-12-16 23:49:12 +01:00
Wolfgang Thaller
01bccd3d35 remove test image from Dockerfile, link to repo 2023-12-16 22:49:02 +01:00
Wolfgang Thaller
bde2e8f74f only push docker image when on main branch 2023-12-16 22:29:26 +01:00
Wolfgang Thaller
323d3e3a34 Revert "azure-pipelines.yml: temporary disable all non-Linux builds"
This reverts commit a230a79ca3.
2023-12-16 22:27:36 +01:00
Wolfgang Thaller
9ff29c557e reactivate actual build 2023-12-16 20:40:14 +01:00
Wolfgang Thaller
3737404c4b without comdition 2023-12-16 19:10:22 +01:00
Wolfgang Thaller
192081cd01 use variable group 2023-12-16 19:05:30 +01:00
Wolfgang Thaller
e2143c9c20 try with service connection again 2023-12-16 17:02:16 +01:00
Wolfgang Thaller
34eeb4dbb7 use token variable and explicit commands for docker 2023-12-16 16:47:36 +01:00
Wolfgang Thaller
1d8f4f6774 test setup for docker 2023-12-16 16:27:50 +01:00
Wolfgang Thaller
8b57ceac12 add /build to gitignore 2023-12-16 15:14:53 +01:00
Wolfgang Thaller
147b839de6 update docker connection 2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
de06b24fd7 azure-pipelines.yml: push retro68 release image to GHCR
This release image contains the basic toolchain that can be used for building
projects without having to build Retro68 locally, including integration into a
CI pipeline.
2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
3a4468b270 azure-pipelines.yml: switch from host build to container build
This has two main advantages: firstly it means that the Dockerfile is being tested
as part of the pipeline when changes are merged into master, and secondly it allows
testing of Linux builds without requiring a separate job for Docker that can consume
even more CI minutes.

In order to test the container image it is necessary to manually start the build
image using docker run, execute the tests, and then copy the results back to the
host ready for publishing.

Note that since the base OS image is now handled by docker we can switch the host
to use the 'ubuntu-latest' image rather than the older 'ubuntu-20.04' image.
2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
d8e2780f8d Dockerfile: add toolchain bin directory to the default PATH
This allows the Retro68 compilers to be executed regardless of the current
working directory which is set to /root by default.
2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
86a16a78cf Dockerfile: add git package to the image
This enables code to be checked out from within the running container as is
typically used by CI runners.
2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
bde1485a9e Dockerfile: only copy the build directory artifacts into the final release image
Use the docker multi-stage build functionality to perform the Retro68 build in a
temporary build image, and then copy the final build directory into a fresh
release image. This reduces the final release image size from 9.2GB to 2.6GB.
2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
0649693436 Dockerfile: bring build up to date with that in azure-pipelines.yml
Update Dockerfile to use Ubuntu 20.04 and the updated package list from
azure-pipelines.yml. Also explicitly include the g++ package into the container
without which configure will error out with a 'configure: error: C++ preprocessor
"/lib/cpp" fails sanity check' error.
2023-12-16 12:59:53 +01:00
Mark Cave-Ayland
a230a79ca3 azure-pipelines.yml: temporary disable all non-Linux builds 2023-12-16 12:59:51 +01:00
Wolfgang Thaller
591f2620d2 export variables from PEF (thanks to @elliotnunn) 2023-12-16 03:55:00 +01:00
Wolfgang Thaller
a97417fecc ci: update nix docker version 2023-12-09 01:03:45 +01:00
Wolfgang Thaller
04ab7e92ac
Merge pull request #214 from VyrCossont/patch-1
Add texinfo to brew install commands
2023-12-08 17:12:25 +01:00
Vyr Cossont
3537637c0f
Add texinfo to brew install commands
Following the instructions as is on macOS results in `build-toolchain.bash` failing with `WARNING: 'makeinfo' is missing on your system`. The readme was updated in #59 but only for Ubuntu.
2023-10-23 13:08:19 -07:00
Karim Vergnes
7d2ebc7ba6
Hotfix: inherit system provided in argument 2023-10-09 17:31:35 +02:00
Karim Vergnes
0de4f1502b
Use global nixpkgs to allow immutable builds 2023-10-09 17:28:24 +02:00
Wolfgang Thaller
5f88250601
Merge pull request #203 from ryandesign/patch-1
ConvertObj: Fix typo in comment
2022-12-29 20:49:23 +01:00
Wolfgang Thaller
3f74aa7561
Merge pull request #202 from ryandesign/ryandesign-void
Declare all C function parameters
2022-12-29 20:49:05 +01:00
Ryan Schmidt
b80f694ad1
ConvertObj: Fix typo in comment 2022-12-05 07:05:58 -06:00
Ryan Schmidt
8f68ffd203 Declare all C function parameters
Specify parameters for all C functions. Not specifying parameters is the
same as specifying "void" in C++ and in C23 and later but that's not the
case in C prior to C23.

Compile C files with the same warnings as C++ files, additionally making
the strict prototypes warning an error to catch such problems in the
future. This commit isn't intended to address all the other warnings now
being emitted.
2022-12-05 06:48:30 -06:00
Wolfgang Thaller
3e426b21ea
Merge pull request #196 from ryandesign/multiseg-zero-pad-id
Fix multisegment app with > 10 CODE resources
2022-12-04 19:47:10 +01:00
Wolfgang Thaller
1facbfab7d
Merge pull request #201 from ryandesign/patch-1
ConvertObj: Fix typos in error messages
2022-12-04 10:16:50 +01:00
Ryan Schmidt
ee75babf9e
ConvertObj: Fix typos in error messages 2022-11-27 16:35:46 -06:00
Ryan Schmidt
695053149e Fix multisegment app with > 10 CODE resources
Closes #195
2022-10-26 20:16:14 -05:00
Wolfgang Thaller
2d38cceb19
Merge pull request #189 from ryandesign/minivmac-copy-attrs
MiniVMac.cc: Preserve attributes when copying
2022-10-25 23:27:07 +02:00
Wolfgang Thaller
932ceadf9c
Merge pull request #190 from ryandesign/LaunchAPPL-find-libhfs
LaunchAPPL: Find libhfs header/library
2022-10-25 23:26:29 +02:00
Ryan Schmidt
f06c07d40d LaunchAPPL: Find libhfs header/library 2022-10-08 00:06:46 -05:00
Ryan Schmidt
14f5ad3728 MiniVMac.cc: Preserve attributes when copying
When copying files from the system disk image to the new disk image,
preserve all attributes (creation date, modification date, bundle bit,
locked bit, etc.), except clear the inited bit so that the Finder
chooses new icon positions, otherwise (under System 6 at least) the
icons pile up on top of each other. Preserving the bundle bit in
particular tells the Finder to look in the file for icon information
when building the desktop database, without which the files all show
generic icons in the Finder.
2022-10-06 17:11:32 -05:00
Wolfgang Thaller
3db76c9abe
Merge pull request #188 from ryandesign/libretro-typos
Fix typos in comments in libretro
2022-10-06 23:36:06 +02:00
Ryan Schmidt
97b257e8b4 Fix typos in comments in libretro 2022-10-05 19:53:00 -05:00
Wolfgang Thaller
280a1e4ac6
Merge pull request #186 from ryandesign/LaunchAPPL.cfg-typos
LaunchAPPL.cfg.example: Fix typos
2022-10-02 14:12:19 +02:00
Ryan Schmidt
18f189162e LaunchAPPL.cfg.example: Fix typos 2022-10-02 00:28:47 -05:00
Wolfgang Thaller
1f533b761c
Merge pull request #183 from ryandesign/minivmac-find-folder
MiniVMac.cc: Use localized Extensions and Startup Items folder names
2022-10-01 11:12:47 +02:00
Wolfgang Thaller
c5c9e281f4
Merge pull request #182 from ryandesign/minivmac-finder-macsbug
MiniVMac.cc: Get Finder/MacsBug name from boot blocks
2022-10-01 11:12:06 +02:00
Wolfgang Thaller
ccc8ad12bb
Merge pull request #181 from ryandesign/LaunchAPPL.cfg-minivmac-system7
LaunchAPPL.cfg.example: Update for System 7
2022-10-01 11:11:28 +02:00
Wolfgang Thaller
8798070524
Merge pull request #177 from ryandesign/minivmac-alias
MiniVMac.cc: Fix alias creation code
2022-10-01 11:11:09 +02:00
Wolfgang Thaller
45236e10c0
Merge pull request #180 from ryandesign/azure-macos11
Azure: Update to macOS 11
2022-09-22 22:02:00 +02:00