Merge inspircd_{config,version}.h into a single header file.

diff --git a/.gitignore b/.gitignore
index 3a5fef871f2a5cad3eb88952845a95ca4dffdd9a..4e53a077a57a0d90a1eb639bfde1d3715b2bee55 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,8 +11,7 @@
 /run
 /bin
 
-/include/inspircd_config.h
-/include/inspircd_version.h
+/include/config.h
 
 /src/modules/m_geoip.cpp
 /src/modules/m_ldapauth.cpp

diff --git a/configure b/configure
index 32ac8f40fa19a7e58bb24702c88d90c897a94698..3e5b517c6d2aff9c85ecf87daca83620d63f5f05 100755 (executable)
--- a/configure
+++ b/configure
@@ -861,7 +861,7 @@ my ($mliflags, $mfrules, $mobjs, $mfcount) = ("", "", "", 0);
 
 sub writefiles {
        my($writeheader) = @_;
-       # First File.. inspircd_config.h
+       # First File.. config.h
        chomp(my $incos = `uname -n -s -r`);
        chomp(my $version = `sh src/version.sh`);
        chomp(my $revision2 = getrevision());
@@ -872,16 +872,17 @@ sub writefiles {
        }
        if ($writeheader == 1)
        {
-               print "Writing \e[1;32minspircd_config.h\e[0m\n";
-               open(FILEHANDLE, ">include/inspircd_config.h.tmp");
+               print "Writing \e[1;32mconfig.h\e[0m\n";
+               open(FILEHANDLE, ">include/config.h.tmp");
                print FILEHANDLE <<EOF;
 /* Auto generated by configure, do not modify! */
 #ifndef __CONFIGURATION_AUTO__
 #define __CONFIGURATION_AUTO__
 
-/* this is for windows support. */
-#define CoreExport /**/
-#define DllExport /**/
+#define BRANCH "$branch"
+#define VERSION "$version"
+#define REVISION "$revision2"
+#define SYSTEM "$incos"
 
 #define CONFIG_PATH "$config{CONFIG_DIR}"
 #define DATA_PATH "$config{DATA_DIR}"
@@ -947,38 +948,28 @@ print FILEHANDLE "#define MAXBUF " . ($config{MAXBUF}+2) . "\n";
                }
                print FILEHANDLE "\n#include \"threadengines/threadengine_pthread.h\"\n\n#endif\n";
                close(FILEHANDLE);
-
-               open(FILEHANDLE, ">include/inspircd_version.h.tmp");
-               print FILEHANDLE <<EOF;
-#define BRANCH "$branch"
-#define VERSION "$version"
-#define REVISION "$revision2"
-#define SYSTEM "$incos"
-EOF
-               close FILEHANDLE;
-
-               for my $file (qw(include/inspircd_config.h include/inspircd_version.h)) {
-                       my $diff = 0;
-                       open my $fh1, $file or $diff = 1;
-                       open my $fh2, $file.'.tmp' or die "Can't read $file.tmp that we just wrote: $!";
-                       while (!$diff) {
-                               my $line1 = <$fh1>;
-                               my $line2 = <$fh2>;
-                               if (defined($line1) != defined($line2)) {
-                                       $diff = 1;
-                               } elsif (!defined $line1) {
-                                       last;
-                               } else {
-                                       $diff = ($line1 ne $line2);
-                               }
-                       }
-                       if ($diff) {
-                               unlink $file;
-                               rename "$file.tmp", $file;
+               
+               my $file = 'include/config.h';
+               my $diff = 0;
+               open my $fh1, $file or $diff = 1;
+               open my $fh2, $file.'.tmp' or die "Can't read $file.tmp that we just wrote: $!";
+               while (!$diff) {
+                       my $line1 = <$fh1>;
+                       my $line2 = <$fh2>;
+                       if (defined($line1) != defined($line2)) {
+                               $diff = 1;
+                       } elsif (!defined $line1) {
+                               last;
                        } else {
-                               unlink "$file.tmp";
+                               $diff = ($line1 ne $line2);
                        }
                }
+               if ($diff) {
+                       unlink $file;
+                       rename "$file.tmp", $file;
+               } else {
+                       unlink "$file.tmp";
+               }
        }
 
        # Write all .in files.

diff --git a/include/inspircd.h b/include/inspircd.h
index 2e1cfbd21307270da775b569151136795c1e715b..1ca3d077b13cdf0324f43460f417b3cc8955f939 100644 (file)
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -81,8 +81,7 @@
 #include <bitset>
 #include <set>
 #include <time.h>
-#include "inspircd_config.h"
-#include "inspircd_version.h"
+#include "config.h"
 #include "typedefs.h"
 #include "consolecolors.h"
 

diff --git a/include/inspstring.h b/include/inspstring.h
index a6ef5e552869da601f05ecd8bbbad0eb6b8bf63c..494ce92b156a250acc671b98093047f744519235 100644 (file)
--- a/include/inspstring.h
+++ b/include/inspstring.h
@@ -21,8 +21,8 @@
 #ifndef INSPSTRING_H
 #define INSPSTRING_H
 
-// This (inspircd_config) is needed as inspstring doesn't pull in the central header
-#include "inspircd_config.h"
+// This (config) is needed as inspstring doesn't pull in the central header
+#include "config.h"
 #include <cstring>
 //#include <cstddef>
 

diff --git a/include/socketengine.h b/include/socketengine.h
index 643bceee5571d404f12fdb6f46925b6e51bcfa40..58af73589fd0fd121b06a3f341f6f18e2a894580 100644 (file)
--- a/include/socketengine.h
+++ b/include/socketengine.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
+#include "config.h"
 #include "socket.h"
 #include "base.h"
 

diff --git a/include/threadengine.h b/include/threadengine.h
index 4bf5a48f38399a94d367989f405f9bff213f5936..e0ed9ec405b006b428c54afce1d32c3bc396267e 100644 (file)
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -24,7 +24,7 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
+#include "config.h"
 #include "base.h"
 
 class ThreadData;

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index f068ac70785ff35a3152bc65535b103f854fcc6f..2fdcac5650ccb400bdb214886889fd35d7eee739 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -21,7 +21,7 @@
 #ifndef THREADENGINE_WIN32_H
 #define THREADENGINE_WIN32_H
 
-#include "inspircd_config.h"
+#include "config.h"
 #include "base.h"
 
 class Thread;

diff --git a/make/calcdep.pl b/make/calcdep.pl
index 4a759a24a163692ca19682cad0abb44ecc7ff11c..e578f585c4ff8a35018b156bebfee32674e5f32f 100755 (executable)
--- a/make/calcdep.pl
+++ b/make/calcdep.pl
@@ -199,7 +199,7 @@ sub gendep($) {
        while (<$in>) {
                if (/^\s*#\s*include\s*"([^"]+)"/) {
                        my $inc = $1;
-                       next if $inc eq 'inspircd_version.h' && $f eq '../include/inspircd.h';
+                       next if $inc eq 'config.h' && $f eq '../include/inspircd.h';
                        my $found = 0;
                        for my $loc ("$basedir/$inc", "../include/$inc") {
                                next unless -e $loc;

diff --git a/make/template/main.mk b/make/template/main.mk
index 32b7e4803ede73b8e913fcad92ea774be49acf92..4930fa7e3963e7dc2e61939c84993c16538b3b05 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -276,8 +276,7 @@ configureclean:
        rm -f .config.cache
        rm -f BSDmakefile
        rm -f GNUmakefile
-       rm -f include/inspircd_config.h
-       rm -f include/inspircd_version.h
+       rm -f include/config.h
        rm -f inspircd
        -rm -f org.inspircd.plist
 

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c349083788e83977bd6190674cd50b0f800c5779..cccf3fe893ecd1a5204a0db42e9787c454c68c69 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -28,7 +28,6 @@
 
 /* $Core */
 #include "inspircd.h"
-#include "inspircd_version.h"
 #include <signal.h>
 
 #ifndef _WIN32

diff --git a/src/server.cpp b/src/server.cpp
index 691ab3842f7d1c455d06577fcb90d9b40cbfcff2..6a46034409962144af5106ba1c294c6aaf5a6159 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -23,7 +23,6 @@
 #include <signal.h>
 #include "exitcodes.h"
 #include "inspircd.h"
-#include "inspircd_version.h"
 
 void InspIRCd::SignalHandler(int signal)
 {

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 5c361a0cbded453bd9a913f957f4ff31ff02ad73..7d2f4d5656083ac0b0363402d7207e0fd9743074 100644 (file)
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -20,9 +20,6 @@
  */
 
 
-#include "inspircd.h"
-#include "exitcodes.h"
-
 #ifndef SOCKETENGINE_POLL
 #define SOCKETENGINE_POLL
 
@@ -30,7 +27,7 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
+#include "config.h"
 #include "inspircd.h"
 #include "socketengine.h"
 

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index 52d799ddf286d2689d33879b383e6ff90d2e5c8f..58d069886a911af4976762569d631017c6c5d2d5 100644 (file)
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -32,7 +32,6 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "socketengine.h"
 #include <port.h>

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index eba54a7cb27b1dd8e42dfa82faf8e6ffe225532e..02ab077ca639c3b77066794f064dfe68770ae71d 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -18,8 +18,6 @@
  */
 
 
-#include "inspircd_config.h"
-
 #include "inspircd.h"
 #include "socketengine.h"
 

diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index f26b9a6c7cbfd9f90fc8f411a0599e139e2e0fb9..827ef1c906e3c80e29b6c1a48f526c33fd8c0322 100644 (file)
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -56,8 +56,7 @@ if(MSVC)
 endif(MSVC)
 
 configure_file("${INSPIRCD_BASE}/win/inspircd.rc.cmake" "${INSPIRCD_BASE}/win/inspircd.rc")
-configure_file("${INSPIRCD_BASE}/win/inspircd_version.h.cmake" "${INSPIRCD_BASE}/win/inspircd_version.h")
-configure_file("${INSPIRCD_BASE}/win/inspircd_config.h.cmake" "${INSPIRCD_BASE}/win/inspircd_config.h")
+configure_file("${INSPIRCD_BASE}/win/config.h.cmake" "${INSPIRCD_BASE}/win/config.h")
 
 add_executable(inspircd ${INSPIRCD_SOURCES} "${INSPIRCD_BASE}/win/inspircd.rc")
 target_link_libraries(inspircd win32_memory)

diff --git a/win/config.h.cmake b/win/config.h.cmake
new file mode 100644 (file)
index 0000000..47cdb9f
--- /dev/null
+++ b/win/config.h.cmake
@@ -0,0 +1,18 @@
+#ifndef INSPIRCD_CONFIG_H\r
+#define INSPIRCD_CONFIG_H\r
+\r
+#define BRANCH "@MAJOR_VERSION@.@MINOR_VERSION@"\r
+#define VERSION "@FULL_VERSION@"\r
+#define REVISION "0"\r
+#define SYSTEM "@CMAKE_SYSTEM@"\r
+\r
+#define CONFIG_PATH "@CONF_PATH@"\r
+#define MOD_PATH "@MODULE_PATH@"\r
+#define DATA_PATH "@DATA_PATH@"\r
+#define LOG_PATH "@LOG_PATH@"\r
+#define MAXBUF 514\r
+\r
+#include "inspircd_win32wrapper.h"\r
+#include "threadengines/threadengine_win32.h"\r
+\r
+#endif
\ No newline at end of file

diff --git a/win/inspircd_config.h.cmake b/win/inspircd_config.h.cmake
deleted file mode 100644 (file)
index f98cd39..0000000
--- a/win/inspircd_config.h.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef INSPIRCD_CONFIG_H\r
-#define INSPIRCD_CONFIG_H\r
-\r
-#define CONFIG_PATH "@CONF_PATH@"\r
-#define MOD_PATH "@MODULE_PATH@"\r
-#define DATA_PATH "@DATA_PATH@"\r
-#define LOG_PATH "@LOG_PATH@"\r
-#define MAXBUF 514\r
-\r
-#include "inspircd_win32wrapper.h"\r
-#include "threadengines/threadengine_win32.h"\r
-\r
-#endif
\ No newline at end of file

diff --git a/win/inspircd_version.h.cmake b/win/inspircd_version.h.cmake
deleted file mode 100644 (file)
index 1aec12b..0000000
--- a/win/inspircd_version.h.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-#define BRANCH "@MAJOR_VERSION@.@MINOR_VERSION@"\r
-#define VERSION "@FULL_VERSION@"\r
-#define REVISION "0"\r
-#define SYSTEM "@CMAKE_SYSTEM@"
\ No newline at end of file

diff --git a/win/win32service.cpp b/win/win32service.cpp
index c34e9957d318d6bfaa020fbb690e856733e088d2..d06ad1838d81e9a606814d0670c3f0e94f7ff96c 100644 (file)
--- a/win/win32service.cpp
+++ b/win/win32service.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#include "inspircd_config.h"
+#include "config.h"
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <windows.h>