kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

remove tools/bk_tools submodule

Browse Source
This commit is contained in:
banjo.decomp
2022-11-22 20:49:01 -06:00
parent 9dc37b91f5
commit 1c0895e349
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -1,6 +1,3 @@
[submodule "tools/bk_tools"]
path = tools/bk_tools
url = https://github.com/MittenzHugg/bk_tools.git
[submodule "tools/asm-differ"] [submodule "tools/asm-differ"]
path = tools/asm-differ path = tools/asm-differ
url = https://github.com/simonlindholm/asm-differ.git url = https://github.com/simonlindholm/asm-differ.git

2
Dockerfile
View File

@@ -5,6 +5,8 @@ ENV DEBIAN_FRONTEND=noninteractive
COPY packages.txt / COPY packages.txt /
RUN apt-get update && apt-get install -y $(cat packages.txt) RUN apt-get update && apt-get install -y $(cat packages.txt)
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
COPY requirements.txt / COPY requirements.txt /
RUN python3 -m pip install -r requirements.txt RUN python3 -m pip install -r requirements.txt

7
Makefile
View File

@@ -185,11 +185,6 @@ $(addprefix progress-,$(OVERLAYS)) : progress-% : progress/progress.%.csv
@$(PROGRESS_READ) $< $(VERSION) $* @$(PROGRESS_READ) $< $(VERSION) $*
# Verify that the roms match, also sets up diff_settings # Verify that the roms match, also sets up diff_settings
verify-decompressed: $(DECOMPRESSED_BASEROM) $(Z64)
@$(DIFF) $(DECOMPRESSED_BASEROM) $(Z64) > /dev/null && \
$(PRINT) "$(YELLOW) _\n _( )_\n [ ]_\n ) _ _)\n [_( )_]\n$(BLUE)$(BASENAME).$(VERSION).uncompressed.z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \
$(PRINT) "$(BLUE)$(BASEROM) $(RED)differs$(NO_COL)\n"
verify: $(BASEROM) $(FINAL_Z64) verify: $(BASEROM) $(FINAL_Z64)
@$(DIFF) $(BASEROM) $(FINAL_Z64) > /dev/null && \ @$(DIFF) $(BASEROM) $(FINAL_Z64) > /dev/null && \
$(PRINT) "$(YELLOW) _\n _( )_\n [ ]_\n ) _ _)\n [_( )_]\n$(BLUE)$(BASENAME).$(VERSION).z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \ $(PRINT) "$(YELLOW) _\n _( )_\n [ ]_\n ) _ _)\n [_( )_]\n$(BLUE)$(BASENAME).$(VERSION).z64$(NO_COL): $(GREEN)OK$(NO_COL)\n" || \
@@ -433,7 +428,7 @@ MAKEFLAGS += -r
.SUFFIXES: .SUFFIXES:
# Phony targets # Phony targets
.PHONY: all clean verify verify-decompressed $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS)) .PHONY: all clean verify $(OVERLAYS) progress $(addprefix progress-,$(OVERLAYS))
# Set up pipefail # Set up pipefail
SHELL = /bin/bash -e -o pipefail SHELL = /bin/bash -e -o pipefail

2
README.md
View File

@@ -59,6 +59,8 @@ Ubuntu 18.04 or higher.
```sh ```sh
sudo apt-get update && sudo apt-get install -y $(cat packages.txt) sudo apt-get update && sudo apt-get install -y $(cat packages.txt)
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
python3 -m pip install -r requirements.txt python3 -m pip install -r requirements.txt
``` ```

1
packages.txt
View File

@@ -3,6 +3,7 @@ build-essential
cmake cmake
gcc-mips-linux-gnu gcc-mips-linux-gnu
less less
curl
libglib2.0-0 libglib2.0-0
libssl-dev libssl-dev
python3 python3

1
tools/bk_tools

Submodule tools/bk_tools deleted from 5a880b4978