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

.gitignore

@@ -10,6 +10,7 @@ __pycache__/
 CMakeLists.txt
 cmake-build-debug
 venv/
+.venv/
 tags
 
 # Project-specific ignores
@@ -19,12 +20,14 @@ tags
 *.sra
 *.bin
 *.elf
+*.flash
 archive/
 build/
 baserom/
 decomp/
 asm/
 data/
+extracted/
 expected/
 nonmatchings/
 

Jenkinsfile

@@ -22,25 +22,18 @@ pipeline {
         }
         stage('Install Python dependencies') {
             steps {
-                echo 'Installing Python dependencies'
-                sh 'python3 -m venv .venv'
-                sh '''. .venv/bin/activate
-                python3 -m pip install -U -r requirements.txt
-                python3 -m pip install -U GitPython
-                '''
+                sh 'bash -c "make -j venv"'
             }
         }
         stage('Copy ROM') {
             steps {
                 echo 'Setting up ROM...'
-                sh 'cp /usr/local/etc/roms/mm.us.rev1.z64 baserom.mm.us.rev1.z64'
+                sh 'cp /usr/local/etc/roms/mm.us.rev1.z64 baseroms/n64-us/baserom.z64'
             }
         }
         stage('Setup') {
             steps {
-                sh '''. .venv/bin/activate
-                bash -c "make -j setup 2> >(tee tools/warnings_count/warnings_setup_new.txt)"
-                '''
+                sh 'bash -c "make -j setup 2> >(tee tools/warnings_count/warnings_setup_new.txt)"'
             }
         }
         stage('Check setup warnings') {
@@ -50,9 +43,7 @@ pipeline {
         }
         stage('Assets') {
             steps {
-                sh '''. .venv/bin/activate
-                bash -c "make -j assets 2> >(tee tools/warnings_count/warnings_assets_new.txt)"
-                '''
+                sh 'bash -c "make -j assets 2> >(tee tools/warnings_count/warnings_assets_new.txt)"'
             }
         }
         stage('Check assets warnings') {
@@ -62,9 +53,7 @@ pipeline {
         }
         stage('Disasm') {
             steps {
-                sh '''. .venv/bin/activate
-                bash -c "make -j disasm 2> >(tee tools/warnings_count/warnings_disasm_new.txt)"
-                '''
+                sh 'bash -c "make -j disasm 2> >(tee tools/warnings_count/warnings_disasm_new.txt)"'
             }
         }
         stage('Check disasm warnings') {
@@ -74,9 +63,7 @@ pipeline {
         }
         stage('Build') {
             steps {
-                sh '''. .venv/bin/activate
-                bash -c "make -j uncompressed 2> >(tee tools/warnings_count/warnings_build_new.txt)"
-                '''
+                sh 'bash -c "make -j rom 2> >(tee tools/warnings_count/warnings_build_new.txt)"'
             }
         }
         stage('Check build warnings') {
@@ -86,9 +73,7 @@ pipeline {
         }
         stage('Compress') {
             steps {
-                sh '''. .venv/bin/activate
-                bash -c "make -j compressed 2> >(tee tools/warnings_count/warnings_compress_new.txt)"
-                '''
+                sh 'bash -c "make -j compress 2> >(tee tools/warnings_count/warnings_compress_new.txt)"'
             }
         }
         stage('Check compress warnings') {
@@ -102,15 +87,9 @@ pipeline {
             }
             steps {
                 sh 'mkdir reports'
-                sh '''. .venv/bin/activate
-                python3 ./tools/progress.py csv >> reports/progress-mm-nonmatching.csv
-                '''
-                sh '''. .venv/bin/activate
-                python3 ./tools/progress.py csv -m >> reports/progress-mm-matching.csv
-                '''
-                sh '''. .venv/bin/activate
-                python3 ./tools/progress.py shield-json > reports/progress-mm-shield.json
-                '''
+                sh '.venv/bin/python3 ./tools/progress.py csv >> reports/progress-mm-nonmatching.csv'
+                sh '.venv/bin/python3 ./tools/progress.py csv -m >> reports/progress-mm-matching.csv'
+                sh '.venv/bin/python3 ./tools/progress.py shield-json > reports/progress-mm-shield.json'
                 stash includes: 'reports/*', name: 'reports'
             }
         }