From 18647572b41c31bee2fb830949c1224b30ac369c Mon Sep 17 00:00:00 2001 From: Darragh Elliott Date: Thu, 26 Sep 2024 14:31:47 +0100 Subject: [PATCH] feat: support building the website inside the repo --- .gitignore | 3 +++ Makefile | 2 +- build/makerules.sh | 5 +---- output/README.md | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 output/README.md diff --git a/.gitignore b/.gitignore index 0355b3d342..5d464772e3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ global/data/topbanner/.topbanner.??.xml fsfe.org/search/index.js fsfe.org/tags/tagged-*.en.xhtml fsfe.org/tags/.tags.??.xml +# Local build stuff +output/* +!output/README.md ## Status dir stuff status.fsfe.org/*/data*/* diff --git a/Makefile b/Makefile index 07c6fdc025..7f23a0fcab 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ stylesheets: $(SUBDIRS) # Dive into subdirectories # ----------------------------------------------------------------------------- -SUBDIRS := $(shell find */* -name "Makefile" | xargs dirname) +SUBDIRS := $(shell find . -regex "./[a-z\.]+\.[a-z]+/.*/Makefile" | xargs dirname) all: $(SUBDIRS) $(SUBDIRS): .FORCE diff --git a/build/makerules.sh b/build/makerules.sh index 4c8817fe6f..d949153bbb 100755 --- a/build/makerules.sh +++ b/build/makerules.sh @@ -190,10 +190,7 @@ EOF # All files which should just be copied over COPY_SRC_FILES := \$(shell find -L "\$(INPUTDIR)" -type f \ - -not -path '\$(INPUTDIR)/.git/*' \ - -not -path '\$(INPUTDIR)/build/*' \ - -not -path '\$(INPUTDIR)/global/*' \ - -not -path '\$(INPUTDIR)/tools/*' \ + -regex "\$(INPUTDIR)/[a-z\.]+\.[a-z]+/.*" \ -not -name '.drone.yml' \ -not -name '.gitignore' \ -not -name 'README*' \ diff --git a/output/README.md b/output/README.md new file mode 100644 index 0000000000..e9346f5fac --- /dev/null +++ b/output/README.md @@ -0,0 +1,3 @@ +# Output + +This folder contains the output of the build script when called with default args.