Skip to content

Commit

Permalink
Remove support for downloading CSVs from Google Docs (#497)
Browse files Browse the repository at this point in the history
The Google version hasn't been kept up to date with the version in the
repo, and it's a bit weird to still have this anyway.

Fixes #496
  • Loading branch information
Timmmm authored Jan 2, 2025
1 parent c189447 commit 557678b
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ DATE ?= $(shell date +%Y-%m-%d)
VERSION ?= v0.9.2
REVMARK ?= Draft

# URLs for downloaded CSV files
URL_BASE = https://docs.google.com/spreadsheets/d/1nyxKamsYZaeTyG8qP-JX4_oQwcuQ_4nZ_Ihm3RK0NEY/gviz/tq?tqx=out:csv
URL_ISA = $(URL_BASE)&gid=0
URL_CSR = $(URL_BASE)&gid=1927549494

# Directories and files
BUILD_DIR = build
SRC_DIR = src
Expand Down Expand Up @@ -130,7 +125,6 @@ pdf: $(PDF_RESULT)
html: $(HTML_RESULT)
all: pdf html
generate: $(GEN_SRC)
download: $(CSVS)

$(BUILD_DIR):
@echo " DIR $@"
Expand All @@ -144,23 +138,14 @@ $(BUILD_DIR):
@echo " DOC $@"
$(BUILD_COMMAND)

# Rule to generate all the src/generated/*.adoc from the downloaded CSVs using a Python script.
# Rule to generate all the src/generated/*.adoc from the CSVs using a Python script.
$(GEN_SRC) &: $(CSVS) $(GEN_SCRIPT)
@echo " GEN $@"
@$(GEN_SCRIPT) -o $(GEN_DIR) --csr $(CSV_DIR)/CHERI_CSR.csv --isa $(CSV_DIR)/CHERI_ISA.csv

# Rule to download CSVs. These files are checked in and only re-downloaded when you `make download`.
$(CSVS) &:
@echo " DOWN CSV (isa)"
@curl -Lo src/csv/CHERI_ISA.csv "$(URL_ISA)"
@echo >> src/csv/CHERI_ISA.csv
@echo " DOWN CSV (csr)"
@curl -Lo src/csv/CHERI_CSR.csv "$(URL_CSR)"
@echo >> src/csv/CHERI_CSR.csv

# Clean
clean:
@echo " CLEAN"
@$(RM) -r $(PDF_RESULT) $(HTML_RESULT) $(GEN_SRC)

.PHONY: all generate download clean
.PHONY: all generate clean

0 comments on commit 557678b

Please sign in to comment.