X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Ftemplate%2Fmain.mk;h=319d39c08f24fb92d9ae7a0f073d61f6af4dd8c6;hb=d298378b3d7b6e60afe199739e26db93960a89c4;hp=7e48b01d0c1a5e94a30d25ece8e98825252fb5a4;hpb=2772c2fa2d51de376d84dd3674c7c0214f570469;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/template/main.mk b/make/template/main.mk index 7e48b01d0..319d39c08 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -2,7 +2,18 @@ # # InspIRCd -- Internet Relay Chat Daemon # +# Copyright (C) 2020 Nicole Kleinhoff +# Copyright (C) 2018 Puck Meerburg +# Copyright (C) 2012-2020 Sadie Powell +# Copyright (C) 2012, 2015-2016 Attila Molnar +# Copyright (C) 2012 Robby +# Copyright (C) 2012 Christoph Egger +# Copyright (C) 2012 ChrisTX +# Copyright (C) 2010 Dennis Friis # Copyright (C) 2009-2010 Daniel De Graaf +# Copyright (C) 2007 Robin Burchell +# Copyright (C) 2005-2007 Craig Edwards +# Copyright (C) 2005 Craig McLure # # This file is part of InspIRCd. InspIRCd is free software: you can # redistribute it and/or modify it under the terms of the GNU General Public @@ -32,30 +43,34 @@ CXX = @CXX@ COMPILER = @COMPILER_NAME@ SYSTEM = @SYSTEM_NAME@ -BUILDPATH ?= $(PWD)/build +BUILDPATH ?= $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/build/@COMPILER_NAME@-@COMPILER_VERSION@ SOCKETENGINE = @SOCKETENGINE@ CORECXXFLAGS = -fPIC -fvisibility=hidden -fvisibility-inlines-hidden -pipe -Iinclude -Wall -Wextra -Wfatal-errors -Wno-unused-parameter -Wshadow LDLIBS = -lstdc++ CORELDFLAGS = -rdynamic -L. PICLDFLAGS = -fPIC -shared -rdynamic -BASE = "$(DESTDIR)@BASE_DIR@" + +DESTDIR := $(if $(DESTDIR),$(DESTDIR),"@DESTDIR|@") +BINPATH = "$(DESTDIR)@BINARY_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" +DATPATH = "$(DESTDIR)@DATA_DIR@" +EXAPATH = "$(DESTDIR)@EXAMPLE_DIR@" +LOGPATH = "$(DESTDIR)@LOG_DIR@" MANPATH = "$(DESTDIR)@MANUAL_DIR@" MODPATH = "$(DESTDIR)@MODULE_DIR@" -LOGPATH = "$(DESTDIR)@LOG_DIR@" -DATPATH = "$(DESTDIR)@DATA_DIR@" -BINPATH = "$(DESTDIR)@BINARY_DIR@" +RUNPATH = "$(DESTDIR)@RUNTIME_DIR@" SCRPATH = "$(DESTDIR)@SCRIPT_DIR@" -INSTALL = install -INSTUID = @UID@ -INSTMODE_DIR = 0750 -INSTMODE_BIN = 0750 -INSTMODE_LIB = 0640 -ifneq ($(COMPILER), ICC) +INSTALL ?= install +INSTMODE_DIR ?= 0755 +INSTMODE_BIN ?= 0755 +INSTMODE_TXT ?= 0644 +INSTMODE_PRV ?= 0640 + +ifneq ($(COMPILER), Intel) 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 +89,6 @@ ifeq ($(SYSTEM), gnu) endif ifeq ($(SYSTEM), solaris) LDLIBS += -lsocket -lnsl -lrt -lresolv - INSTALL = ginstall endif ifeq ($(SYSTEM), darwin) LDLIBS += -ldl @@ -110,7 +124,11 @@ ifeq ($(INSPIRCD_DEBUG), 2) HEADER = debug-header DBGOK=1 endif -FOOTER = finishmessage +ifeq ($(INSPIRCD_DEBUG), 3) + CORECXXFLAGS += -fno-rtti -O0 -g0 -Werror + HEADER = std-header + DBGOK=1 +endif MAKEFLAGS += --no-print-directory @@ -120,10 +138,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 +148,6 @@ export BUILDPATH export CORECXXFLAGS export CORELDFLAGS export CXX -export INSPIRCD_STATIC export INSPIRCD_VERBOSE export LDLIBS export PICLDFLAGS @@ -146,7 +159,6 @@ TARGET = all ifdef INSPIRCD_TARGET HEADER = mod-header - FOOTER = mod-footer TARGET = $(INSPIRCD_TARGET) endif @@ -154,7 +166,7 @@ ifeq ($(DBGOK), 0) HEADER = unknown-debug-level endif -all: $(FOOTER) +all: finishmessage target: $(HEADER) $(MAKEENV) perl make/calcdep.pl @@ -178,24 +190,16 @@ 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 - @echo 'To install, copy $(BUILDPATH)/$(TARGET) to $(MODPATH)' - @echo 'Or, run "make install"' - std-header: @echo "*************************************" @echo "* BUILDING INSPIRCD *" @echo "* *" @echo "* This will take a *long* time. *" - @echo "* Why not read our wiki at *" - @echo "* http://wiki.inspircd.org *" - @echo "* while you wait for make to run? *" + @echo "* Why not read our docs at *" + @echo "* https://docs.inspircd.org *" + @echo "* while you wait for Make to run? *" @echo "*************************************" finishmessage: target @@ -204,59 +208,57 @@ finishmessage: target @echo "* BUILD COMPLETE! *" @echo "* *" @echo "* To install InspIRCd, type: *" - @echo "* make install *" + @echo "* 'make install' *" @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) $(BINPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql + @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH) + @-$(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) $(RUNPATH) + @-$(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) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 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_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" @echo "*************************************" @echo 'Paths:' - @echo ' Base install:' $(BASE) @echo ' Configuration:' $(CONPATH) @echo ' Binaries:' $(BINPATH) @echo ' Modules:' $(MODPATH) @echo ' Data:' $(DATPATH) @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf - @echo 'Examples are available at:' $(CONPATH)/examples/ + @echo 'Examples are available at:' $(EXAPATH) GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@ ./configure --update @@ -271,17 +273,15 @@ clean: deinstall: -rm -f $(BINPATH)/inspircd - -rm -rf $(CONPATH)/examples + -rm -rf $(EXAPATH) -rm -f $(MANPATH)/inspircd.1 -rm -f $(MANPATH)/inspircd-genssl.1 -rm -f $(MODPATH)/m_*.so -rm -f $(MODPATH)/core_*.so - -rm -f $(SCRPATH)/.gdbargs -rm -f $(SCRPATH)/inspircd.service -rm -f $(SCRPATH)/org.inspircd.plist configureclean: - rm -f .gdbargs -rm -f Makefile rm -f GNUmakefile rm -f include/config.h @@ -300,13 +300,13 @@ 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 (only for CI)' @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)' @echo ' install Build and install InspIRCd to the directory chosen in ./configure' - @echo ' Currently installs to ${BASE}' @echo ' debug Compile a debug build. Equivalent to "make D=1 all"' @echo '' @echo ' INSPIRCD_TARGET=target Builds a user-specified target, such as "inspircd" or "core_dns"'