From 1d17a9d23e533e0a5e9a0cdec17fd40adf0f0821 Mon Sep 17 00:00:00 2001 From: danieldg Date: Sat, 6 Feb 2010 04:29:02 +0000 Subject: [PATCH] Move configuration examples to docs, remove automatic overwrite on make install git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12383 e03df62e-2008-0410-955e-edbf42e46eb7 --- {conf => docs}/aliases/anope.conf.example | 0 {conf => docs}/aliases/atheme.conf.example | 0 .../aliases/ircservices.conf.example | 0 {conf => docs}/aliases/neostats.conf.example | 0 {conf => docs}/inspircd.censor.example | 0 {conf => docs}/inspircd.conf.example | 0 {conf => docs}/inspircd.filter.example | 0 {conf => docs}/inspircd.helpop-full.example | 0 {conf => docs}/inspircd.helpop.example | 0 {conf => docs}/inspircd.motd.example | 0 {conf => docs}/inspircd.quotes.example | 0 {conf => docs}/inspircd.rules.example | 0 {conf => docs}/links.conf.example | 0 {conf => docs}/modules.conf.example | 0 {conf => docs}/modules/modules.conf.charybdis | 0 {conf => docs}/modules/modules.conf.unreal | 0 {conf => docs}/opers.conf.example | 0 make/install-extras.pl | 29 ------------------- make/template/main.mk | 3 +- src/configreader.cpp | 14 --------- src/modules/extra/m_ssl_gnutls.cpp | 2 -- src/modules/extra/m_ssl_openssl.cpp | 2 -- 22 files changed, 1 insertion(+), 49 deletions(-) rename {conf => docs}/aliases/anope.conf.example (100%) rename {conf => docs}/aliases/atheme.conf.example (100%) rename {conf => docs}/aliases/ircservices.conf.example (100%) rename {conf => docs}/aliases/neostats.conf.example (100%) rename {conf => docs}/inspircd.censor.example (100%) rename {conf => docs}/inspircd.conf.example (100%) rename {conf => docs}/inspircd.filter.example (100%) rename {conf => docs}/inspircd.helpop-full.example (100%) rename {conf => docs}/inspircd.helpop.example (100%) rename {conf => docs}/inspircd.motd.example (100%) rename {conf => docs}/inspircd.quotes.example (100%) rename {conf => docs}/inspircd.rules.example (100%) rename {conf => docs}/links.conf.example (100%) rename {conf => docs}/modules.conf.example (100%) rename {conf => docs}/modules/modules.conf.charybdis (100%) rename {conf => docs}/modules/modules.conf.unreal (100%) rename {conf => docs}/opers.conf.example (100%) delete mode 100755 make/install-extras.pl diff --git a/conf/aliases/anope.conf.example b/docs/aliases/anope.conf.example similarity index 100% rename from conf/aliases/anope.conf.example rename to docs/aliases/anope.conf.example diff --git a/conf/aliases/atheme.conf.example b/docs/aliases/atheme.conf.example similarity index 100% rename from conf/aliases/atheme.conf.example rename to docs/aliases/atheme.conf.example diff --git a/conf/aliases/ircservices.conf.example b/docs/aliases/ircservices.conf.example similarity index 100% rename from conf/aliases/ircservices.conf.example rename to docs/aliases/ircservices.conf.example diff --git a/conf/aliases/neostats.conf.example b/docs/aliases/neostats.conf.example similarity index 100% rename from conf/aliases/neostats.conf.example rename to docs/aliases/neostats.conf.example diff --git a/conf/inspircd.censor.example b/docs/inspircd.censor.example similarity index 100% rename from conf/inspircd.censor.example rename to docs/inspircd.censor.example diff --git a/conf/inspircd.conf.example b/docs/inspircd.conf.example similarity index 100% rename from conf/inspircd.conf.example rename to docs/inspircd.conf.example diff --git a/conf/inspircd.filter.example b/docs/inspircd.filter.example similarity index 100% rename from conf/inspircd.filter.example rename to docs/inspircd.filter.example diff --git a/conf/inspircd.helpop-full.example b/docs/inspircd.helpop-full.example similarity index 100% rename from conf/inspircd.helpop-full.example rename to docs/inspircd.helpop-full.example diff --git a/conf/inspircd.helpop.example b/docs/inspircd.helpop.example similarity index 100% rename from conf/inspircd.helpop.example rename to docs/inspircd.helpop.example diff --git a/conf/inspircd.motd.example b/docs/inspircd.motd.example similarity index 100% rename from conf/inspircd.motd.example rename to docs/inspircd.motd.example diff --git a/conf/inspircd.quotes.example b/docs/inspircd.quotes.example similarity index 100% rename from conf/inspircd.quotes.example rename to docs/inspircd.quotes.example diff --git a/conf/inspircd.rules.example b/docs/inspircd.rules.example similarity index 100% rename from conf/inspircd.rules.example rename to docs/inspircd.rules.example diff --git a/conf/links.conf.example b/docs/links.conf.example similarity index 100% rename from conf/links.conf.example rename to docs/links.conf.example diff --git a/conf/modules.conf.example b/docs/modules.conf.example similarity index 100% rename from conf/modules.conf.example rename to docs/modules.conf.example diff --git a/conf/modules/modules.conf.charybdis b/docs/modules/modules.conf.charybdis similarity index 100% rename from conf/modules/modules.conf.charybdis rename to docs/modules/modules.conf.charybdis diff --git a/conf/modules/modules.conf.unreal b/docs/modules/modules.conf.unreal similarity index 100% rename from conf/modules/modules.conf.unreal rename to docs/modules/modules.conf.unreal diff --git a/conf/opers.conf.example b/docs/opers.conf.example similarity index 100% rename from conf/opers.conf.example rename to docs/opers.conf.example diff --git a/make/install-extras.pl b/make/install-extras.pl deleted file mode 100755 index ce77178e9..000000000 --- a/make/install-extras.pl +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/perl -use strict; -use warnings; - -my $mode = shift; -my %installed; - -for my $dir (qw(src src/modules)) { - opendir(DIRHANDLE, $dir); - for my $file (sort readdir(DIRHANDLE)) { - next unless $file =~ /\.cpp$/; - open CPP, '<', "$dir/$file" or die "Can't open $dir/$file to scan it: $!"; - while () { - if (/\/\* \$CopyInstall: (\S+) (\S+) (.*) \*\//i) { - my($ifile, $idir, $args) = ($1,$2,$3); - next if exists $installed{$1.' '.$2}; - $installed{$1.' '.$2}++; - $idir =~ s/\$\(([^)]+)\)/$ENV{$1}/eg; - if ($mode eq 'install') { - system "install $args $ifile $idir"; - } else { - $ifile =~ s/.*\///g; - system "rm $idir/$ifile"; - } - } - } - } - closedir(DIRHANDLE); -} diff --git a/make/template/main.mk b/make/template/main.mk index 964e12fae..acdcfbe5a 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -159,7 +159,7 @@ install: target@EXTRA_DIR@ -install -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null -install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH) -install -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH) - @$(MAKEENV) make/install-extras.pl install + -install -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null @echo "" @echo "*************************************" @echo "* INSTALL COMPLETE! *" @@ -187,7 +187,6 @@ clean: deinstall: -rm $(BINPATH)/inspircd -rm $(MODPATH)/*.so - @make/install-extras.pl deinstall squeakyclean: distclean diff --git a/src/configreader.cpp b/src/configreader.cpp index 9db1f2665..20cc0c2b3 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -11,20 +11,6 @@ * --------------------------------------------------- */ -/* $Core */ -/* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.helpop-full.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.helpop.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.censor.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */ -/* $CopyInstall: conf/inspircd.conf.example $(CONPATH) */ -/* $CopyInstall: conf/modules.conf.example $(CONPATH) */ -/* $CopyInstall: conf/opers.conf.example $(CONPATH) */ -/* $CopyInstall: conf/links.conf.example $(CONPATH) */ -/* $CopyInstall: tools/gdbargs $(BASE)/.gdbargs */ - #include "inspircd.h" #include #include "xline.h" diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 3e72fbd36..a0804ddf9 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -24,8 +24,6 @@ /* $ModDesc: Provides SSL support for clients */ /* $CompileFlags: pkgconfincludes("gnutls","/gnutls/gnutls.h","") */ /* $LinkerFlags: rpath("pkg-config --libs gnutls") pkgconflibs("gnutls","/libgnutls.so","-lgnutls") */ -/* $CopyInstall: conf/key.pem $(CONPATH) -m 0400 -o $(INSTUID) */ -/* $CopyInstall: conf/cert.pem $(CONPATH) -m 0444 */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED }; diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 261105969..018d7351e 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -30,8 +30,6 @@ /* $LinkerFlags: if(!"USE_FREEBSD_BASE_SSL") rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */ /* $NoPedantic */ -/* $CopyInstall: conf/key.pem $(CONPATH) -m 0400 -o $(INSTUID) */ -/* $CopyInstall: conf/cert.pem $(CONPATH) -m 0444 */ enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN }; -- 2.39.5