ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 12:09:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename PURE_STATIC to INSPIRCD_STATIC.

Browse Source
This commit is contained in:
Peter Powell 2016-02-26 13:12:09 +00:00
parent 932748db6d
commit 30bd7bb39f
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/modules.h
View File

@ -1235,7 +1235,7 @@ class CoreExport ModuleManager : public fakederef<ModuleManager>
#define MODULE_INIT_SYM_FN_2(x,y) MODULE_INIT_SYM_FN_1(x,y)
#define MODULE_INIT_SYM_FN_1(x,y) inspircd_module_ ## x ## _ ## y
#ifdef PURE_STATIC
#ifdef INSPIRCD_STATIC
struct AllCommandList {
typedef Command* (*fn)(Module*);

2
make/calcdep.pl
View File

@ -57,7 +57,7 @@ sub run() {
open MAKE, '>real.mk' or die "Could not write real.mk: $!";
chdir "${\SOURCEPATH}/src";
if ($ENV{PURE_STATIC}) {
if ($ENV{INSPIRCD_STATIC}) {
run_static();
} else {
run_dynamic();

10
make/template/main.mk
View File

@ -122,8 +122,8 @@ FOOTER = finishmessage
VERBOSE =
@ENDIF
@IFDEF PURE_STATIC
CORECXXFLAGS += -DPURE_STATIC
@IFDEF INSPIRCD_STATIC
CORECXXFLAGS += -DINSPIRCD_STATIC
@ENDIF
# Add the users CXXFLAGS to the base ones to allow them to override
@ -131,7 +131,7 @@ FOOTER = finishmessage
CORECXXFLAGS += $(CXXFLAGS)
@DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
@DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC
@DO_EXPORT SOURCEPATH BUILDPATH INSPIRCD_STATIC
# Default target
TARGET = all
@ -177,7 +177,7 @@ debug-header:
@echo "*************************************"
mod-header:
@IFDEF PURE_STATIC
@IFDEF INSPIRCD_STATIC
@echo 'Cannot build single modules in pure-static build'
@exit 1
@ENDIF
@ -226,7 +226,7 @@ install: target
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MANPATH)
@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
@IFNDEF PURE_STATIC
@IFNDEF INSPIRCD_STATIC
[ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
@ENDIF
-$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(BASE) 2>/dev/null

2
src/coremods/core_info/cmd_modules.cpp
View File

@ -64,7 +64,7 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
if (!(V.Flags & mult))
flags[pos] = '-';
#ifdef PURE_STATIC
#ifdef INSPIRCD_STATIC
user->WriteRemoteNumeric(702, InspIRCd::Format("%s %s :%s", m->ModuleSourceFile.c_str(), flags.c_str(), V.description.c_str()));
#else
std::string srcrev = m->ModuleDLLManager->GetVersion();

2
src/modmanager_dynamic.cpp
View File

@ -25,7 +25,7 @@
#include <dirent.h>
#endif
#ifndef PURE_STATIC
#ifndef INSPIRCD_STATIC
bool ModuleManager::Load(const std::string& modname, bool defer)
{

2
src/modmanager_static.cpp
View File

@ -23,7 +23,7 @@
#include "exitcodes.h"
#include <iostream>
#ifdef PURE_STATIC
#ifdef INSPIRCD_STATIC
typedef std::map<std::string, AllModuleList*> modmap;
static std::vector<AllCommandList::fn>* cmdlist = NULL;

4
tools/test-build
View File

@ -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;