.gitignore

@@ -1,8 +1,21 @@
+*/look/fsfe.min.css
+*/look/valentine.min.css
+fsfe.org/events/????/index.??.xhtml
+fsfe.org/events/????/index.sources
+fsfe.org/events/????/index.xsl
+fsfe.org/news/????/index.??.xhtml
+fsfe.org/news/????/index.sources
+fsfe.org/news/????/index.xsl
+fsfe.org/news/*/.*.??.xml
 global/data/texts/.texts.??.xml
 global/data/topbanner/.topbanner.??.xml
 .default.xsl
 .localmenu.*.xml
 .*.xmllist
+fsfe.org/search/index.js
+fsfe.org/tags/tagged-*.??.xhtml
+fsfe.org/tags/.tags.??.xml
+global/data/modules/fsfe-activities-options.en.xml
 # Local build stuff
 output
 # Python venv
@@ -11,6 +24,9 @@ __pycache__
 #Nltk
 .nltk_data
 
+## Status dir stuff
+status.fsfe.org/*/data*/*
+
 # Secrets
 # docker compose
 .env

build/phase1/create_activities_file.py

@@ -15,10 +15,7 @@ from build.lib.misc import update_if_changed
 logger = logging.getLogger(__name__)
 
 
-def run(languages: list[str], processes: int, working_dir: Path) -> None:
-    """
-    Internal subdir preparation
-    """
+def create_activities_file() -> None:
     logger.info("Creating activities file")
     raw_url = urlparse(
         "https://git.fsfe.org/FSFE/activities/raw/branch/master/activities.csv"
@@ -58,6 +55,6 @@ def run(languages: list[str], processes: int, working_dir: Path) -> None:
         option.text = f"{tag} ({description})"
 
     update_if_changed(
-        working_dir.joinpath("fsfe-activities-options.en.xml"),
+        Path("global/data/modules/fsfe-activities-options.en.xml"),
         etree.tostring(page, encoding="utf-8").decode("utf-8"),
     )

build/phase1/run.py

@@ -13,6 +13,7 @@
 import logging
 import multiprocessing
 
+from .create_activities_file import create_activities_file
 from .global_symlinks import global_symlinks
 from .index_website import index_websites
 from .prepare_subdirectories import prepare_subdirectories
@@ -32,6 +33,11 @@ def phase1_run(languages: list[str], processes: int, pool: multiprocessing.Pool)
     """
     logger.info("Starting Phase 1 - Setup")
 
+    # -----------------------------------------------------------------------------
+    # Create XML activities file
+    # -----------------------------------------------------------------------------
+    create_activities_file()
+
     # -----------------------------------------------------------------------------
     # Build search index
     # -----------------------------------------------------------------------------

fsfe.org/.gitignore

@@ -1,18 +0,0 @@
-# css
-look/fsfe.min.css
-look/valentine.min.css
-# automatically generate subdirectory stuff
-events/????/index.??.xhtml
-events/????/index.sources
-events/????/index.xsl
-news/????/index.??.xhtml
-news/????/index.sources
-news/????/index.xsl
-news/*/.*.??.xml
-# search index
-search/index.js
-#tags
-tags/tagged-*.??.xhtml
-tags/.tags.??.xml
-# internal activities file
-internal/fsfe-activities-options.*.xml

fsfe.org/internal/pd.sources

@@ -1 +0,0 @@
-fsfe.org/internal/fsfe-:[]

fsfe.org/internal/rc.sources

@@ -1 +0,0 @@
-fsfe.org/internal/fsfe-:[]

status.fsfe.org/.gitignore

@@ -1,2 +0,0 @@
-## Status dir stuff
-*/data*/*