Merge pull request #79 from ssoelvsten/fork/dev/compiler-cleanup

compiler/ cleanup

Author: ssoelvsten

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/run_tests.yml

@@ -108,8 +108,8 @@ jobs:
           echo "Runtime built successfully, troupe.mjs found"
       - name: compile lib
         run: make lib
-      - name: compile service
-        run: make service      
+      - name: compile trp-rt
+        run: make trp-rt
       - name: run basic test
         run: ./local.sh tests/rt/pos/core/fib10.trp
       - name: run ci network test

.gitignore

@@ -1,35 +1,61 @@
-dist
-dist-*
-cabal-dev
-*.o
-*.hi
-*.chi
-*.chs.h
-*.DS_Store
-*.dyn_o
-*.dyn_hi
-.hpc
-.hsenv
+TAGS
+
+##################################################
+# NPM
+node_modules
+
+##################################################
+# Haskell
+
+## Cabal Sandbox
 .cabal-sandbox/
 cabal.sandbox.config
+cabal.project.local
+
+## Program Coverage
+.hpc
 *.prof
 *.aux
 *.hp
 *.eventlog
-.stack-work/
-cabal.project.local
-.HTF/
-TAGS
-*.vscode 
-/out
+
+## Test Framework
+.HTF
+
+## Virtual Environment
+.hsenv
+
+## Build files
 *.o
 *.hi
+*.chi
+*.chs.h
+*.dyn_o
+*.dyn_hi
+
+##################################################
+# Binaries from `compiler`
 bin/*
-node_modules
-yarn.lock
-yarn-error.log 
+
+##################################################
+# Troupe Compiler (`troupec`) output
+out/*
+
+##################################################
+# Editors
+
+## Visual Studio Code
+*.vscode
+
+## Vi
 *.swp
-bin/troupe
-bin/understudy
-trp-rt/out/
+
+## Emacs
 *.#*
+*~
+
+##################################################
+# Operating Systems
+
+## MacOS
+*.DS_Store

Makefile

@@ -1,7 +1,7 @@
-.PHONY: rt compiler lib p2p-tools
+.PHONY: rt trp-rt compiler lib p2p-tools
 
 # TODO: Rename to 'build/*' ?
-all: npm rt compiler p2p-tools lib service
+all: npm compiler rt trp-rt p2p-tools lib
 
 npm:
 	npm install
@@ -20,16 +20,16 @@ p2p-tools:
 lib:
 	cd lib; $(MAKE) build
 
-service:
-	mkdir -p ./trp-rt/out
-	$(COMPILER) ./trp-rt/service.trp -l
+trp-rt:
+	cd trp-rt/; $(MAKE) build
 
-# TODO: Rename to 'clean/*' ?
-clean: clean/compiler clean/rt clean/lib
+clean: clean/compiler clean/rt clean/trp-rt clean/p2p-tools clean/lib
 clean/compiler:
 	cd compiler; $(MAKE) clean
 clean/rt:
 	cd rt; $(MAKE) clean
+clean/trp-rt:
+	cd trp-rt; $(MAKE) clean
 clean/p2p-tools:
 	cd p2p-tools; $(MAKE) clean
 clean/lib:

compiler/.gitignore

@@ -1,6 +1,15 @@
+##################################################
+# Stack artifacts
 .stack-work/
+stack.yaml.lock
+
+##################################################
+# Cabal artifacts
 Troupe-compiler.cabal
+dist
+dist-*
+cabal-dev
+
+##################################################
+# Local compilation output
 ir2raw-out
-stack.yaml.lock
-*~
-out

compiler/ChangeLog.md

@@ -1,24 +1,35 @@
 .PHONY: test
 
-all:
-	stack -v build $(STACK_OPTS)
+all: build install
+
+build: VERBOSITY_FLAG =
+build:
+	stack $(VERBOSITY_FLAG) build $(STACK_OPTS)
+build/verbose:
+	$(MAKE) $(MAKE_FLAGS) build VERBOSITY_FLAG="-v"
+
+install: VERBOSITY_FLAG =
+install:
+	$(MAKE) $(MAKE_FLAGS) build
 	mkdir  -p ./../bin
-	stack -v install $(STACK_OPTS) --local-bin-path ./../bin/
+	stack $(VERBOSITY_FLAG) install $(STACK_OPTS) --local-bin-path ./../bin/
+install/verbose:
+	$(MAKE) $(MAKE_FLAGS) install VERBOSITY_FLAG="-v"
 
 clean:
 	rm *.cabal
 	stack clean --full
 	rm -rf ../bin
 # If problems still persist after this, remove all GHC compilers in ~/.stack/programs/**/
 
-ghci-irtester:
-	stack ghci --main-is Troupe-compiler:exe:irtester --no-load
-
-ghci-troupec:
-	stack ghci --main-is Troupe-compiler:exe:troupec --no-load
-
 test:
 	stack test $(STACK_OPTS)
 
 parser-info:
 	stack exec happy -- -i src/Parser.y
+
+ghci/irtester:
+	stack ghci --main-is Troupe-compiler:exe:irtester --no-load
+
+ghci/troupec:
+	stack ghci --main-is Troupe-compiler:exe:troupec --no-load