[NeoStats-Devel] [Commits] r2569 - trunk/src/protocol

[email protected]
Newsgroups gmane.comp.neostats.devel
Message-ID <[email protected]> 
Author: Mark
Date: Mon Apr 25 04:59:22 2005
New Revision: 2569

Added:
   trunk/src/protocol/hybrid6.c   (contents, props changed)
   trunk/src/protocol/hybrid6.vcproj   (contents, props changed)
Modified:
   trunk/src/protocol/Makefile.am
   trunk/src/protocol/Makefile.in
   trunk/src/protocol/ultimate3.c
Log:
add framework for hybrid6

Modified: trunk/src/protocol/Makefile.am
==============================================================================
--- trunk/src/protocol/Makefile.am	(original)
+++ trunk/src/protocol/Makefile.am	Mon Apr 25 04:59:22 2005
@@ -1,11 +1,15 @@
-pkglib_LTLIBRARIES	= bahamut14.la bahamut18.la client.la hybrid7.la \
+pkglib_LTLIBRARIES	= bahamut14.la bahamut18.la \
+						client.la \
+						hybrid6.la hybrid7.la \
 						ircup10.la asuka.la nefarious.la \
 						plexus.la \
-						ultimate2.la ultimate3.la unreal31.la unreal32.la
+						ultimate2.la ultimate3.la \
+						unreal31.la unreal32.la
 bahamut14_la_SOURCES = bahamut14.c
 bahamut18_la_SOURCES = bahamut18.c
 client_la_SOURCES = client.c
 hybrid7_la_SOURCES = hybrid7.c
+hybrid6_la_SOURCES = hybrid6.c
 ircup10_la_SOURCES = ircup10.c
 asuka_la_SOURCES = asuka.c
 nefarious_la_SOURCES = nefarious.c

Modified: trunk/src/protocol/Makefile.in
==============================================================================
--- trunk/src/protocol/Makefile.in	(original)
+++ trunk/src/protocol/Makefile.in	Mon Apr 25 04:59:22 2005
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-SOURCES = $(asuka_la_SOURCES) $(bahamut14_la_SOURCES) $(bahamut18_la_SOURCES) $(client_la_SOURCES) $(hybrid7_la_SOURCES) $(ircup10_la_SOURCES) $(nefarious_la_SOURCES) $(plexus_la_SOURCES) $(ultimate2_la_SOURCES) $(ultimate3_la_SOURCES) $(unreal31_la_SOURCES) $(unreal32_la_SOURCES)
+SOURCES = $(asuka_la_SOURCES) $(bahamut14_la_SOURCES) $(bahamut18_la_SOURCES) $(client_la_SOURCES) $(hybrid6_la_SOURCES) $(hybrid7_la_SOURCES) $(ircup10_la_SOURCES) $(nefarious_la_SOURCES) $(plexus_la_SOURCES) $(ultimate2_la_SOURCES) $(ultimate3_la_SOURCES) $(unreal31_la_SOURCES) $(unreal32_la_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -73,6 +73,9 @@
 client_la_LIBADD =
 am_client_la_OBJECTS = client.lo
 client_la_OBJECTS = $(am_client_la_OBJECTS)
+hybrid6_la_LIBADD =
+am_hybrid6_la_OBJECTS = hybrid6.lo
+hybrid6_la_OBJECTS = $(am_hybrid6_la_OBJECTS)
 hybrid7_la_LIBADD =
 am_hybrid7_la_OBJECTS = hybrid7.lo
 hybrid7_la_OBJECTS = $(am_hybrid7_la_OBJECTS)
@@ -108,16 +111,18 @@
 CCLD = $(CC)
 SOURCES = $(asuka_la_SOURCES) $(bahamut14_la_SOURCES) \
 	$(bahamut18_la_SOURCES) $(client_la_SOURCES) \
-	$(hybrid7_la_SOURCES) $(ircup10_la_SOURCES) \
-	$(nefarious_la_SOURCES) $(plexus_la_SOURCES) \
-	$(ultimate2_la_SOURCES) $(ultimate3_la_SOURCES) \
-	$(unreal31_la_SOURCES) $(unreal32_la_SOURCES)
+	$(hybrid6_la_SOURCES) $(hybrid7_la_SOURCES) \
+	$(ircup10_la_SOURCES) $(nefarious_la_SOURCES) \
+	$(plexus_la_SOURCES) $(ultimate2_la_SOURCES) \
+	$(ultimate3_la_SOURCES) $(unreal31_la_SOURCES) \
+	$(unreal32_la_SOURCES)
 DIST_SOURCES = $(asuka_la_SOURCES) $(bahamut14_la_SOURCES) \
 	$(bahamut18_la_SOURCES) $(client_la_SOURCES) \
-	$(hybrid7_la_SOURCES) $(ircup10_la_SOURCES) \
-	$(nefarious_la_SOURCES) $(plexus_la_SOURCES) \
-	$(ultimate2_la_SOURCES) $(ultimate3_la_SOURCES) \
-	$(unreal31_la_SOURCES) $(unreal32_la_SOURCES)
+	$(hybrid6_la_SOURCES) $(hybrid7_la_SOURCES) \
+	$(ircup10_la_SOURCES) $(nefarious_la_SOURCES) \
+	$(plexus_la_SOURCES) $(ultimate2_la_SOURCES) \
+	$(ultimate3_la_SOURCES) $(unreal31_la_SOURCES) \
+	$(unreal32_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -243,15 +248,19 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 wi_PWD = @wi_PWD@
-pkglib_LTLIBRARIES = bahamut14.la bahamut18.la client.la hybrid7.la \
+pkglib_LTLIBRARIES = bahamut14.la bahamut18.la \
+						client.la \
+						hybrid6.la hybrid7.la \
 						ircup10.la asuka.la nefarious.la \
 						plexus.la \
-						ultimate2.la ultimate3.la unreal31.la unreal32.la
+						ultimate2.la ultimate3.la \
+						unreal31.la unreal32.la
 
 bahamut14_la_SOURCES = bahamut14.c
 bahamut18_la_SOURCES = bahamut18.c
 client_la_SOURCES = client.c
 hybrid7_la_SOURCES = hybrid7.c
+hybrid6_la_SOURCES = hybrid6.c
 ircup10_la_SOURCES = ircup10.c
 asuka_la_SOURCES = asuka.c
 nefarious_la_SOURCES = nefarious.c
@@ -323,6 +332,8 @@
 	$(LINK) -rpath $(pkglibdir) $(bahamut18_la_LDFLAGS) $(bahamut18_la_OBJECTS) $(bahamut18_la_LIBADD) $(LIBS)
 client.la: $(client_la_OBJECTS) $(client_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkglibdir) $(client_la_LDFLAGS) $(client_la_OBJECTS) $(client_la_LIBADD) $(LIBS)
+hybrid6.la: $(hybrid6_la_OBJECTS) $(hybrid6_la_DEPENDENCIES) 
+	$(LINK) -rpath $(pkglibdir) $(hybrid6_la_LDFLAGS) $(hybrid6_la_OBJECTS) $(hybrid6_la_LIBADD) $(LIBS)
 hybrid7.la: $(hybrid7_la_OBJECTS) $(hybrid7_la_DEPENDENCIES) 
 	$(LINK) -rpath $(pkglibdir) $(hybrid7_la_LDFLAGS) $(hybrid7_la_OBJECTS) $(hybrid7_la_LIBADD) $(LIBS)
 ircup10.la: $(ircup10_la_OBJECTS) $(ircup10_la_DEPENDENCIES) 
@@ -350,6 +361,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bahamut14.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bahamut18.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hybrid6.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hybrid7.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ircup10.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nefarious.Plo@am__quote@

Added: trunk/src/protocol/hybrid6.c
==============================================================================
--- (empty file)
+++ trunk/src/protocol/hybrid6.c	Mon Apr 25 04:59:22 2005
@@ -0,0 +1,26 @@
+/* NeoStats - IRC Statistical Services 
+** Copyright (c) 1999-2005 Adam Rutter, Justin Hammond, Mark Hetherington
+** http://www.neostats.net/
+**
+**  This program is free software; you can redistribute it and/or modify
+**  it under the terms of the GNU General Public License as published by
+**  the Free Software Foundation; either version 2 of the License, or
+**  (at your option) any later version.
+**
+**  This program is distributed in the hope that it will be useful,
+**  but WITHOUT ANY WARRANTY; without even the implied warranty of
+**  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**  GNU General Public License for more details.
+**
+**  You should have received a copy of the GNU General Public License
+**  along with this program; if not, write to the Free Software
+**  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+**  USA
+**
+** NeoStats CVS Identification
+** $Id$
+*/
+
+#include "neostats.h"
+#include "protocol.h"
+

Added: trunk/src/protocol/hybrid6.vcproj
==============================================================================
--- (empty file)
+++ trunk/src/protocol/hybrid6.vcproj	Mon Apr 25 04:59:22 2005
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="hybrid6"
+	ProjectGUID="{B6701C0A-27E3-468D-8473-FBE671989E33}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\curl;..\..\lib\pcre"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;hybrid6_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="neostats.lib"
+				OutputFile="../../modules/hybrid6d.dll"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\debug"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/hybrid6.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/hybrid6.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..\include;..\..\lib\curl;..\..\lib\pcre"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;hybrid6_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="neostats.lib"
+				OutputFile="../../modules/hybrid6.dll"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../release"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/hybrid6.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="hybrid6.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Modified: trunk/src/protocol/ultimate3.c
==============================================================================
--- trunk/src/protocol/ultimate3.c	(original)
+++ trunk/src/protocol/ultimate3.c	Mon Apr 25 04:59:22 2005
@@ -25,7 +25,6 @@
 
 #include "neostats.h"
 #include "protocol.h"
-#include "services.h"
 
 /* Messages/Tokens */
 const char MSG_PRIVATE[] = "PRIVMSG";	/* PRIV */
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.