Refactored build process to fir new images

.gitignore

 dummypayload
 floppy
 image
+bootloader/bin
+bootloader/src/bootloader
 bootloader.tex
 tutorial.tex
 *~
@@ -20,4 +22,8 @@ tutorial.tex
 *.log
 *.lst
 *.out
+*.pdf
 *.toc
+tex/*.tex
+.sass-cache/
+public/

.gitlab-ci.yml

-image: $CI_REGISTRY/sw4j-net/noweb-nasm/master:latest
 
 stages:
+  - extract
   - build
   - deploy
 
+src:
+  image: $CI_REGISTRY/sw4j-net/noweb/master:latest
+  stage: extract
+  script:
+    - make -C bootloader src
+  artifacts:
+    paths:
+      - bootloader/src/*.asm
+      - bootloader/src/*.sh
+    expire_in: 1 hour
+
+tex:
+  image: $CI_REGISTRY/sw4j-net/noweb/master:latest
+  stage: extract
+  script:
+    - make tex
+    - make -C bootloader tex
+  artifacts:
+    paths:
+      - tex/tutorial.*
+      - bootloader/tex/bootloader.*
+    expire_in: 1 hour
+
+build:
+  image: $CI_REGISTRY/sw4j-net/nasm/master:latest
+  stage: build
+  script:
+    - make -t -C bootloader src
+    - make -C bootloader bin
+  dependencies:
+    - src
+  artifacts:
+    paths:
+      - bootloader/bin/*
+    expire_in: 1 hour
+
 pdf:
+  image: $CI_REGISTRY/sw4j-net/noweb/master:latest
   stage: build
   script:
-    - make
-    - cd bootloader
-    - make
+    - make -t tex
+    - make pdf
+    - make -t -C bootloader tex
+    - make -C bootloader pdf
   artifacts:
     paths:
-      - tutorial.pdf
-      - bootloader/bootloader
-      - bootloader/bootloader.pdf
-      - bootloader/makebootfloppy.sh
+      - bin/tutorial.pdf
+      - bootloader/bin/bootloader.pdf
     expire_in: 1 hour
 
 pages:
@@ -25,10 +61,10 @@ pages:
     - gem install jekyll-theme-tactile
     - jekyll build -s site -d public
     - mkdir -p public/bootloader
-    - cp bootloader/bootloader public/bootloader/
-    - cp bootloader/bootloader.pdf public/bootloader/
-    - cp bootloader/makebootfloppy.sh public/bootloader/
-    - cp tutorial.pdf public/
+    - cp bootloader/bin/bootloader public/bootloader/
+    - cp bootloader/bin/bootloader.pdf public/bootloader/
+    - cp bootloader/bin/makebootfloppy.sh public/bootloader/
+    - cp bin/tutorial.pdf public/
   artifacts:
     paths:
       - public

Makefile

 NASM = /usr/bin/nasm
 NASM_OPTS = -f bin
 
-all: pdf
+all: tex pdf
 
-pdf: tutorial.nw
-	nodefs tutorial.nw | sort -u > tutorial.defs
-	noweave -indexfrom tutorial.defs -delay tutorial.nw > tutorial.tex
-	xelatex -8bit tutorial
-	#makeindex -o tutorial.ind tutorial.idx
-	#makeindex -o ins.ind ins.idx
-	splitindex tutorial.idx
-	makeglossaries tutorial
-	xelatex -8bit tutorial
-	xelatex -8bit tutorial
+.PHONY: tex
+tex: tutorial.nw
+	$(MAKE) -C tex tex
 
-clean:
-	rm -f tutorial.tex
+pdf: tex
+	cp ./*.tex tex/
+	$(MAKE) -C tex pdf
+	mkdir -p bin
+	cp tex/tutorial.pdf bin/
+
+mostlyclean:
+	make -C tex mostlyclean
 	rm -f *~
-	rm -f *.acn
-	rm -f *.acr
-	rm -f *.alg
-	rm -f *.asm
-	rm -f *.aux
-	rm -f *.defs
-	rm -f *.glg
-	rm -f *.glo
-	rm -f *.gls
-	rm -f *.glsdefs
-	rm -f *.idx
-	rm -f *.ilg
-	rm -f *.ind
-	rm -f *.ins-glo-glg
-	rm -f *.ins-glo-glo
-	rm -f *.ins-glo-gls
-	rm -f *.ist
-	rm -f *.log
-	rm -f *.out
-	rm -f *.pdf
-	rm -f *.toc
-	rm -f *.lst
+	rm -rf bin/
+
+clean: mostlyclean
+	make -C tex clean

bootloader/Makefile

-NASM = /usr/bin/nasm
-NASM_OPTS = -f bin
 
-all: floppy pdf
+all: tex src pdf bin
 
-floppy: bootloader dummypayload
-	cat bootloader dummypayload > floppy
-	./makebootfloppy.sh floppy
+.PHONY: src
+src: bootloader.nw
+	$(MAKE) -C src src
 
-bootloader.asm: bootloader.nw
-	notangle -Rbootloader.asm bootloader.nw > bootloader.asm
+.PHONY: bin
+bin: floppy
+	$(MAKE) -C src bin
+	mkdir -p bin
+	cp src/bootloader bin/
+	cp src/makebootfloppy.sh bin/
 
-bootloader: bootloader.asm
-	$(NASM) $(NASM_OPTS) bootloader.asm -l bootloader.lst -o bootloader
+floppy:
+	$(MAKE) -C src floppy
 
-dummypayload.asm: bootloader.nw
-	notangle -Rdummypayload.asm bootloader.nw > dummypayload.asm
-
-dummypayload: dummypayload.asm
-	$(NASM) $(NASM_OPTS) dummypayload.asm -l dummypayload.lst -o dummypayload
+.PHONY: tex
+tex: bootloader.nw
+	$(MAKE) -C tex tex
 
 pdf: bootloader.nw
-	nodefs bootloader.nw | sort -u > bootloader.defs
-	noweave -indexfrom bootloader.defs -delay bootloader.nw > bootloader.tex
-	xelatex -8bit bootloader
-	makeindex bootloader.idx
-	makeglossaries bootloader
-	xelatex -8bit bootloader
-	xelatex -8bit bootloader
-
-clean:
-	rm -f dummypayload floppy bootloader
+	$(MAKE) -C tex pdf
+	mkdir -p bin
+	cp tex/bootloader.pdf bin/
+
+mostlyclean:
+	$(MAKE) -C tex mostlyclean
+	$(MAKE) -C src mostlyclean
 	rm -f *~
-	rm -f *.acn
-	rm -f *.acr
-	rm -f *.alg
-	rm -f *.asm
-	rm -f *.aux
-	rm -f *.defs
-	rm -f *.glg
-	rm -f *.glo
-	rm -f *.gls
-	rm -f *.glsdefs
-	rm -f *.idx
-	rm -f *.ilg
-	rm -f *.ind
-	rm -f *.ins-glg
-	rm -f *.ins-glo
-	rm -f *.ins-gls
-	rm -f *.ist
-	rm -f *.log
-	rm -f *.out
-	rm -f *.pdf
-	rm -f *.tex
-	rm -f *.toc
-	rm -f *.lst
+	rm -rf bin/
+
+clean: mostlyclean
+	$(MAKE) -C tex clean
+	$(MAKE) -C src clean

bootloader/src/Makefile

+NASM = /usr/bin/nasm
+NASM_OPTS = -f bin
+
+all: src bin
+
+src: bootloader.asm dummypayload.asm
+
+bin: bootloader dummypayload floppy
+
+bootloader.asm: ../bootloader.nw
+	notangle -Rbootloader.asm ../bootloader.nw > bootloader.asm
+
+bootloader: bootloader.asm
+	$(NASM) $(NASM_OPTS) bootloader.asm -l bootloader.lst -o bootloader
+
+dummypayload.asm: ../bootloader.nw
+	notangle -Rdummypayload.asm ../bootloader.nw > dummypayload.asm
+
+dummypayload: dummypayload.asm
+	$(NASM) $(NASM_OPTS) dummypayload.asm -l dummypayload.lst -o dummypayload
+
+floppy: bootloader dummypayload
+	cat bootloader dummypayload > floppy
+	./makebootfloppy.sh floppy
+
+mostlyclean:
+	rm -f dummypayload floppy bootloader
+	rm -f *.lst
+
+clean: mostlyclean
+	rm -f *.asm

bootloader/tex/Makefile

+
+all: tex pdf
+
+tex: bootloader.defs bootloader.tex
+
+bootloader.defs: ../bootloader.nw
+	nodefs ../bootloader.nw | sort -u > bootloader.defs
+
+bootloader.tex: ../bootloader.nw bootloader.defs
+	noweave -indexfrom bootloader.defs -delay ../bootloader.nw > bootloader.tex
+
+pdf: bootloader.tex
+	xelatex -8bit bootloader
+	splitindex bootloader.idx
+	makeglossaries bootloader
+	xelatex -8bit bootloader
+	xelatex -8bit bootloader
+
+clean: mostlyclean
+
+mostlyclean:
+	rm -f *~
+	rm -f *.acn
+	rm -f *.acr
+	rm -f *.alg
+	rm -f *.aux
+	rm -f *.defs
+	rm -f *.glg
+	rm -f *.glo
+	rm -f *.gls
+	rm -f *.glsdefs
+	rm -f *.idx
+	rm -f *.ilg
+	rm -f *.ind
+	rm -f *.ins-glg
+	rm -f *.ins-glo
+	rm -f *.ins-gls
+	rm -f *.ist
+	rm -f *.log
+	rm -f *.out
+	rm -f *.pdf
+	rm -f *.tex
+	rm -f *.toc
+	rm -f *.lst

tex/Makefile

+
+all: tex pdf
+
+tex: tutorial.defs tutorial.tex
+
+tutorial.defs: ../tutorial.nw
+	nodefs ../tutorial.nw | sort -u > tutorial.defs
+
+tutorial.tex: ../tutorial.nw
+	noweave -indexfrom tutorial.defs -delay ../tutorial.nw > tutorial.tex
+
+pdf:
+	xelatex -8bit tutorial
+	splitindex tutorial.idx
+	makeglossaries tutorial
+	xelatex -8bit tutorial
+	xelatex -8bit tutorial
+
+clean: mostlyclean
+
+mostlyclean:
+	rm -f *~
+	rm -f *.acn
+	rm -f *.acr
+	rm -f *.alg
+	rm -f *.aux
+	rm -f *.defs
+	rm -f *.glg
+	rm -f *.glo
+	rm -f *.gls
+	rm -f *.glsdefs
+	rm -f *.idx
+	rm -f *.ilg
+	rm -f *.ind
+	rm -f *.ins-glg
+	rm -f *.ins-glo
+	rm -f *.ins-gls
+	rm -f *.ist
+	rm -f *.log
+	rm -f *.out
+	rm -f *.tex
+	rm -f *.toc
+	rm -f *.lst