From ec37636a7a764dcb0cca3bfe6a463855b91127ab Mon Sep 17 00:00:00 2001 From: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> Date: Sat, 28 Mar 2020 17:34:57 -0400 Subject: [PATCH] Updated jenkins file, readme, and replaced 'extract' target with 'setup' --- Jenkinsfile | 6 ++---- README.md | 2 +- checksum_old.md5 | 1 - makefile | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 checksum_old.md5 diff --git a/Jenkinsfile b/Jenkinsfile index 2247df2d6a..b7845d0b77 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,13 +5,11 @@ pipeline { stage('Setup') { steps { echo 'Setting up...' - sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom.z64' + sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64' sh 'git submodule update --init --recursive' - sh 'make -C tools' sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler' sh 'chmod +x -R tools/ido*' - sh 'python3 extract_baserom.py' - sh 'python3 extract_assets.py' + sh 'make setup' } } stage('Build') { diff --git a/README.md b/README.md index 2b6ebcdbb1..46f963b68a 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,6 @@ This repo does not include all assets necessary for compiling the ROM. A prior c This is a disassembly and decompilation of Legend of Zelda: Ocarina of Time Master Quest (debug) It builds the following ROM: -* zelda_ocarina_mq_dbg.z64 `md5: 717179476af84133b14ff73af87db57a` +* zelda_ocarina_mq_dbg.z64 `md5: f0b7f35375f9cc8ca1b2d59d78e35405` Please refer to the Getting Started guide in the Wiki for setup instructions. \ No newline at end of file diff --git a/checksum_old.md5 b/checksum_old.md5 deleted file mode 100644 index 98da4b6798..0000000000 --- a/checksum_old.md5 +++ /dev/null @@ -1 +0,0 @@ -717179476af84133b14ff73af87db57a zelda_ocarina_mq_dbg.z64 diff --git a/makefile b/makefile index 0702023fac..2272230b53 100644 --- a/makefile +++ b/makefile @@ -129,7 +129,7 @@ build/undefined_syms.txt: undefined_syms.txt clean: $(RM) $(ROM) $(ELF) -r build -extract: +setup: make -C tools python3 fixbaserom.py python3 extract_baserom.py