Commit Graph

23 Commits

Author SHA1 Message Date
Derek Hensley
f36681d697
Jenkinsfile Hotfix: install GitPython for progress script (#1612) 2024-04-06 21:22:30 -07:00
Derek Hensley
471d86f530
Build Sync (#1600)
* Rename outputs

* Makefile target renames

* Add run target

* yeet z64compress

* venv

* baserom_uncompressed -> baserom-decompressed

* input rom name to baserom.z64

* Add BUILD_DIR makefile variable

* Move built roms to build dir

* Move baserom to baseroms folder

* Add version to map file name

* Makefile cleanup

* Rename ldscript to include version

* Multiversion build

* n64-us version name

* Remove venv as dependency of setup

* Readme wording

* extract_baserom.py suggestion

* Readd checksums

* Make .venv work with windows

* missed an endif

* Cleaner windows venv implementation

* Remove duplciate process

* Build process steps

* Move make_options back

* Fix schedule build directory

* Fix schedule includes

* Makefile NON_MATCHING check -> != 0

* OOT 1704 changes

* Small cleanups

* Missed 1 thing

* UNSET -> SYMS

* Update extract_baserom.py

* dmadata.py

* Small cleanup

* dmadata_start

* Format

* dmadata files

* Fix makefile comment

* Jenkins report fix

* extracted dir

* Python dependencies order in readme
2024-04-06 11:07:58 -07:00
Anghelo Carvajal
e32e44ff40
Install GitPython in Jenkins (#1540) 2024-01-19 13:34:44 -03:00
Anghelo Carvajal
1b9aa96b3a
Add venv to Jenkins (#1539)
* Add venv to Jenkinsfile

* z64compress warning
2024-01-19 09:26:40 -03:00
Derek Hensley
19a605c2e7
master to main rename (#1379)
* master -> main

* Missed some instances of master
2023-09-22 12:57:21 -03:00
Ethan Roseman
7b572e8c53
Update Jenkinsfile 2022-10-16 17:20:16 +09:00
Anghelo Carvajal
54957f8735
Yet another disasm.py speedup (#918)
* starting point

* add rabbitizer stuff, but commented out

* kinda works now, except for symbols

* trying to fix using symbols for disassembly

* more fixes

* fix branches and some format changes

* make disasm.py runnable again 😅

* fix double words

* hopefully fix jumptables

* fix delay slot spacing on entry.s

* Fix delay slot shenanigans

* minor format update

* re enable multithreading

* add rabbitizer to requirements.txt and cleanup the file

* cleanup

* more cleanup

* more cleanups

* getImmOverride

* black

* hopefully final cleanup

* diff.py requirements

* Install python dependencies on jenkinsfile

* --no-cache

* Remove `--no-cache --upgrade`

* branch_likely_delay_slot_save

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* a

* Don't use $FpcCsr

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11 20:13:14 -04:00
Derek Hensley
f1d1d83206
Makefile Changes (#727)
* Change makefile so rom doesn't need to match by default for compression, also change JenkinsFile to split off compression step from building

* Swap uncompressed and compressed in all target

* Forgot to change check warnings stage name

* Intentionally produce non_matching

* Fix

* Add assets target

* Jenkins assets

* Update update_current_warnings

* .make_options config file

* Change comment at top

* Add toggle options for CC_CHECK and OBJDUMP

* Small cleanup

* Whitespace

* More

* bin dumping

* Whitespace

* Review

* Fix comment
2022-05-25 22:15:28 -04:00
Anghelo Carvajal
1599192b85
Script for checking relocs correctly updated on spec (#718)
* Script to check for relocs on spec

* add reloc_spec_check to jenkinsfile

* add colors

* Use light red instead of red

* Go back to red

* fix EnDoor reloc
2022-03-24 21:25:41 -03:00
Ethan Roseman
91b983776e
Set up AnsiColor Jenkins plugin (#682)
* Set up AnsiColor Jenkins plugin

* deliberate error

* Update z_en_firefly.c
2022-02-20 12:53:05 -05:00
Anghelo Carvajal
d4dc34ee71
Update progress script with new assets categories and update csv output format (#510)
* Reorganize csvs and progress.py

* Put stuff in the correct folders

* Reduce lots of repeated code

* Change csv output format

* Filter out automaticaly named variables in "Matching" progress calculation for assets

* Address Elliptic's review

* Don't count handwritten files in progress and add a way to fix files detected in the wrong section

* Add missing "total"

* More fixing

* Add two missing columns

* Update paths in Jenkinsfile

* Update progress shield in readme

* Update progress link
2021-12-18 16:37:37 +00:00
rylieb
57a9fb7b34
Hopefully prevent misformatted files from ever entering master again. (#356)
* Added tools/check_format.sh.

* Exit nonzero from format.sh if clang-format-11 not installed.

* Replace which with command -v.

* Fail check_format.sh if format.sh fails.

* Improve Jenkinsfile.

* Take exit 0 out of else in check_format.sh.

* Format flg_set.c to test new Jenkins environment.

* Fix formatter failed logic in check_format.sh.

* Format all misformatted files in master.

* Remove Summarize Problems stage from Jenkins.
I didn't realize Jenkins would not a run a subsequent stage if a
previous stage errored. This defeats the purpose of summarizing all
problems at the end, since this will only happen if there *are* no
problems.

* Use Post->Failure block to print all logs instead.

* Remove spurious semicolon in arms_hook.
2021-10-24 13:06:46 -04:00
EllipticEllipsis
ef875bc221
Improve check new warnings (#308)
* Change check_new_warnings to output stderr to console too

* Colour warnings and functions in check_new_warnings

* Remove unneeded prototype in EnDai

* Add multithreading options, colour to output, help

* Give Jenkins a script again

* Test

* Remove tput warnings, hopefully

* Try -T dumb

* Undo test warning
2021-09-29 18:42:24 -04:00
Tharo
7743e5a2c4
Overhaul the build system (#234)
* wip

* fix

* add disassembler

* Disasm builds OK

* Variable addends

* More wip

* Rodata migration implemented

* Cleanup old tools

* Try fix submodule -> subrepo merge

* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "602e609"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "602e609"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Builds again but assets are totally broken

* git subrepo pull --force tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "1ffdb08a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "1ffdb08a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables

* rm z64compress in preparation for subrepo

* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "eb11085c"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "eb11085c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Fix asset extraction

* Fix diff-init make rule

* Split code bss

* Split assumed linker bug padding from assembly files

* add filelists for mm.us.rev1

* Maybe working, but I'm not sure

* add overlays to spec

* Add rodata to actos

* Everything compiles

* Make a lot of C files for code

* Add almost every file in code to spec

* whoops

* 3 code files left

* add scenes to spec

* More progress on progress.py

* Fix skelanime in spec

* audio files!

* Fix merge issues

* Fix some C files in code

* Fix remaining code files

* Use existing O1 C files in spec

* reorder boot order in spec

* update spec

* fault.c

* Convert relocs on completed actors, fixbaserom uses current rom name

* more boot files

* Add VT macros and script

* finish already existing boot files

* most of  libultra

* fix 64bits libultra files

* Use C files for libultra, wrap some functions in NON_MATCHING

* Remove duplicate of OS_CLOCK_RATE from fault.c

* C files for fbdemos

* delete dumb files

* bootstrap C files, still need to add them to the spec

* update fixbaserom

* boot OK?

* I forgot to commit the spec

* C for gamestates

* C for kaleido

* Change all includes to ""

* copy actor sizes script from oot

* I forgot to delete those files

* Basic C files for effects

* Add effects initvars names

* Remove mislabelled boot functions from header/txt

* Begin porting bootstrap_fx, some sizes

* Fix <>

* Fix enum

* Fix diff.py

* fix libultra stuff

* update regconvert

* update setup warnings

* add some missing ;

* Fix some makefile stuff and other fixes on some non_matching functions

* add executable flag in extract_baserom and fixbaserom

* fix relative path

* copy assist from oot

* fix map path

* another assist path fix

* Delete C files for handwritten files

* add code_801A51F0 to spec

* add gfxbuffers to spec

* Move rodata to top of each file when possible

* UNK_TYPEs for func_801A51F0

* Remove kaleido rodata from spec

* Update spec and undefined_syms for recent merge

* GCC warnings and fix errors in nonmatchings,

* round percentage numbers

* progress script: format changes

* progress: error on non-existing files

* fix warning in z_scene_table

* Match 2 nonmatchings in z_actor

* Warnings in lightswitch and invadepoh

* Fix warning in z_actor_dlftbls

* I though I fixed this one

* whoops

* Comment out CC_CHECK

* Removed redundant ultra64.h includes

* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms

* Completed gamestates bootstrap

* Split kaleido_scope

* Remove section.h and segment.h, move keep object externs to a common location in variables.h

* Completed effects bootstrap

* Segmented address externs for effects, fbdemos, gamestates and kaleido

* Move actor data externs out of the if 0

* Segmented address externs for actors

* Prepare actionfunc detection

* fix script, how did it even work before

* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler

* Automated actionFunc detection in actors

* Segmented addresses from player .text

* rm old segment addrs script and fix build

* Move sizes folder to tools

* Make build.py executable

* New Jenkinsfile Prayge

* Remove numpy dependencies

* Add warnings_disasm_current.txt

* my bad

* Update spec and undefined_syms

* Add z_eff_ss_hahen to pametfrog

* git subrepo pull (merge) --force tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "163ca2af"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "163ca2af"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Make z64compress print to stdout

* sneeky commit to update warnings tooling

* test

* Another test

* Mark fixing overlay reloc generating as a TODO

* Update warnings stuff

* Communicate the return code from running z64compress back to the Makefile through the wrapper

* Run formatter, remove extra commented copy of function

* Re-fix some includes

* Convert atan to hex to conform to decided style

* Some tidying up, remove c for fp and the other two handwritten code files

* BSS in z_collision_check & z_scene_proc

* add static back in

* Fix timerintr bss, add file to spec, some cleanup

* Remove externs

* Newline

* Readd enums

* Typo

* Colours

* Comments for hitmark enum values

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Improvements and suggestions

* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-03 23:21:31 -04:00
Anghelo Carvajal
25afa196f6
Make Jenkins check if a PR will add new warnings (#150)
* warning count

* update warnings

* Update warnings

* Use `tee`

* Suggestions of zbanks

* I hope this will fix it
2021-05-19 22:14:20 -04:00
Parker Burnett
490924df23
QOL addtions to the readme (#104)
* adding changes to the README

* adding in progress shield

adding in the shield icon to show percentage complete

* updating the files, added gitignore for ctx.c

* fixing the typos

* fixing things to hopefully build now
2021-05-18 18:39:08 -04:00
Ethan Roseman
d61a7a9ef2
Jenkins update (#79)
* Jenkins update

* reorder
2021-03-22 06:14:27 -05:00
Kenix3
e788bfecbf
Jenkinsfile no longer builds master with qemu (#66) 2021-03-10 23:03:58 -05:00
Kenix3
a858d26e10
Updates jenkinsfile to give the name of the progress.csv files based on the MM version (#65) 2021-03-10 22:38:56 -05:00
Kenix3
fcdfa28d66 Uses new articulated name for baserom 2021-03-10 22:28:06 -05:00
Kenix3
710c3d17b0 Fixes path to progress.py in Jenkinsfile 2021-03-10 22:28:06 -05:00
Kenix3
a23213c08c Jenkinsfile now builds master with qemu IDO 2021-03-10 22:28:06 -05:00
Kenix3
037ba9a22e Initial support of tracking progress per code/boot/overlay, and outputs the stats to csv. 2021-03-10 22:28:06 -05:00