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

Enable builds from source, clean up README #25

Merged
merged 74 commits into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
90062f8
try to run compile.sh
BlastBrothers Apr 10, 2024
a628c38
nuke everything except the sh
BlastBrothers Apr 10, 2024
cc5fdba
try to zip linux build
BlastBrothers Apr 10, 2024
d1d7bd7
Update release.yml
BlastBrothers Apr 10, 2024
1cb83e8
Update release.yml
BlastBrothers Apr 10, 2024
aa01593
Update release.yml
BlastBrothers Apr 10, 2024
183f19f
Update release.yml
BlastBrothers Apr 10, 2024
99371bf
Update release.yml
BlastBrothers Apr 10, 2024
ae00e2e
Update release.yml
BlastBrothers Apr 10, 2024
37caf7c
Update release.yml
BlastBrothers Apr 10, 2024
27484eb
Update release.yml
BlastBrothers Apr 10, 2024
f59fdc5
Update release.yml
BlastBrothers Apr 10, 2024
bd06637
Update release.yml
BlastBrothers Apr 10, 2024
42d1ece
dir
BlastBrothers Apr 10, 2024
7ec370e
Try to zip one folder deeper
BlastBrothers Apr 10, 2024
26b4b78
ls
BlastBrothers Apr 10, 2024
eb0a85d
Update release.yml
BlastBrothers Apr 10, 2024
4e1fba6
Update release.yml
BlastBrothers Apr 10, 2024
40fa335
Update release.yml
BlastBrothers Apr 10, 2024
3700804
try OLDPWd way
BlastBrothers Apr 11, 2024
2c07942
Update release.yml
BlastBrothers Apr 11, 2024
cda493d
Update release.yml
BlastBrothers Apr 11, 2024
064217a
checkout v4, try win build
BlastBrothers Apr 12, 2024
fac3cec
Update release.yml
BlastBrothers Apr 12, 2024
ab4b02d
actually copy over exe's
BlastBrothers Apr 12, 2024
eff41df
can you tell I don't use Linux
BlastBrothers Apr 12, 2024
470a336
test
BlastBrothers Apr 12, 2024
5c96f5c
Update release.yml
BlastBrothers Apr 12, 2024
54f86eb
Update release.yml
BlastBrothers Apr 12, 2024
721f3aa
Update release.yml
BlastBrothers Apr 12, 2024
898355a
fix fodler path, finally?
BlastBrothers Apr 12, 2024
52dc2f1
First sketch of Win build, doesn't work
BlastBrothers Apr 15, 2024
a0cb914
Fiddle with compile.bat, still doesn't work
BlastBrothers Apr 30, 2024
c60c7c2
An attempt at doing proper builds on Windows. Linux unchanged
BlastBrothers Jun 21, 2024
a573871
Update compile script
BlastBrothers Jun 21, 2024
9649362
More fiddling
BlastBrothers Jun 22, 2024
9a2f59e
Make linker more like AgDev, remove icon
BlastBrothers Jun 22, 2024
706b5dc
Add align back in, remove more from linker
BlastBrothers Jun 22, 2024
5df7fc5
Add stuff to crt from AgDev
BlastBrothers Jun 23, 2024
2fb2886
Use the same memory allocation AgDev does. This did not fix builds, s…
BlastBrothers Jun 23, 2024
e126cd0
Include the final missing .src files to get it fully working!
BlastBrothers Jun 25, 2024
d99427a
Get rid of ce directory
BlastBrothers Jun 25, 2024
df8d499
Copy over AgDev tests
BlastBrothers Jun 25, 2024
3e0f408
quote everything, fix delete
BlastBrothers Jun 25, 2024
5ccae10
Update release.yml
BlastBrothers Jun 25, 2024
e047ce1
Update release.yml
BlastBrothers Jun 25, 2024
c757fb1
Update release.yml
BlastBrothers Jun 25, 2024
36e87a4
Update release.yml
BlastBrothers Jun 25, 2024
ebec80e
Update release.yml
BlastBrothers Jun 25, 2024
b5af3a4
?????
BlastBrothers Jun 26, 2024
8d8167f
too many quotes
BlastBrothers Jun 26, 2024
b51ce69
Merge branch 'main' of https://github.com/BlastBrothers/AgDev
BlastBrothers Jun 26, 2024
38345d2
too many quotes
BlastBrothers Jun 26, 2024
d10b195
Update release.yml
BlastBrothers Jun 26, 2024
dc38f04
V1 of Linux build script
BlastBrothers Jun 29, 2024
f881317
Merge branch 'main' of https://github.com/BlastBrothers/AgDev
BlastBrothers Jun 29, 2024
9d91833
Minor changes
BlastBrothers Jun 30, 2024
f23c60b
Try some things, delete unnessecary source file
BlastBrothers Jul 1, 2024
2cd6df4
Linux is case-sensitive
BlastBrothers Jul 1, 2024
6bd11db
Get it to work?
BlastBrothers Jul 2, 2024
ee95390
Restore sys and ti folders
BlastBrothers Jul 4, 2024
42caa4c
Update release.yml
BlastBrothers Jul 4, 2024
0e069b7
Update release.yml
BlastBrothers Jul 4, 2024
613618d
Update release.yml
BlastBrothers Jul 5, 2024
7d82f95
Update release.yml
BlastBrothers Jul 5, 2024
3081161
Update release.yml
BlastBrothers Jul 5, 2024
12a0414
Update release.yml
BlastBrothers Jul 5, 2024
21528a1
Update release.yml
BlastBrothers Jul 5, 2024
12ba100
Update release.yml
BlastBrothers Jul 5, 2024
5d21e2c
Fix Win builds, clean up compile scripts
BlastBrothers Jul 5, 2024
72f0568
Merge branch 'main' of https://github.com/BlastBrothers/AgDev
BlastBrothers Jul 5, 2024
cc930a4
update COMPILE.md
BlastBrothers Jul 5, 2024
1e44bef
Cut down README
BlastBrothers Jul 5, 2024
a8bc1ab
Minor changes to the readme
BlastBrothers Jul 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,49 +8,49 @@ jobs:
release_linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Add CEdev-Linux
- uses: actions/checkout@v4
- name: Run compile.sh
run: |
wget https://github.com/CE-Programming/toolchain/releases/download/v11.2/CEdev-Linux.tar.gz
mkdir /usr/share/CEdev
tar -xvf CEdev-Linux.tar.gz -C /usr/share/
rm CEdev-Linux.tar.gz
cp -r . /usr/share/CEdev/

cd ..
mkdir temp
cd temp
sudo sh ${{ github.workspace }}/compile.sh ${{ github.workspace }}

- name: Zip (Linux)
run: |
cd /usr/share
zip -r AgDev_release_${{ github.ref_name }}_linux.zip CEdev -x '*.git*' -x '*.github*'

cd ${{ github.workspace }}/../temp/AgDev_build/
zip -r "${{ github.workspace }}/../temp/AgDev_release_${{ github.ref_name }}_linux.zip" .
ls

- name: Upload Linux ZIP to GitHub Release
uses: xresloader/upload-to-github-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
file: /usr/share/AgDev_release_${{ github.ref_name }}_linux.zip
file: ${{ github.workspace }}/../temp/AgDev_release_${{ github.ref_name }}_linux.zip
tags: true

release_windows:
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Add CEdev-Windows
- uses: actions/checkout@v4
- name: Run compile.bat
run: |
wget https://github.com/CE-Programming/toolchain/releases/download/v11.2/CEdev-Windows.zip
mkdir /usr/share/CEdev
unzip CEdev-Windows.zip -d /usr/share/
rm CEdev-Windows.zip
cp -r . /usr/share/CEdev/

cd ..
mkdir temp
cd temp
${{ github.workspace }}\compile.bat ${{ github.workspace }}

- name: Zip (Windows)
run: |
cd /usr/share
zip -r AgDev_release_${{ github.ref_name }}_windows.zip CEdev -x '*.git*' -x '*.github*'
cd ${{ github.workspace }}\..\temp\AgDev_build
powershell -Command "Compress-Archive * AgDev_release_${{ github.ref_name }}_windows.zip"
dir

- name: Upload Windows ZIP to GitHub Release
uses: xresloader/upload-to-github-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
file: /usr/share/AgDev_release_${{ github.ref_name }}_windows.zip
file: ${{ github.workspace }}\..\temp\AgDev_build\AgDev_release_${{ github.ref_name }}_windows.zip
tags: true
13 changes: 8 additions & 5 deletions COMPILE.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# AgDev - compile instructions

A script ```compile.sh``` can be used to compile this source tree.
It is a Linux only compile script.
Broadly speaking, compiling AgDev entails cloning CEdev, then copying AgDev source files on top of that repo, and then building CEdev, with some additional cleanup work performed afterwards. However, there's a lot of ways this can go wrong, so build scripts are provided to make this process easier. These scripts will place the AgDev build inside the `AgDev_build` folder relative to where they're called. They take an optional argument which points to a local copy of the AgDev git repo; if this is not provided it will pull from the main branch on GitHub instead.

You should clone the repo or extract the release, then just run the bash script `compile.sh`
As part of the script it will download https://github.com/CE-Programming/toolchain/releases/latest/download/CEdev-Linux.tar.gz
If you run into issues, try installing the CEdev prerequisite libraries (fasmg, ez80-clang, and MinGW for Windows users) as described in the [CEdev compilation instructions](https://ce-programming.github.io/toolchain/static/contributing.html).

After the code is compiled, move the CEdev directory to wherever you desire and add the CEdev/bin directory to your path.
## Windows

`compile.bat [path\to\agdev\repo]`

## Linux

`sudo sh compile.sh [path/to/agdev/repo/]`
Loading