From 30bd7bb39fb55a4b6b3075a1f8a7df47bc0e261f Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 26 Feb 2016 13:12:09 +0000 Subject: Rename PURE_STATIC to INSPIRCD_STATIC. --- tools/test-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/test-build b/tools/test-build index b0eb255c0..146880fe6 100755 --- a/tools/test-build +++ b/tools/test-build @@ -56,12 +56,12 @@ foreach my $compiler (@compilers) { say "Failed to configure using the $compiler compiler and the $socketengine socket engine!"; exit 1; } - $ENV{PURE_STATIC} = 1; + $ENV{INSPIRCD_STATIC} = 1; if (system 'make', '-j'.get_cpu_count, 'install') { say "Failed to compile with static modules using the $compiler compiler and the $socketengine socket engine!"; exit 1; } - delete $ENV{PURE_STATIC}; + delete $ENV{INSPIRCD_STATIC}; if (system 'make', '-j'.get_cpu_count, 'install') { say "Failed to compile with dynamic modules using the $compiler compiler and the $socketengine socket engine!"; exit 1; -- cgit v1.2.3 From be74a8c8d2555feff3fb1c41494d639f695e82c7 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Thu, 31 Mar 2016 14:59:44 +0100 Subject: Rename V to INSPIRCD_VERBOSE. --- make/template/main.mk | 8 ++++---- tools/test-build | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/make/template/main.mk b/make/template/main.mk index 73ebbd53e..8a4d8fb65 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -114,7 +114,7 @@ FOOTER = finishmessage @TARGET GNU_MAKE SOURCEPATH = $(shell /bin/pwd) @TARGET BSD_MAKE SOURCEPATH != /bin/pwd -@IFDEF V +@IFDEF INSPIRCD_VERBOSE VERBOSE = -v @ELSE @TARGET GNU_MAKE MAKEFLAGS += --silent @@ -301,11 +301,11 @@ help: @echo 'Use: ${MAKE} [flags] [targets]' @echo '' @echo 'Flags:' - @echo ' V=1 Show the full command being executed instead of "BUILD: dns.cpp"' + @echo ' INSPIRCD_VERBOSE=1 Show the full command being executed instead of "BUILD: dns.cpp"' @echo ' D=1 Enable debug build, for module development or crash tracing' @echo ' D=2 Enable debug build with optimizations, for detailed backtraces' - @echo ' DESTDIR= Specify a destination root directory (for tarball creation)' - @echo ' -j Run a parallel build using N jobs' + @echo ' DESTDIR= Specify a destination root directory (for tarball creation)' + @echo ' -j Run a parallel build using N jobs' @echo '' @echo 'Targets:' @echo ' all Complete build of InspIRCd, without installing (default)' diff --git a/tools/test-build b/tools/test-build index 146880fe6..212c16bb0 100755 --- a/tools/test-build +++ b/tools/test-build @@ -33,7 +33,7 @@ use warnings FATAL => qw(all); use make::common; use make::configure; -$ENV{D} = $ENV{V} = 1; +$ENV{D} = $ENV{INSPIRCD_VERBOSE} = 1; system 'git', 'clean', '-dfx'; -- cgit v1.2.3 From eaa3de48d2481c06a6ed5896b0a28f9c67aa7afb Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Thu, 31 Mar 2016 15:06:49 +0100 Subject: Rename D to INSPIRCD_DEBUG. --- make/template/main.mk | 16 ++++++++-------- tools/test-build | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'tools') diff --git a/make/template/main.mk b/make/template/main.mk index 8a4d8fb65..17496fb8a 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -84,12 +84,12 @@ INSTMODE_LIB = 0640 PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS) @ENDIF -@IFNDEF D - D=0 +@IFNDEF INSPIRCD_DEBUG + INSPIRCD_DEBUG=0 @ENDIF DBGOK=0 -@IFEQ $(D) 0 +@IFEQ $(INSPIRCD_DEBUG) 0 CORECXXFLAGS += -fno-rtti -O2 @IFEQ $(COMPILER) GCC CORECXXFLAGS += -g1 @@ -97,12 +97,12 @@ DBGOK=0 HEADER = std-header DBGOK=1 @ENDIF -@IFEQ $(D) 1 +@IFEQ $(INSPIRCD_DEBUG) 1 CORECXXFLAGS += -O0 -g3 -Werror -DINSPIRCD_ENABLE_RTTI HEADER = debug-header DBGOK=1 @ENDIF -@IFEQ $(D) 2 +@IFEQ $(INSPIRCD_DEBUG) 2 CORECXXFLAGS += -fno-rtti -O2 -g3 HEADER = debug-header DBGOK=1 @@ -160,7 +160,7 @@ target: $(HEADER) cd $(BUILDPATH); $(MAKEENV) $(MAKE) -f real.mk $(TARGET) debug: - @${MAKE} D=1 all + @${MAKE} INSPIRCD_DEBUG=1 all debug-header: @echo "*************************************" @@ -302,8 +302,8 @@ help: @echo '' @echo 'Flags:' @echo ' INSPIRCD_VERBOSE=1 Show the full command being executed instead of "BUILD: dns.cpp"' - @echo ' D=1 Enable debug build, for module development or crash tracing' - @echo ' D=2 Enable debug build with optimizations, for detailed backtraces' + @echo ' INSPIRCD_DEBUG=1 Enable debug build, for module development or crash tracing' + @echo ' INSPIRCD_DEBUG=2 Enable debug build with optimizations, for detailed backtraces' @echo ' DESTDIR= Specify a destination root directory (for tarball creation)' @echo ' -j Run a parallel build using N jobs' @echo '' diff --git a/tools/test-build b/tools/test-build index 212c16bb0..629e537c4 100755 --- a/tools/test-build +++ b/tools/test-build @@ -33,7 +33,7 @@ use warnings FATAL => qw(all); use make::common; use make::configure; -$ENV{D} = $ENV{INSPIRCD_VERBOSE} = 1; +$ENV{INSPIRCD_DEBUG} = $ENV{INSPIRCD_VERBOSE} = 1; system 'git', 'clean', '-dfx'; -- cgit v1.2.3