summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--install.js20
-rw-r--r--src/core/Makefile.win324
-rw-r--r--src/init.c7
-rw-r--r--src/makefile.win325
-rw-r--r--src/modules/makefile.sub.win324
-rw-r--r--src/modules/makefile.win324
-rw-r--r--src/protocol/Makefile.win324
-rw-r--r--version.log7
8 files changed, 34 insertions, 21 deletions
diff --git a/install.js b/install.js
index 35d9c6d5b..a68011eb4 100644
--- a/install.js
+++ b/install.js
@@ -161,16 +161,16 @@ var buildPackages = [
var mysqlVersions = [
- {
- 'name' : 'MySQL 5.1',
- 'libpaths' : [
- 'Program Files\\MySQL\\MySQL Server 5.1\\Lib\\opt'
- ],
- 'incpaths' : [
- 'Program Files\\MySQL\\MySQL Server 5.1\\Include'
- ],
- 'dllfile' : 'Program Files\\MySQL\\MySQL Server 5.1\\bin\\libmyql.dll'
- },
+ {
+ 'name' : 'MySQL 5.1',
+ 'libpaths' : [
+ 'Program Files\\MySQL\\MySQL Server 5.1\\Lib\\opt'
+ ],
+ 'incpaths' : [
+ 'Program Files\\MySQL\\MySQL Server 5.1\\Include'
+ ],
+ 'dllfile' : 'Program Files\\MySQL\\MySQL Server 5.1\\bin\\libmyql.dll'
+ },
{
'name' : 'MySQL 5.0',
diff --git a/src/core/Makefile.win32 b/src/core/Makefile.win32
index f6ca69d9d..3cda24070 100644
--- a/src/core/Makefile.win32
+++ b/src/core/Makefile.win32
@@ -11,13 +11,13 @@ all: $(OBJECTS)
distclean: clean spotless
.c.dll:
- $(CC) $(CFLAGS) $< $(LFLAGS)
+ $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
clean:
-@del *.obj
spotless: clean
- -@del *.dll *.lib *.exp
+ -@del *.dll *.lib *.exp *.manifest
install:
-@mkdir ..\..\$(DATDEST)\modules
diff --git a/src/init.c b/src/init.c
index 1d0f85c91..e83cab176 100644
--- a/src/init.c
+++ b/src/init.c
@@ -529,6 +529,7 @@ int init_secondary(int ac, char **av)
* panic as necessary, and ignore all others.
*/
+#ifndef _WIN32
#if defined(NSIG)
for (i = 1; i <= NSIG - 1; i++) {
#else
@@ -536,6 +537,12 @@ int init_secondary(int ac, char **av)
#endif
signal(i, SIG_IGN);
}
+#else
+ /* work around to bug #527 */
+ signal(SIGILL, SIG_IGN);
+ signal(SIGBREAK, SIG_IGN);
+ signal(SIGABRT, SIG_IGN);
+#endif
signal(SIGINT, sighandler);
signal(SIGTERM, sighandler);
diff --git a/src/makefile.win32 b/src/makefile.win32
index 45aefa1a8..ec76d30c1 100644
--- a/src/makefile.win32
+++ b/src/makefile.win32
@@ -20,14 +20,14 @@ include ../Makefile.inc.win32
OBJS = actions.obj base64.obj botserv.obj channels.obj chanserv.obj commands.obj compat.obj \
config.obj datafiles.obj encrypt.obj events.obj helpserv.obj hostserv.obj \
init.obj ircd.obj language.obj list.obj log.obj mail.obj main.obj memory.obj \
- memoserv.obj messages.obj misc.obj modules.obj news.obj nickserv.obj operserv.obj \
+ memoserv.obj messages.obj misc.obj modules.obj mod_version.obj news.obj nickserv.obj operserv.obj \
process.obj send.obj servers.obj sessions.obj slist.obj sockutil.obj \
timeout.obj users.obj $(RDB_O) $(MYSQL_O)
SRCS = actions.c base64.c botserv.c channels.c chanserv.c commands.c compat.c \
config.c datafiles.c encrypt.c events.c helpserv.c hostserv.c init.c ircd.c \
language.c list.c log.c mail.c main.c memory.c memoserv.c messages.c misc.c \
- modules.c news.c nickserv.c operserv.c process.c send.c servers.obj sessions.c \
+ modules.c mod_version.c news.c nickserv.c operserv.c process.c send.c servers.obj sessions.c \
slist.c sockutil.c timeout.c users.c $(RDB_C) $(MYSQL_C)
###########################################################################
@@ -81,6 +81,7 @@ memory.obj: memory.c ..\include\services.h
memoserv.obj: memoserv.c ..\include\services.h ..\include\pseudo.h
messages.obj: messages.c ..\include\services.h ..\include\messages.h ..\include\language.h
modules.obj: modules.c ..\include\modules.h ..\include\language.h ..\include\version.h
+mod_version.obj: mod_version.c ..\include\modules.h ..\include\version.h
misc.obj: misc.c ..\include\services.h ..\include\language.h
news.obj: news.c ..\include\services.h ..\include\pseudo.h
nickserv.obj: nickserv.c ..\include\services.h ..\include\pseudo.h
diff --git a/src/modules/makefile.sub.win32 b/src/modules/makefile.sub.win32
index 0d0f41069..4a811622e 100644
--- a/src/modules/makefile.sub.win32
+++ b/src/modules/makefile.sub.win32
@@ -5,7 +5,7 @@ CFLAGS=/nologo /LD /MD /D MODULE_COMPILE $(CFLAGS) /I"../../../include" /I "../"
LFLAGS=/nologo ../../anope.lib wsock32.lib $(LIBS) $(LFLAGS) $(MYSQL_LIB_PATH) /export:AnopeInit /export:AnopeFini /OUT:$(TARGET)
all:
- $(CC) $(SRCS) $(CFLAGS) /link $(LFLAGS)
+ $(CC) $(SRCS) $(CFLAGS) ..\..\mod_version.c /link $(LFLAGS)
distclean: clean spotless
@@ -13,7 +13,7 @@ clean:
-@del *.obj
spotless: clean
- -@del *.dll *.lib *.exp
+ -@del *.dll *.lib *.exp *.manifest
install:
-@copy *.dll ..\..\..\$(DATDEST)\modules
diff --git a/src/modules/makefile.win32 b/src/modules/makefile.win32
index 61a3e250a..038ff25ba 100644
--- a/src/modules/makefile.win32
+++ b/src/modules/makefile.win32
@@ -10,7 +10,7 @@ all: $(OBJECTS) subs
distclean: clean spotless
.c.dll:
- $(CC) $(CFLAGS) $(IRCTYPE) $< $(LFLAGS)
+ $(CC) $(CFLAGS) $(IRCTYPE) $< ..\mod_version.c $(LFLAGS)
subs:
@for %i in ( $(SUBS) ); do \
@@ -24,7 +24,7 @@ subs-clean:
@if exist %i; @cd %i && $(MAKE) $(MAKEARGS) clean && cd ..
spotless: clean subs-spotless
- -@del *.dll *.lib *.exp
+ -@del *.dll *.lib *.exp *.manifest
subs-spotless:
@for %i in ( $(SUBS) ); do \
diff --git a/src/protocol/Makefile.win32 b/src/protocol/Makefile.win32
index cfcefd9b4..ab183702f 100644
--- a/src/protocol/Makefile.win32
+++ b/src/protocol/Makefile.win32
@@ -12,13 +12,13 @@ all: $(OBJECTS)
distclean: clean spotless
.c.dll:
- $(CC) $(CFLAGS) $< $(LFLAGS)
+ $(CC) $(CFLAGS) $< ..\mod_version.c $(LFLAGS)
clean:
-@del *.obj
spotless: clean
- -@del *.dll *.lib *.exp
+ -@del *.dll *.lib *.exp *.manifest
install:
-@mkdir ..\..\$(DATDEST)\modules
diff --git a/version.log b/version.log
index 3bfc7c31b..8474814b2 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,15 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="14"
VERSION_EXTRA=""
-VERSION_BUILD="1077"
+VERSION_BUILD="1078"
# $Log$
#
+# BUILD : 1.7.14 (1078)
+# BUGS : 527
+# NOTES : Applied path from heinz for... 1) fixes bug 527 2) adds mod version to windows stuff 3) fixes some ugly indentation in install.js 4) cleans up manifest files on spotless
+#
+#
# BUILD : 1.7.14 (1077)
# BUGS : N/A
# NOTES : renamed set_key to chan_set_key, modified modules Makefiles to not link against anope libs (its unneeded)
generated by cgit (git 2.34.1) at 2025-06-20 02:30:52 +0000