[NeoStats-Devel] [Commits] r2642 - in trunk: . protocol src src/dbm src/protocol
[email protected] Wed, 6 Jul 2005 21:19:46 +1000
Newsgroups
gmane.comp.neostats.devel
Message-ID
<[email protected] >
Author: Fish
Date: Wed Jul 6 19:19:40 2005
New Revision: 2642
Added:
trunk/protocol/
- copied from r2638, trunk/src/protocol/
trunk/protocol/Makefile.am
- copied unchanged from r2641, trunk/src/protocol/Makefile.am
trunk/protocol/Makefile.in
- copied, changed from r2641, trunk/src/protocol/Makefile.in
trunk/protocol/asuka.c
- copied unchanged from r2641, trunk/src/protocol/asuka.c
trunk/protocol/asuka.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/asuka.vcproj
trunk/protocol/bahamut14.c
- copied unchanged from r2641, trunk/src/protocol/bahamut14.c
trunk/protocol/bahamut14.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/bahamut14.vcproj
trunk/protocol/bahamut18.c
- copied unchanged from r2641, trunk/src/protocol/bahamut18.c
trunk/protocol/bahamut18.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/bahamut18.vcproj
trunk/protocol/client.c
- copied unchanged from r2641, trunk/src/protocol/client.c
trunk/protocol/client.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/client.vcproj
trunk/protocol/hybrid6.c
- copied unchanged from r2641, trunk/src/protocol/hybrid6.c
trunk/protocol/hybrid6.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/hybrid6.vcproj
trunk/protocol/hybrid7.c
- copied unchanged from r2641, trunk/src/protocol/hybrid7.c
trunk/protocol/hybrid7.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/hybrid7.vcproj
trunk/protocol/ircup10.c
- copied unchanged from r2641, trunk/src/protocol/ircup10.c
trunk/protocol/ircup10.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/ircup10.vcproj
trunk/protocol/ircup10base.c
- copied unchanged from r2641, trunk/src/protocol/ircup10base.c
trunk/protocol/nefarious.c
- copied unchanged from r2641, trunk/src/protocol/nefarious.c
trunk/protocol/nefarious.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/nefarious.vcproj
trunk/protocol/plexus.c
- copied unchanged from r2641, trunk/src/protocol/plexus.c
trunk/protocol/plexus.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/plexus.vcproj
trunk/protocol/protocol.txt
- copied unchanged from r2641, trunk/src/protocol/protocol.txt
trunk/protocol/ultimate2.c
- copied unchanged from r2641, trunk/src/protocol/ultimate2.c
trunk/protocol/ultimate2.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/ultimate2.vcproj
trunk/protocol/ultimate3.c
- copied unchanged from r2641, trunk/src/protocol/ultimate3.c
trunk/protocol/ultimate3.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/ultimate3.vcproj
trunk/protocol/unreal31.c
- copied unchanged from r2641, trunk/src/protocol/unreal31.c
trunk/protocol/unreal31.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/unreal31.vcproj
trunk/protocol/unreal32.c
- copied unchanged from r2641, trunk/src/protocol/unreal32.c
trunk/protocol/unreal32.vcproj (props changed)
- copied unchanged from r2641, trunk/src/protocol/unreal32.vcproj
Removed:
trunk/src/dbm/
trunk/src/protocol/
Modified:
trunk/ChangeLog
trunk/INSTNOTES (props changed)
trunk/INSTNOTES.svn (props changed)
trunk/Makefile.am
trunk/Makefile.in
trunk/README.win32 (props changed)
trunk/configure
trunk/configure.in
trunk/neostats.sln (props changed)
trunk/neostatslibs.sln (props changed)
trunk/src/Makefile.am
trunk/src/Makefile.in
trunk/src/bans.c (props changed)
trunk/src/bots.c (props changed)
trunk/src/commands.c (props changed)
trunk/src/neostats.vcproj (props changed)
trunk/src/nsdba.c (props changed)
trunk/src/perl.c (contents, props changed)
Log:
change source layout to not rebuild protocol and dbm files all the time (pass 3)
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Wed Jul 6 19:19:40 2005
@@ -4,6 +4,8 @@
Fish (F), Mark (M), DeadNotBuried (D)
===============================================================================
* NeoStats * Version 3.0.a3-dev
+ - Change Source Layout, so we don't go and rebuild protocol and DB files
+ all the time
- Implement framework for Perl Support (F)
- Fix warnings that GCC 4.0 generates (F)
- LimitServ: set minimum limit settable by LimitServ to Users + 1 (D)
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Wed Jul 6 19:19:40 2005
@@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = include lib src modules
+SUBDIRS = include lib src modules protocol
ACLOCAL_AMFLAGS = -I autotools
AM_MAKEFLAGS = -s
dist_bin_SCRIPTS = makeconf
Modified: trunk/Makefile.in
==============================================================================
--- trunk/Makefile.in (original)
+++ trunk/Makefile.in Wed Jul 6 19:19:40 2005
@@ -224,7 +224,7 @@
unamepath = @unamepath@
wi_PWD = @wi_PWD@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = include lib src modules
+SUBDIRS = include lib src modules protocol
ACLOCAL_AMFLAGS = -I autotools
AM_MAKEFLAGS = -s
dist_bin_SCRIPTS = makeconf
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jul 6 19:19:40 2005
@@ -28538,7 +28538,7 @@
- ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile src/protocol/Makefile src/dbm/Makefile src/dbm/bdb/Makefile src/dbm/gdbm/Makefile lib/Makefile lib/curl/Makefile lib/pcre/Makefile lib/event/Makefile modules/Makefile modules/connectserv/Makefile modules/extauth/Makefile modules/hostserv/Makefile modules/ircdauth/Makefile modules/statserv/Makefile modules/textserv/Makefile modules/quoteserv/Makefile modules/limitserv/Makefile modules/operlog/Makefile modules/dccpartyline/Makefile neostats"
+ ac_config_files="$ac_config_files Makefile include/Makefile src/Makefile protocol/Makefile lib/dbm/Makefile lib/dbm/bdb/Makefile lib/dbm/gdbm/Makefile lib/Makefile lib/curl/Makefile lib/pcre/Makefile lib/event/Makefile modules/Makefile modules/connectserv/Makefile modules/extauth/Makefile modules/hostserv/Makefile modules/ircdauth/Makefile modules/statserv/Makefile modules/textserv/Makefile modules/quoteserv/Makefile modules/limitserv/Makefile modules/operlog/Makefile modules/dccpartyline/Makefile neostats"
cat >confcache <<\_ACEOF
@@ -29182,10 +29182,10 @@
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "src/protocol/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/protocol/Makefile" ;;
- "src/dbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dbm/Makefile" ;;
- "src/dbm/bdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dbm/bdb/Makefile" ;;
- "src/dbm/gdbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/dbm/gdbm/Makefile" ;;
+ "protocol/Makefile" ) CONFIG_FILES="$CONFIG_FILES protocol/Makefile" ;;
+ "lib/dbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dbm/Makefile" ;;
+ "lib/dbm/bdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dbm/bdb/Makefile" ;;
+ "lib/dbm/gdbm/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/dbm/gdbm/Makefile" ;;
"lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"lib/curl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/curl/Makefile" ;;
"lib/pcre/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/pcre/Makefile" ;;
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Jul 6 19:19:40 2005
@@ -425,10 +425,10 @@
AC_CONFIG_FILES([Makefile
include/Makefile
src/Makefile
- src/protocol/Makefile
- src/dbm/Makefile
- src/dbm/bdb/Makefile
- src/dbm/gdbm/Makefile
+ protocol/Makefile
+ lib/dbm/Makefile
+ lib/dbm/bdb/Makefile
+ lib/dbm/gdbm/Makefile
lib/Makefile
lib/curl/Makefile
lib/pcre/Makefile
Copied: trunk/protocol/Makefile.in (from r2641, trunk/src/protocol/Makefile.in)
==============================================================================
--- trunk/src/protocol/Makefile.in (original)
+++ trunk/protocol/Makefile.in Wed Jul 6 19:19:40 2005
@@ -21,7 +21,7 @@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+top_builddir = ..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
@@ -39,7 +39,7 @@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/autotools/rules.mk
-subdir = src/protocol
+subdir = protocol
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/acinclude.m4 \
$(top_srcdir)/autotools/ax_maintainer_mode_auto_silent.m4 \
@@ -294,9 +294,9 @@
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/protocol/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu protocol/Makefile'; \
cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/protocol/Makefile
+ $(AUTOMAKE) --gnu protocol/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -437,7 +437,7 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/../../autotools
+ $(mkdir_p) $(distdir)/../autotools
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Jul 6 19:19:40 2005
@@ -1,5 +1,3 @@
-SUBDIRS = dbm protocol
-
bin_PROGRAMS = neostats
neostats_SOURCES = auth.c bans.c bots.c channels.c commands.c confuse.c confuselexer.c nsdba.c \
Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in (original)
+++ trunk/src/Makefile.in Wed Jul 6 19:19:40 2005
@@ -102,16 +102,9 @@
CCLD = $(CC)
SOURCES = $(neostats_SOURCES)
DIST_SOURCES = $(am__neostats_SOURCES_DIST)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibdir = $(prefix)/modules
ACLOCAL = @ACLOCAL@
@@ -242,7 +235,6 @@
target_alias = @target_alias@
unamepath = @unamepath@
wi_PWD = @wi_PWD@
-SUBDIRS = dbm protocol
neostats_SOURCES = auth.c bans.c bots.c channels.c commands.c \
confuse.c confuselexer.c nsdba.c conf.c dl.c dns.c exclude.c \
hash.c ircstring.c ircprotocol.c ircsend.c ircrecv.c lang.c \
@@ -264,7 +256,7 @@
LINK = $(LIBTOOL) --tag=CXX --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-all: all-recursive
+all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -388,65 +380,6 @@
-rm -f libtool
uninstall-info-am:
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
- @set fnord $$MAKEFLAGS; amf=$$2; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -457,23 +390,10 @@
mkid -fID $$unique
tags: TAGS
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -486,7 +406,7 @@
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
@@ -536,38 +456,22 @@
|| exit 1; \
fi; \
done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- distdir) \
- || exit 1; \
- fi; \
- done
check-am: all-am
-check: check-recursive
+check: check-am
all-am: Makefile $(PROGRAMS) $(HEADERS)
-installdirs: installdirs-recursive
-installdirs-am:
+installdirs:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-recursive
+installcheck: installcheck-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -583,23 +487,23 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
+clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-distclean: distclean-recursive
+distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-libtool distclean-tags
-dvi: dvi-recursive
+dvi: dvi-am
dvi-am:
-html: html-recursive
+html: html-am
-info: info-recursive
+info: info-am
info-am:
@@ -607,47 +511,42 @@
install-exec-am: install-binPROGRAMS
-install-info: install-info-recursive
+install-info: install-info-am
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-recursive
+maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-recursive
+mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
-pdf: pdf-recursive
+pdf: pdf-am
pdf-am:
-ps: ps-recursive
+ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- clean clean-binPROGRAMS clean-generic clean-libtool \
- clean-recursive ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-info-am
Modified: trunk/src/perl.c
==============================================================================
--- trunk/src/perl.c (original)
+++ trunk/src/perl.c Wed Jul 6 19:19:40 2005
@@ -18,7 +18,7 @@
** USA
**
** NeoStats CVS Identification
-** $Id: updates.c 2632 2005-06-11 06:09:46Z Fish $
+** $Id$
*/
/* @file NeoStats interface to Perl Interpreter