generated pdf + work on Makefile

Flooze-IT · Mar 30, 2023 · 1fb6dfe · 1fb6dfe
1 parent dba5deb
commit 1fb6dfe
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,10 @@
 
-all: slidesPharo slidesMoose
+%.html :
+	cd `basename $@ ".html"` ; make all
 
-slidesPharo:
-	cd SlidesPharo ; make
+%.pdf :
+	cd `basename $@ ".pdf"` ; make pdf
 
-slidesMoose:
-	cd SlidesMoose ; make
+all: SlidesPharo.html SlidesMoose.html
+
+pdf: SlidesPharo.pdf SlidesMoose.pdf
diff --git a/SlidesMoose/Makefile b/SlidesMoose/Makefile
@@ -3,10 +3,10 @@
 	npx marp $<
 
 %.pdf : %.md
-	npx marp --pdf $<
+	npx marp --pdf --allow-local-files $<
 
 all: moose.html famix.html mooseIDE.html
 
 pdf: moose.pdf famix.pdf mooseIDE.pdf
 
-mooseIDE.html: Images/mooseMenu.png Images/mooseArchi.png
+mooseIDE.html: Images/mooseMenu.png Images/mooseArchi.png
diff --git a/SlidesMoose/famix.pdf b/SlidesMoose/famix.pdf
diff --git a/SlidesMoose/moose.pdf b/SlidesMoose/moose.pdf
diff --git a/SlidesMoose/mooseIDE.pdf b/SlidesMoose/mooseIDE.pdf
diff --git a/SlidesPharo/Makefile b/SlidesPharo/Makefile
@@ -3,12 +3,36 @@
 	npx marp $<
 
 %.pdf : %.md
-	npx marp --pdf $<
+	npx marp --pdf --allow-local-files $<
+
+#dependencies to images
+
+intro = 
+
+exec = Images/moosePlayground.png Images/transcript.png
+
+langage = Images/pharoSyntax.png
+
+ide = Images/systemBrowser.png Images/testRunner.png Images/spotter.png Images/finder.png Images/epicea.png Images/profiler.png
+
+# rules
 
 all: introPharo.html langagePharo.html execPharo.html idePharo.html
 
 pdf: introPharo.pdf langagePharo.pdf execPharo.pdf idePharo.pdf
 
-introPharo.html: Images/pharoSyntax.png
+introPharo.html: $(intro)
+
+introPharo.pdf: $(intro)
+
+execPharo.html: $(exec)
+
+execPharo.pdf: $(exec)
+
+langagePharo.html: $(exec)
+
+langagePharo.pdf: $(exec)
+
+idePharo.html: $(ide)
 
-execPharo.html: Images/moosePlayground.png Images/transcript.png
+idePharo.pdf: $(ide)
diff --git a/SlidesPharo/execPharo.pdf b/SlidesPharo/execPharo.pdf
diff --git a/SlidesPharo/idePharo.pdf b/SlidesPharo/idePharo.pdf
diff --git a/SlidesPharo/introPharo.pdf b/SlidesPharo/introPharo.pdf
diff --git a/SlidesPharo/langagePharo.html b/SlidesPharo/langagePharo.html
@@ -196,7 +196,7 @@ <h1>Méthodes remarquables</h1>
 </foreignObject></svg><svg data-marpit-svg="" viewBox="0 0 1280 720"><foreignObject width="1280" height="720"><section id="15" data-paginate="true" data-footer="Pharo -- Le langage" data-heading-divider="1" data-marpit-pagination="15" data-marpit-pagination-total="17" style="--paginate:true;--footer:Pharo -- Le langage;--heading-divider:1;">
 <h1>Les classes sont des objets</h1>
 <ul>
-<li>Méthodes &quot;coté classe&quot; (méthodes statique)</li>
+<li>Méthodes &quot;coté classe&quot; (méthodes statique) ex: <code>new</code></li>
 <li>Variables de classe</li>
 <li>API reflexive (<code>Object methods</code> donne une colelction de <code>CompiledMethod</code>)</li>
 </ul>

diff --git a/SlidesPharo/langagePharo.pdf b/SlidesPharo/langagePharo.pdf