Default activities update

Basic_System.org

@@ -2,13 +2,14 @@
 # #+OPTIONS: toc:nil
 #+OPTIONS: html-preamble:t
 #+OPTIONS: html-postamble:nil title:nil
+#+PROPERTY: header-args :eval never
 #+LANGUAGE: fr
 #+EXPORT_EXCLUDE_TAGS: noexport
 #+TITLE: Activité VPL de programmation système
 #+AUTHOR: Guillaume Huard
 #+DATE: 27 mars 2020
 
-#+BEGIN_SRC emacs-lisp :results output :session :exports results
+#+BEGIN_SRC emacs-lisp :results output :session :exports results :eval yes
 (setq org-html-preamble-format
       '(("fr"
          "<h1 class=\"title\">%t</h1>

C_Programming.org

@@ -2,6 +2,7 @@
 # #+OPTIONS: toc:nil
 #+OPTIONS: html-preamble:t
 #+OPTIONS: html-postamble:nil title:nil
+#+PROPERTY: header-args :eval never
 #+LANGUAGE: fr
 #+EXPORT_EXCLUDE_TAGS: noexport
 #+TITLE: Activité VPL de programmation C
@@ -34,7 +35,7 @@ En plus de variables habituelles, le fichier =vpl_custom_setup.sh= peut maintena
 variables d'environnement =CC=, =CFLAGS= et =LDLIBS= classiques qui seront utilisées dans toutes les
 compilations gérées par l'activité.
 
-#+BEGIN_SRC emacs-lisp :results output :session :exports results
+#+BEGIN_SRC emacs-lisp :results output :session :exports results :eval yes
 (setq org-html-preamble-format
       '(("fr"
          "<h1 class=\"title\">%t</h1>

Default_Basic_System.org

+#+OPTIONS: num:nil
+#+OPTIONS: toc:nil
+#+OPTIONS: html-postamble:nil
+#+OPTIONS: html-preamble:nil
+#+PROPERTY: header-args :eval never :mkdirp yes :exports none
+# Doesn't work with include (can't override default)
+#+LANGUAGE: fr
+#+EXPORT_EXCLUDE_TAGS: noexport
+
+Fichier servant uniquement à mettre à jour l'activité par défaut associée à cette activité.
+
+#+BEGIN_SRC txt :tangle Default_Basic_System/vpl_id.txt
+23947
+#+END_SRC
+
+#+BEGIN_SRC shell :eval yes
+  #!/bin/bash
+  make Basic_System/vpl_id.txt
+  rm -r Default_Basic_System
+  mkdir -p Default_Basic_System
+  cp -r Basic_System/* Default_Basic_System
+  rm Default_Basic_System/push
+#+END_SRC

Default_C_Programming.org

+#+OPTIONS: num:nil
+#+OPTIONS: toc:nil
+#+OPTIONS: html-postamble:nil
+#+OPTIONS: html-preamble:nil
+#+PROPERTY: header-args :eval never :mkdirp yes :exports none
+# Doesn't work with include (can't override default)
+#+LANGUAGE: fr
+#+EXPORT_EXCLUDE_TAGS: noexport
+
+Fichier servant uniquement à mettre à jour l'activité par défaut associée à cette activité.
+
+#+BEGIN_SRC txt :tangle Default_C_Programming/vpl_id.txt
+23948
+#+END_SRC
+
+#+BEGIN_SRC shell :eval yes
+  #!/bin/bash
+  make C_Programming/vpl_id.txt
+  rm -r Default_C_Programming
+  mkdir -p Default_C_Programming
+  cp -r C_Programming/* Default_C_Programming
+  rm Default_C_Programming/push
+#+END_SRC

Makefile

 ACTIVITIES=$(patsubst %.org, %, $(wildcard *.org))
-VPL_IDS=$(addsuffix /vpl_id.txt, $(ACTIVITIES))
+ALL_VPL_IDS=$(addsuffix /vpl_id.txt, $(ACTIVITIES))
+VPL_IDS=$(filter-out Default_%, $(ALL_VPL_IDS))
+DEFAULT_VPL_IDS=$(filter Default_%, $(ALL_VPL_IDS))
 PUSHES=$(addsuffix /push, $(ACTIVITIES))
 DEBUGS=$(addsuffix /debug, $(ACTIVITIES))
 
-.PHONY: files pushes $(DEBUGS)
+EMACS=emacs --batch --eval "(progn \
+	(setq enable-local-eval t) \
+	(setq enable-local-variables t) \
+	(require 'org) \
+	(setq org-export-babel-evaluate t) \
+	(setq org-confirm-babel-evaluate nil) \
+	(setq org-latex-listings 'listings) \
+    (org-babel-do-load-languages 'org-babel-load-languages '(\
+        (shell . t)\
+    )) \
+	(setq org-src-preserve-indentation t)\
+)"
+
+.PHONY: all debug default files pushes $(DEBUGS)
+
+all: files
 
 %/vpl_id.txt: %.org
-	emacs --eval "(require 'org)" $< --batch --funcall org-babel-tangle
+	$(EMACS) $< --batch --funcall org-babel-execute-buffer
+	$(EMACS) $< --batch --funcall org-babel-tangle
 
 .SECONDEXPANSION:
 %/push: %/vpl_id.txt $$(wildcard %/*/*)
@@ -17,6 +35,12 @@ DEBUGS=$(addsuffix /debug, $(ACTIVITIES))
 $(DEBUGS): %/debug: $$(wildcard %/*/*)
 	echo $^
 
+debug:
+	@echo "VPL_IDS: $(VPL_IDS)"
+	@echo "DEFAULT_VPL_IDS: $(DEFAULT_VPL_IDS)"
+
 files: $(VPL_IDS)
 
 push: $(PUSHES)
+
+default: $(DEFAULT_VPL_IDS)