diff --git a/Makefile b/Makefile index 75c6d60b..c2080b49 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ endif ## Display this help screen help: - @printf "\e[36m%-35s %s\e[0m\n" "Command" "Usage" + @printf "\033[36m%-35s %s\033[0m\n" "Command" "Usage" @sed -n -e '/^## /{'\ -e 's/## //g;'\ -e 'h;'\ @@ -51,39 +51,39 @@ help: ## Build in release-safe mode build: - @printf "\e[36mBuilding (release safe)...\e[0m\n" - $(ZIG) build -Doptimize=ReleaseSafe -Dgit_commit=$$(git rev-parse --short HEAD) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) - @printf "\e[33mBuild OK\e[0m\n" + @printf "\033[36mBuilding (release safe)...\033[0m\n" + $(ZIG) build -Doptimize=ReleaseSafe -Dgit_commit=$$(git rev-parse --short HEAD) || (printf "\033[33mBuild ERROR\033[0m\n"; exit 1;) + @printf "\033[33mBuild OK\033[0m\n" ## Build in debug mode build-dev: - @printf "\e[36mBuilding (debug)...\e[0m\n" - @$(ZIG) build -Dgit_commit=$$(git rev-parse --short HEAD) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) - @printf "\e[33mBuild OK\e[0m\n" + @printf "\033[36mBuilding (debug)...\033[0m\n" + @$(ZIG) build -Dgit_commit=$$(git rev-parse --short HEAD) || (printf "\033[33mBuild ERROR\033[0m\n"; exit 1;) + @printf "\033[33mBuild OK\033[0m\n" ## Run the server in release mode run: build - @printf "\e[36mRunning...\e[0m\n" - @./zig-out/bin/lightpanda || (printf "\e[33mRun ERROR\e[0m\n"; exit 1;) + @printf "\033[36mRunning...\033[0m\n" + @./zig-out/bin/lightpanda || (printf "\033[33mRun ERROR\033[0m\n"; exit 1;) ## Run the server in debug mode run-debug: build-dev - @printf "\e[36mRunning...\e[0m\n" - @./zig-out/bin/lightpanda || (printf "\e[33mRun ERROR\e[0m\n"; exit 1;) + @printf "\033[36mRunning...\033[0m\n" + @./zig-out/bin/lightpanda || (printf "\033[33mRun ERROR\033[0m\n"; exit 1;) ## Run a JS shell in debug mode shell: - @printf "\e[36mBuilding shell...\e[0m\n" - @$(ZIG) build shell || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) + @printf "\033[36mBuilding shell...\033[0m\n" + @$(ZIG) build shell || (printf "\033[33mBuild ERROR\033[0m\n"; exit 1;) ## Run WPT tests wpt: - @printf "\e[36mBuilding wpt...\e[0m\n" - @$(ZIG) build wpt -- $(filter-out $@,$(MAKECMDGOALS)) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) + @printf "\033[36mBuilding wpt...\033[0m\n" + @$(ZIG) build wpt -- $(filter-out $@,$(MAKECMDGOALS)) || (printf "\033[33mBuild ERROR\033[0m\n"; exit 1;) wpt-summary: - @printf "\e[36mBuilding wpt...\e[0m\n" - @$(ZIG) build wpt -- --summary $(filter-out $@,$(MAKECMDGOALS)) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) + @printf "\033[36mBuilding wpt...\033[0m\n" + @$(ZIG) build wpt -- --summary $(filter-out $@,$(MAKECMDGOALS)) || (printf "\033[33mBuild ERROR\033[0m\n"; exit 1;) ## Test - `grep` is used to filter out the huge compile command on build ifeq ($(OS), macos) @@ -127,27 +127,27 @@ ICONV := $(BC)vendor/libiconv/out/$(OS)-$(ARCH) # TODO: this way of linking libiconv is not ideal. We should have a more generic way # and stick to a specif version. Maybe build from source. Anyway not now. _install-netsurf: clean-netsurf - @printf "\e[36mInstalling NetSurf...\e[0m\n" && \ - ls $(ICONV)/lib/libiconv.a 1> /dev/null || (printf "\e[33mERROR: you need to execute 'make install-libiconv'\e[0m\n"; exit 1;) && \ + @printf "\033[36mInstalling NetSurf...\033[0m\n" && \ + ls $(ICONV)/lib/libiconv.a 1> /dev/null || (printf "\033[33mERROR: you need to execute 'make install-libiconv'\033[0m\n"; exit 1;) && \ mkdir -p $(BC_NS) && \ cp -R vendor/netsurf/share $(BC_NS) && \ export PREFIX=$(BC_NS) && \ export OPTLDFLAGS="-L$(ICONV)/lib" && \ export OPTCFLAGS="$(OPTCFLAGS) -I$(ICONV)/include" && \ - printf "\e[33mInstalling libwapcaplet...\e[0m\n" && \ + printf "\033[33mInstalling libwapcaplet...\033[0m\n" && \ cd vendor/netsurf/libwapcaplet && \ BUILDDIR=$(BC_NS)/build/libwapcaplet make install && \ cd ../libparserutils && \ - printf "\e[33mInstalling libparserutils...\e[0m\n" && \ + printf "\033[33mInstalling libparserutils...\033[0m\n" && \ BUILDDIR=$(BC_NS)/build/libparserutils make install && \ cd ../libhubbub && \ - printf "\e[33mInstalling libhubbub...\e[0m\n" && \ + printf "\033[33mInstalling libhubbub...\033[0m\n" && \ BUILDDIR=$(BC_NS)/build/libhubbub make install && \ rm src/treebuilder/autogenerated-element-type.c && \ cd ../libdom && \ - printf "\e[33mInstalling libdom...\e[0m\n" && \ + printf "\033[33mInstalling libdom...\033[0m\n" && \ BUILDDIR=$(BC_NS)/build/libdom make install && \ - printf "\e[33mRunning libdom example...\e[0m\n" && \ + printf "\033[33mRunning libdom example...\033[0m\n" && \ cd examples && \ $(ZIG) cc \ -I$(ICONV)/include \ @@ -164,14 +164,14 @@ _install-netsurf: clean-netsurf $(ICONV)/lib/libiconv.a && \ ./a.out > /dev/null && \ rm a.out && \ - printf "\e[36mDone NetSurf $(OS)\e[0m\n" + printf "\033[36mDone NetSurf $(OS)\033[0m\n" clean-netsurf: - @printf "\e[36mCleaning NetSurf build...\e[0m\n" && \ + @printf "\033[36mCleaning NetSurf build...\033[0m\n" && \ rm -Rf $(BC_NS) test-netsurf: - @printf "\e[36mTesting NetSurf...\e[0m\n" && \ + @printf "\033[36mTesting NetSurf...\033[0m\n" && \ export PREFIX=$(BC_NS) && \ export LDFLAGS="-L$(ICONV)/lib -L$(BC_NS)/lib" && \ export CFLAGS="-I$(ICONV)/include -I$(BC_NS)/include" && \