Refactored build to fit new image structure

.gitignore

@@ -25,3 +25,4 @@
 *.ilg
 public/
 .sass-cache/
+build/

.gitlab-ci.yml

-image: $CI_REGISTRY/sw4j-net/noweb-nasm/master:latest
 
 stages:
+  - extract
   - build
   - deploy
 
+asm:
+  image: $CI_REGISTRY/sw4j-net/noweb/master:latest
+  stage: extract
+  script:
+    - make source
+  artifacts:
+    paths:
+      - src/*.asm
+    expire_in: 1 hour
+
+tex:
+  image: $CI_REGISTRY/sw4j-net/noweb/master:latest
+  stage: extract
+  script:
+    - make tex
+  artifacts:
+    paths:
+      - tex/biosx86.*
+    expire_in: 1 hour
+
+build:
+  image: $CI_REGISTRY/sw4j-net/nasm/master:latest
+  stage: build
+  script:
+    - make -t source
+    - make bin
+  dependencies:
+    - asm
+  artifacts:
+    paths:
+      - build/*
+    expire_in: 1 hour
+
 pdf:
+  image: $CI_REGISTRY/sw4j-net/noweb/master:latest
   stage: build
   script:
-    - make
+    - make -t tex
+    - make pdf
   artifacts:
     paths:
-      - biosx86/*.asm
-      - biosx86/*.pdf
+      - build/*.pdf
     expire_in: 1 hour
 
 pages:
@@ -20,9 +54,9 @@ pages:
   script:
     - gem install jekyll-theme-tactile
     - jekyll build -s site -d public
-    - mkdir -p public/biosx86
-    - cp biosx86/*.asm public/biosx86/
-    - cp biosx86/*.pdf public/
+    - mkdir -p public/src
+    - cp src/*.asm public/src/
+    - cp build/*.pdf public/
   artifacts:
     paths:
       - public

Makefile

 
-all:
-	make -C biosx86 all
+all: prepare source tex bin pdf
 
-clean:
-	make -C biosx86 clean
+prepare:
+	mkdir -p build
+
+source:
+	$(MAKE) -C src source
+
+bin:
+	$(MAKE) prepare
+	$(MAKE) -C src bin
+	cp src/bios86 build/
+	cp src/bios286 build/
+	cp src/bios386 build/
+
+.PHONY: tex
+tex:
+	$(MAKE) -C tex tex
+
+pdf:
+	$(MAKE) prepare
+	cp *.tex tex/
+	$(MAKE) -C tex pdf
+	mv tex/biosx86.pdf build/
+
+clean: mostlyclean
+	$(MAKE) -C src clean
+	$(MAKE) -C tex clean
+
+mostlyclean:
+	$(MAKE) -C src mostlyclean
+	$(MAKE) -C tex mostlyclean
 	rm -f *~
+	rm -rf build/

biosx86/biosx86.nw → biosx86.nw

@@ -49,9 +49,9 @@
 
 \setacronymstyle{long-short}
 
-\loadglsentries{../acronym}
+\loadglsentries{acronym}
 
-\loadglsentries{../glossary}
+\loadglsentries{glossary}
 
 \begin{document}
 @

src/Makefile

+NASM = /usr/bin/nasm
+NASM_OPTS = -f bin
+
+all: source bin
+
+source: LICENSE bios86.asm bios286.asm bios386.asm
+
+bin: bios86 bios286 bios386
+
+LICENSE: ../biosx86.nw
+	notangle -Rlicense ../biosx86.nw > LICENSE
+
+bios86.asm: ../biosx86.nw
+	notangle -Rbios86.asm ../biosx86.nw > bios86.asm
+
+bios86: bios86.asm
+	$(NASM) $(NASM_OPTS) bios86.asm -l bios86.lst -o bios86
+
+bios286.asm: ../biosx86.nw
+	notangle -Rbios286.asm ../biosx86.nw > bios286.asm
+
+bios286: bios286.asm
+	$(NASM) $(NASM_OPTS) bios286.asm -l bios286.lst -o bios286
+
+bios386.asm: ../biosx86.nw
+	notangle -Rbios386.asm ../biosx86.nw > bios386.asm
+
+bios386: bios386.asm
+	$(NASM) $(NASM_OPTS) bios386.asm -l bios386.lst -o bios386
+
+mostlyclean:
+	rm -f *.lst
+	rm -f bios86
+	rm -f bios286
+	rm -f bios386
+	rm -f *~
+
+clean: mostlyclean
+	rm -f *.asm
+	rm -f LICENSE

tex/Makefile

+
+all: tex pdf
+
+tex: biosx86.defs biosx86.tex
+
+biosx86.defs: ../biosx86.nw
+	nodefs ../biosx86.nw | sort -u > biosx86.defs
+
+biosx86.tex: ../biosx86.nw
+	noweave -indexfrom biosx86.defs -delay ../biosx86.nw > biosx86.tex
+
+pdf:
+	xelatex -8bit biosx86
+	splitindex biosx86.idx
+	makeglossaries biosx86
+	xelatex -8bit biosx86
+	xelatex -8bit biosx86
+
+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