Changeset 04821de

Timestamp:

Apr 1, 2022, 3:14:02 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

f8fc560

Parents:

63db8fd7 (diff), 12048a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

doc/theses/mike_brooks_MMath/content/string

Files:

• Makefile (modified) (2 diffs)
• sharing-demo.cfa (added)
• sharing-demo.cfa.liquid (deleted)
• sharing-demo.json (deleted)
• sharing-demo.tex.liquid (deleted)

doc/theses/mike_brooks_MMath/content/string/Makefile

@@ -9 +9 @@
 Build = ${BuildBase}/string
 
-# (plg2 has gem)
-# gem install --user-install liquid 
-# gem install --user-install liquid-cli
-Liquid = ~/.gem/ruby/2.7.0/bin/liquid
-
 CFA = ../../../../../../build/driver/cfa
 
-DEMOS = ${addsuffix -demo, \
+DEMOS = ${addprefix $(Build)/, ${addsuffix -demo.tex, \
         sharing \
-}
+}}
 
 EZDEMOS = ${addsuffix -ezdemo, \
@@ -27 +22 @@
 all: $(DEMOS) $(EZDEMOS)
 
-# removing the echo rule body means the rule doesn't fire
-%-demo: $(Build)/%-demo.tex %-demo-runok | $(Build) 
-        @echo target $@ made
-
 %-ezdemo: %-ezdemo-runok | $(Build) 
         @echo target $@ made
-
-%-demo-runok: $(Build)/%-demo | $(Build)
-        $<
 
 %-ezdemo-runok: $(Build)/%-ezdemo | $(Build)
         $<
 
-$(Build)/%-demo.tex: %-demo.json %-demo.tex.liquid | $(Build)
-        $(Liquid) "$$(< $<)" < $(word 2,$^) > $@ 
-#       echo will run $(Liquid)
-#       echo will get JSON from $<
-#       echo will get template from $(word 2,$^)
+$(Build)/%-demo.tex: $(Build)/%-demo | $(Build)
+        $< > $@
 
-$(Build)/%-demo: $(Build)/%-demo.cfa
+$(Build)/%-demo: %-demo.cfa
         $(CFA) $< -o $@
-
-$(Build)/%-demo.cfa: %-demo.json %-demo.cfa.liquid | $(Build)
-        $(Liquid) "$$(< $<)" < $(word 2,$^) > $@ 
 
 $(Build)/%-ezdemo: %-demo.cfa