From 7a140c553aa78603240ca7668f6f10fcc9b6b8c2 Mon Sep 17 00:00:00 2001 From: Kreyren Date: Fri, 7 Feb 2020 19:23:09 +0000 Subject: [PATCH] vcmvmvb --- Makefile | 21 +++++++------------ src/bin/main.py | 2 ++ src/bin/main.v | 2 ++ .../{hello_world_test.go => hellocheck.go} | 0 tests/vlang/hello_test.v | 5 ----- tests/vlang/hellocheck_test.v | 9 ++++++++ 6 files changed, 21 insertions(+), 18 deletions(-) rename tests/golang/{hello_world_test.go => hellocheck.go} (100%) delete mode 100644 tests/vlang/hello_test.v create mode 100644 tests/vlang/hellocheck_test.v diff --git a/Makefile b/Makefile index b24e7c2..041ca4e 100644 --- a/Makefile +++ b/Makefile @@ -16,12 +16,9 @@ all: vendor: @ [ ! -d vendor ] && mkdir vendor @ [ ! -d vendor/rustlang ] && mkdir vendor/rustlang - @ git clone https://github.com/clap-rs/clap.git vendor/rustlang/clap-rs - @ for file in vendor/rustlang/clap-rs/benches/*; do cp "$$file" benches/rustlang/claprs-$${file##vendor/rustlang/clap-rs/benches/} || exit 1; done - -build: - @ printf 'FIXME: %s\n' "Build all targets if executed" - @ exit 1 + @ [ ! -d vendor/rustlang/clap-rs ] && git clone https://github.com/clap-rs/clap.git vendor/rustlang/clap-rs + @ for file in vendor/rustlang/clap-rs/benches/*; do cp "$$file" benches/rustlang/claprs-$${file##vendor/rustlang/clap-rs/benches/??_}; done +build: build-rustlang build-clang-c build-gcc-c build-gcc-ccp build-clang-c build-clang-ccp build-brainfuck build-python build-vlang build-golang # FIXME: Build in '$repodir/build/build-rustlang' instead of '$repodir/target' for multilang support build-rustlang: @@ -123,20 +120,18 @@ check-vlang: ## BENCHES ## # FIXME: Run all benches if this is executed -bench: - @ exit 1 +bench: bench-rustlang # FIXME: Run vendor and -bench-rustlang: - @ exit 1 +bench-rustlang: vendor @ cargo bench ## CLEAN ## -clean: - @ [ -d build ] && rm -r build +clean: clean-vendor + @ [ -d build ] && rm -rf build @ printf '%s\n' "Build directory has been cleaned" clean-vendor: @ # FIXME: Output helpful message if directory doesn't exists - @ [ -d vendor ] && rm -r vendor \ No newline at end of file + @ [ -d vendor ] && rm -rf vendor \ No newline at end of file diff --git a/src/bin/main.py b/src/bin/main.py index 8e62190..e4da750 100644 --- a/src/bin/main.py +++ b/src/bin/main.py @@ -8,6 +8,8 @@ from termcolor import cprint Requires pip for termcolor """ +# FIXME: Add logic to generate help message and handle arguments automatically + def cli_arg(): if len(sys.argv) == 1: cprint("No Arguments Were Passed. Type -h to view basic usage.", "red") diff --git a/src/bin/main.v b/src/bin/main.v index 78287b2..953d511 100644 --- a/src/bin/main.v +++ b/src/bin/main.v @@ -1,3 +1,5 @@ +// DEVELOPMENT_HALTED: Vlang's tests does not support our file hierarchy (https://github.com/vlang/v/issues/3674) + fn hello() { printf("%s\n", "Hello World") } diff --git a/tests/golang/hello_world_test.go b/tests/golang/hellocheck.go similarity index 100% rename from tests/golang/hello_world_test.go rename to tests/golang/hellocheck.go diff --git a/tests/vlang/hello_test.v b/tests/vlang/hello_test.v deleted file mode 100644 index c4638f5..0000000 --- a/tests/vlang/hello_test.v +++ /dev/null @@ -1,5 +0,0 @@ -fn hellocheck() { - if hello != "Hello World" { - exit 1 - } -} \ No newline at end of file diff --git a/tests/vlang/hellocheck_test.v b/tests/vlang/hellocheck_test.v new file mode 100644 index 0000000..bf31b8f --- /dev/null +++ b/tests/vlang/hellocheck_test.v @@ -0,0 +1,9 @@ +// Blocked by https://github.com/vlang/v/issues/3674 + +module main + +fn hellocheck() { + if hello != "Hello World" { + exit 1 + } +} \ No newline at end of file