X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Fmain.mk;h=e39a24f87b27a082413efaed844f1aa67b6c3791;hb=25359c08847a447544b67d6c60d99ad48168ca5e;hp=447d64b3b80aea23bd76a7581cc38995d3837554;hpb=197279b8c9aa4d98f0a7b0a8231fe6e7380d6e0f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/template/main.mk b/make/template/main.mk index 447d64b3b..e39a24f87 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -32,7 +32,7 @@ CXX = @CXX@ COMPILER = @COMPILER_NAME@ SYSTEM = @SYSTEM_NAME@ -BUILDPATH ?= $(PWD)/build +BUILDPATH ?= $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/build SOCKETENGINE = @SOCKETENGINE@ CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow LDLIBS = -lstdc++ @@ -46,16 +46,16 @@ LOGPATH = "$(DESTDIR)@LOG_DIR@" DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" SCRPATH = "$(DESTDIR)@SCRIPT_DIR@" -INSTALL = install -INSTUID = @UID@ -INSTMODE_DIR = 0750 -INSTMODE_BIN = 0750 -INSTMODE_LIB = 0640 +INSTALL ?= install +INSTMODE_DIR ?= 0755 +INSTMODE_BIN ?= 0755 +INSTMODE_TXT ?= 0644 +INSTMODE_PRV ?= 0640 ifneq ($(COMPILER), ICC) CORECXXFLAGS += -Woverloaded-virtual -Wshadow ifneq ($(SYSTEM), openbsd) - CORECXXFLAGS += -pedantic -Wformat=2 -Wmissing-format-attribute + CORECXXFLAGS += -pedantic -Wformat=2 -Wmissing-format-attribute -Wno-format-nonliteral endif endif @@ -74,7 +74,6 @@ ifeq ($(SYSTEM), gnu) endif ifeq ($(SYSTEM), solaris) LDLIBS += -lsocket -lnsl -lrt -lresolv - INSTALL = ginstall endif ifeq ($(SYSTEM), darwin) LDLIBS += -ldl @@ -110,6 +109,11 @@ ifeq ($(INSPIRCD_DEBUG), 2) HEADER = debug-header DBGOK=1 endif +ifeq ($(INSPIRCD_DEBUG), 3) + CORECXXFLAGS += -fno-rtti -O0 -g0 + HEADER = std-header + DBGOK=1 +endif FOOTER = finishmessage MAKEFLAGS += --no-print-directory @@ -120,10 +124,6 @@ ifndef INSPIRCD_VERBOSE MAKEFLAGS += --silent endif -ifdef INSPIRCD_STATIC - CORECXXFLAGS += -DINSPIRCD_STATIC -endif - # Append any flags set in the environment after the base flags so # that they can be overridden if necessary. CORECXXFLAGS += $(CPPFLAGS) $(CXXFLAGS) @@ -134,7 +134,6 @@ export BUILDPATH export CORECXXFLAGS export CORELDFLAGS export CXX -export INSPIRCD_STATIC export INSPIRCD_VERBOSE export LDLIBS export PICLDFLAGS @@ -178,10 +177,6 @@ debug-header: @echo "*************************************" mod-header: -ifdef INSPIRCD_STATIC - @echo 'Cannot build specific targets in pure-static build' - @exit 1 -endif @echo 'Building specific targets:' mod-footer: target @@ -193,8 +188,8 @@ std-header: @echo "* BUILDING INSPIRCD *" @echo "* *" @echo "* This will take a *long* time. *" - @echo "* Why not read our wiki at *" - @echo "* http://wiki.inspircd.org *" + @echo "* Why not read our docs at *" + @echo "* https://docs.inspircd.org *" @echo "* while you wait for Make to run? *" @echo "*************************************" @@ -208,42 +203,32 @@ finishmessage: target @echo "*************************************" install: target - @if [ "$(INSTUID)" = 0 -o "$(INSTUID)" = root ]; then \ - echo ""; \ - echo "Error: You must specify a non-root UID for the server"; \ - echo ""; \ - echo "If you are making a package, please specify using ./configure --uid"; \ - echo "Otherwise, rerun using 'make INSTUID=irc install', where 'irc' is the user"; \ - echo "who will be running the ircd. You will also need to modify the start script."; \ - echo ""; \ - exit 1; \ - fi - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE) - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH) - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH) - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH) - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/services - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH) - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH) - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(SCRPATH) - [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) -ifndef INSPIRCD_STATIC - [ "$(BUILDPATH)/modules/" -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so $(MODPATH) -endif - -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BASE) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH) + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH) + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) .gdbargs $(SCRPATH)/.gdbargs 2>/dev/null ifeq ($(SYSTEM), darwin) - -$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null endif ifeq ($(SYSTEM), linux) - -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.service $(SCRPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.service $(SCRPATH) 2>/dev/null endif - -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null - -$(INSTALL) -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null - -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples - -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/services/*.example $(CONPATH)/examples/services - -$(INSTALL) -m $(INSTMODE_LIB) *.pem $(CONPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" @@ -300,6 +285,7 @@ help: @echo ' INSPIRCD_VERBOSE=1 Show the full command being executed instead of "BUILD: dns.cpp"' @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 ' INSPIRCD_DEBUG=3 Enable fast build with no optimisations or symbols, for Travis CI' @echo ' DESTDIR= Specify a destination root directory (for tarball creation)' @echo ' -j Run a parallel build using N jobs' @echo ''