#
###############################################################################################
-# List of commands that make up 'make install'
+# List of commands that make up 'make install' and 'make deinstall'
my $install_list = "";
+my $uninstall_list = "";
# This is a list of all files in the core. Each cpp file is mapped to a shared object file,
# whos file extension is omitted (these can vary from system to system). Auto detected by
sub clean
{
- system("rm -rf .config.cache");
+ unlink(".config.cache");
}
sub update
exit 0;
} else {
# We've Loaded the cache file and all our variables..
- print "Updating Files..\n";
+ print "Updating files...\n";
getosflags();
if ($opt_disable_debug == 1)
{
exit 0;
} else {
# We've Loaded the cache file and all our variables..
- print "Updating Files..\n";
+ print "Updating files...\n";
getosflags();
$has_epoll = $config{HAS_EPOLL};
$has_ports = $config{HAS_PORTS};
sub getosflags {
$config{LDLIBS} = "-lstdc++";
- $config{FLAGS} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
- $config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated -g";
+ $config{FLAGS} = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
+ $config{DEVELOPER} = "-fPIC -Wall -pedantic -g";
$SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
$config{MAKEPROG} = "make";
if ($config{OSNAME} =~ /darwin/i) {
- $config{FLAGS} = "-DDARWIN -frtti -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+ $config{FLAGS} = "-DDARWIN -frtti -fPIC -Wall -pedantic $config{OPTIMISATI}";
$SHARED = "-bundle -twolevel_namespace -undefined dynamic_lookup";
$config{LDLIBS} = "-ldl -lstdc++";
}
if ($config{OSNAME} =~ /Linux/i) {
$config{LDLIBS} = "-ldl -lstdc++";
- $config{FLAGS} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+ $config{FLAGS} = "-fPIC -Wall -pedantic $config{OPTIMISATI}";
$config{FLAGS} .= " " . $ENV{CXXFLAGS} if exists($ENV{CXXFLAGS});
$config{LDLIBS} .= " " . $ENV{LDLIBS} if exists($ENV{LDLIBS});
$config{MAKEPROG} = "make";
#ifndef __CONFIGURATION_SOCKETENGINE__
#define __CONFIGURATION_SOCKETENGINE__
-#include "$se.h"
+#include "socketengines/$se.h"
#endif
EOF
if (opendir(MDIRHANDLE, "src/modules/$name") != 0) {
closedir(MDIRHANDLE);
$modules .= "$name.so ";
+ $uninstall_list = $uninstall_list . " -rm \$(MODULES)/$name.so\n";
}
}
}
# We can actually parse any file starting with . and ending with .inc,
# but right now we only parse .inspircd.inc to form './inspircd'
- print "Writing dynamic-build \033[1;32msrc/Makefile\033[0m\n";
- write_dynamic_makefile();
+ print "Writing \033[1;32mMakefiles\033[0m\n";
write_dynamic_modules_makefile();
+ write_dynamic_makefile();
opendir(DIRHANDLE, $this);
$tmp =~ s/\@MAKEORDER\@/$config{MAKEORDER}/;
$tmp =~ s/\@VERSION\@/$version/;
$tmp =~ s/\@INSTALL_LIST\@/$install_list/;
+ $tmp =~ s/\@UNINSTALL_LIST\@/$uninstall_list/;
open(FILEHANDLE, ">$file");
print FILEHANDLE $tmp;
if ($config{OSNAME} =~ /darwin/) {
print FILEHANDLE <<EOCHEESE;
-PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle
+PICLDFLAGS = -twolevel_namespace -undefined dynamic_lookup -bundle
EOCHEESE
} else {
print FILEHANDLE <<EOCHEESE;
-PICLDFLAGS = -fPIC -DPIC -shared \$(FLAGS)
+PICLDFLAGS = -fPIC -DPIC -shared
EOCHEESE
}
my $modules = "";
my $cmflags = "";
my $liflags = "";
- my $crud = "";
-
foreach $i (@modlist) {
###
# Write Entry to the MakeFile
#print "file: $i: cmflags=$cmflags; liflags=$liflags; deps=$deps\n";
- print FILEHANDLE <<EOCHEESE;
+
+ $nicerflags = $config{FLAGS};
+ $nicerflags =~ s/-pedantic//g;
+
+ if (nopedantic("src/modules/m_".$i.".cpp"))
+ {
+ print FILEHANDLE "
+m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
+ \$(CC) -pipe -I../../include $nicerflags $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
+"
+ }
+ else
+ {
+ print FILEHANDLE "
m_$i.so: m_$i.cpp ../../include/modules.h ../../include/users.h ../../include/channels.h ../../include/base.h ../../include/inspircd_config.h ../../include/inspircd.h ../../include/configreader.h $deps
\$(CC) -pipe -I../../include \$(FLAGS) $cmflags \$(PICLDFLAGS) $liflags -export-dynamic -o m_$i.so m_$i.cpp
-EOCHEESE
- $crud = $crud . " install -m \$(INSTMODE) m_$i.so \$(MODPATH)\n";
+";
+ }
+ $install_list = $install_list . " install -m \$(INSTMODE) src/modules/m_$i.so \$(MODPATH)\n";
+ $uninstall_list = $uninstall_list . " -rm \$(MODULES)/m_$i.so\n";
###
# End Write Entry to the MakeFile
###
}
print FILEHANDLE "\n$mfrules\n";
closedir(MDIRHANDLE);
- $crud = $crud . " install -m \$(INSTMODE) $name.so \$(MODPATH)\n";
+ $install_list = $install_list . " install -m \$(INSTMODE) src/modules/$name.so \$(MODPATH)\n";
}
}
}
closedir(DIRHANDLE);
-
- print FILEHANDLE "modinst:\n \@echo \"Installing modules...\"\n" . $crud;
}
sub read_module_directory {
{
my $i = 0;
my @cmdlist = ();
+ my %existing_install_list = ();
opendir(DIRHANDLE, "src/commands");
foreach $name (sort readdir(DIRHANDLE))
{
if ($name =~ /^cmd_(.+)\.cpp$/)
{
$cmdlist[$i++] = $1;
- $install_list = $install_list . " -install -m \$(INSTMODE) src/commands/cmd_" . $name . ".so \$(LIBPATH)\n";
+ $install_list = $install_list . " -install -m \$(INSTMODE) src/commands/cmd_" . $1 . ".so \$(LIBPATH)\n";
+ $uninstall_list = $uninstall_list . " -rm \$(LIBPATH)/cmd_$1.so\n";
}
}
closedir(DIRHANDLE);
$config{USE_PORTS} = 0;
}
- print "Scanning src folder for core files";
- opendir(DIRHANDLE, "src");
- foreach $name (sort readdir(DIRHANDLE))
+ foreach my $dir (("src","src/commands","src/modes","src/socketengines","src/modules"))
{
- if ($name =~ /\.cpp$/)
+ print "Scanning \033[1;32m$dir\033[0m for core files ";
+ opendir(DIRHANDLE, $dir);
+ foreach $name (sort readdir(DIRHANDLE))
{
- open (CPP, "<src/$name") or die("Can't open src/$name to scan it! oh bugger");
- while (chomp($line = <CPP>))
+ if ($name =~ /\.cpp$/)
{
- if ($line =~ /\/\* \$Core: (\w+) \*\//i)
- {
- $filelist{$name} = $1;
- print ".";
- }
- elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i)
- {
- $specialdeps{$name} = $1;
- }
- elsif ($line =~ /\/\* \$ExtraObjects: (.*?) \*\//i)
- {
- $extraobjects{$name} = $1;
- }
- elsif ($line =~ /\/\* \$ExtraBuild: (.*?) \*\//i)
- {
- $extrabuildlines{$name} = $1;
- }
- elsif ($line =~ /\/\* \$ExtraSources: (.*?) \*\//i)
- {
- $extrasources{$name} = $1;
- }
- elsif ($line =~ /\/\* \$If: (\w+) \*\//i)
+ open (CPP, "<$dir/$name") or die("Can't open $dir/$name to scan it! oh bugger");
+ print ".";
+ while (chomp($line = <CPP>))
{
- if (($config{$1} !~ /y/i) and ($config{$1} ne "1"))
+ if ($line =~ /\/\* \$Core: (\w+) \*\//i)
+ {
+ $filelist{$name} = $1;
+ }
+ elsif ($line =~ /\/\* \$ExtraDeps: (.*?) \*\//i)
+ {
+ $specialdeps{$name} = $1;
+ }
+ elsif ($line =~ /\/\* \$ExtraObjects: (.*?) \*\//i)
+ {
+ $extraobjects{$name} = $1;
+ }
+ elsif ($line =~ /\/\* \$ExtraBuild: (.*?) \*\//i)
+ {
+ $extrabuildlines{$name} = $1;
+ }
+ elsif ($line =~ /\/\* \$ExtraSources: (.*?) \*\//i)
{
- # Skip to 'endif'
- while (chomp($line = <CPP>))
+ $extrasources{$name} = $1;
+ }
+ elsif ($line =~ /\/\* \$If: (\w+) \*\//i)
+ {
+ if (($config{$1} !~ /y/i) and ($config{$1} ne "1"))
+ {
+ # Skip to 'endif'
+ while (chomp($line = <CPP>))
+ {
+ die ("\$If buildsystem instruction within another \$If in file $dir/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i);
+ last if ($line =~ /\/\* \$EndIf \*\//i);
+ }
+ }
+ }
+ elsif ($line =~ /\/\* \$Install: (.*?) \*\//i)
+ {
+ if (!exists($existing_install_list{$1}))
{
- die ("\$If buildsystem instruction within another \$If in file src/$name") if ($line =~ /\/\* \$If: (\w+) \*\//i);
- last if ($line =~ /\/\* \$EndIf \*\//i);
+ $existing_install_list{$1} = 1;
+ $idir = (split(' ',$1))[1];
+ $ifile = (split(' ',$1))[0];
+ $install_list = $install_list . " -install -m \$(INSTMODE) $1\n";
+ $ifile =~ s/.*\///g;
+ $uninstall_list = $uninstall_list . " -rm $idir/$ifile\n";
+ }
+ }
+ elsif ($line =~ /\/\* \$CopyInstall: (.*?) \*\//i)
+ {
+ if (!exists($existing_install_list{$1}))
+ {
+ $existing_install_list{$1} = 1;
+ $idir = (split(' ',$1))[1];
+ $ifile = (split(' ',$1))[0];
+ $install_list = $install_list . " -cp $1\n";
+ $ifile =~ s/.*\///g;
+ $uninstall_list = $uninstall_list . " -rm $idir/$ifile\n";
}
}
}
+ close CPP;
}
- close CPP;
}
+ closedir(DIRHANDLE);
+ print " done!\n";
}
- closedir(DIRHANDLE);
- print " done!\n";
$freebsd4libs = $config{CRAQ};
$all = $all . $filelist{$cpp} . "." . $libraryext . " ";
$all_libsonly = $all_libsonly . $filelist{$cpp} . "." . $libraryext . " ";
$install_list = $install_list . " -install -m \$(INSTMODE) src/" . $filelist{$cpp} . "." . $libraryext . " \$(LIBPATH)\n";
+ $uninstall_list = $uninstall_list . " -rm \$(LIBPATH)/" . $filelist{$cpp} . "." . $libraryext . "\n";
}
$all = $all . "moo inspircd\n";
projects / user / henk / code / inspircd.git / blobdiff