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

Write generated templates to the .configure directory.

Browse Source
This commit is contained in:
Peter Powell 2016-03-22 22:40:59 +00:00
parent fb58d69bf5
commit f79a55616b
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -5,17 +5,12 @@
.*
!.git*
/.configure
/BSDmakefile
/GNUmakefile
/build
/docs/doxygen
/inspircd
/inspircd.1
/inspircd-genssl.1
/inspircd.service
/org.inspircd.plist
/run
/bin
/include/config.h

18
make/configure.pm
View File

@ -31,14 +31,16 @@ use feature ':5.10';
use strict;
use warnings FATAL => qw(all);
use Cwd qw(getcwd);
use Exporter qw(import);
use File::Basename qw(basename);
use Cwd qw(getcwd);
use Exporter qw(import);
use File::Basename qw(basename dirname);
use File::Spec::Functions qw(catfile);
use make::common;
use make::console;
use make::utilities;
use constant CONFIGURE_DIRECTORY => '.configure';
use constant CONFIGURE_CACHE_FILE => '.configure.cache';
use constant CONFIGURE_CACHE_VERSION => '1';
@ -87,6 +89,7 @@ sub __get_template_settings($$$) {
}
# Miscellaneous information
$settings{CONFIGURE_DIRECTORY} = CONFIGURE_DIRECTORY;
$settings{CONFIGURE_CACHE_FILE} = CONFIGURE_CACHE_FILE;
$settings{SYSTEM_NAME} = lc $^O;
chomp($settings{SYSTEM_NAME_VERSION} = `uname -sr 2>/dev/null`);
@ -337,7 +340,7 @@ sub parse_templates($$$) {
# Add a default target if the template has not defined one.
unless (scalar keys %targets) {
$targets{DEFAULT} = basename $_;
$targets{DEFAULT} = catfile(CONFIGURE_DIRECTORY, basename $_);
}
# Second pass: parse makefile junk and write files.
@ -417,6 +420,13 @@ sub parse_templates($$$) {
push @final_lines, $line;
}
# Create the directory if it doesn't already exist.
my $directory = dirname $target;
unless (-e $directory) {
print_format "Creating <|GREEN $directory|> ...\n";
create_directory $directory, 0750 or print_error "unable to create $directory: $!";
};
# Write the template file.
print_format "Writing <|GREEN $target|> ...\n";
open(TARGET, '>', $target) or print_error "unable to write $target: $!";

10
make/template/main.mk
View File

@ -229,16 +229,16 @@ install: target
@IFNDEF PURE_STATIC
[ $(BUILDPATH)/modules/ -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) $(BUILDPATH)/modules/*.so $(MODPATH)
@ENDIF
-$(INSTALL) -m $(INSTMODE_BIN) inspircd $(BASE) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(BASE) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) .gdbargs $(BASE)/.gdbargs 2>/dev/null
@IFEQ $(SYSTEM) darwin
-$(INSTALL) -m $(INSTMODE_BIN) org.inspircd.plist $(BASE) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(BASE) 2>/dev/null
@ENDIF
@IFEQ $(SYSTEM) linux
-$(INSTALL) -m $(INSTMODE_LIB) inspircd.service $(BASE) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) @CONFIGURE_DIRECTORY@/inspircd.service $(BASE) 2>/dev/null
@ENDIF
-$(INSTALL) -m $(INSTMODE_LIB) inspircd.1 $(MANPATH) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) inspircd-genssl.1 $(MANPATH) 2>/dev/null
-$(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) *.pem $(CONPATH) 2>/dev/null