diff --git a/branching b/branching index 43f651e5f..a766be270 100644 --- a/branching +++ b/branching @@ -35,7 +35,7 @@ the following requirements: To meet these requirements, we have chosen the following branching scheme: - ----2.10.0---2.10.1 + ----2.12.0---2.12.1 / ----------------------------------------------------- trunk \ diff --git a/convert/omega/README b/convert/omega/README index 233393d7d..27c010f7b 100644 --- a/convert/omega/README +++ b/convert/omega/README @@ -64,7 +64,7 @@ Sometimes, the differences are minor, sometimes these differences are major. Omega can upgrade PennMUSH from 'old' to 'new' style flatfiles. Omega can upgrade or downgrade between TinyMUX flatfiles from TinyMUX 2.0 -through TinyMUX 2.9. It may also be able to accept TinyMUX 1.6, but +through TinyMUX 2.12. It may also be able to accept TinyMUX 1.6, but flatfiles from that era were more varied in the flatfile options. Your 1.6 flatfile may use options which Omega doesn't expect. It is best to run it through TinyMUX 2.0 first. diff --git a/debian/README.Debian b/debian/README.Debian index 55b789416..9e7c60234 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -12,7 +12,7 @@ Notes from the TinyMUX INSTALL file: - cd to the game directory. 'cd ../game' - Make your configuration file, as described in docs/CONFIGURATION - - Type './Startmux'. TinyMUX 2.10 automatically creates a minimal + - Type './Startmux'. TinyMUX 2.12 automatically creates a minimal DB if one does not exist in the game/data directory. - Log into the game as player wizard 'connect wizard potrzebie', and shut it down again. @@ -20,7 +20,7 @@ Notes from the TinyMUX INSTALL file: - Edit the .txt files in game/text to your liking. In particular connect.txt and motd.txt. -- Start up TinyMUX 2.10 by running './Startmux' again. +- Start up TinyMUX 2.12 by running './Startmux' again. - @ccreate a channel named 'Public', and a channel named 'Guests' from within the MUX. Created players will automatically be joined to @@ -74,5 +74,5 @@ or upgrade.] accordingly, BEFORE you restart the game, or else ALL @mail older than the default value of 14 days will be deleted. -- Start TinyMUX 2.10 by running './Startmux'. +- Start TinyMUX 2.12 by running './Startmux'. diff --git a/debian/copyright b/debian/copyright index 8d9e51261..c8196110f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,10 +9,9 @@ Upstream Author: Stephen Dennis License: - MUX Source Code (version 2.0 through 2.10). + MUX Source Code (version 2.0 through 2.12). Copyright (C) 1999-2004 by Solid Vertical Domains, Ltd. - Copyright (C) 2005-2010 Stephen Dennis - Contact: Stephen Dennis + Copyright (C) 2005-2012 Stephen Dennis TinyMUX Source Code (versions 1.0 through 1.6) Copyright (c) 1995, 1996, 1997, 1998, 1999, David Passmore. @@ -58,7 +57,7 @@ License: - TinyMUX 2.10 Copyright: The Artistic License + TinyMUX 2.12 Copyright: The Artistic License Preamble diff --git a/debian/tinymux.6 b/debian/tinymux.6 index bac8f1e4a..54ea55ce2 100644 --- a/debian/tinymux.6 +++ b/debian/tinymux.6 @@ -36,7 +36,7 @@ does not provide a superset of all the features available in other MUSH flavors, but those it does implement provide a stable and robust environment that performs as well as or better than that of its peers. .SH CREDITS -TinyMUX 2.10 is derived from TinyMUX 1.6. It is maintained by Stephen Dennis +TinyMUX 2.12 is derived from TinyMUX 1.6. It is maintained by Stephen Dennis (Brazil@BrazilMUX) and would not exist without the generous contributions of many individuals. Ideas for features, occasionally code, documentation, project support, bug hunting, came from many places, including TinyMUSH, diff --git a/dounix.sh b/dounix.sh index d9675e41c..d2a3ad815 100755 --- a/dounix.sh +++ b/dounix.sh @@ -3,15 +3,15 @@ # REQUIRED: ReferenceDir must already exist. It may be created by untaring a # previous distribution. # -OldBuild=11 -OldVersion=2.10.1.$OldBuild -NewBuild=12 -NewVersion=2.10.1.$NewBuild +OldBuild=0 +OldVersion=2.11.0.$OldBuild +NewBuild=1 +NewVersion=2.11.0.$NewBuild ChangesDir=mux -ReferenceDir=mux2.10_$OldBuild -DistroDir=mux2.10 -NewDir=mux2.10_$NewBuild +ReferenceDir=mux2.11_$OldBuild +DistroDir=mux2.11 +NewDir=mux2.11_$NewBuild patchableFiles=`cat unix/TOC.patchable` unpatchedFiles=`cat unix/TOC.unpatched` removeFiles=`cat unix/TOC.removed` diff --git a/dowin32.sh b/dowin32.sh index 73239947f..b78130b27 100644 --- a/dowin32.sh +++ b/dowin32.sh @@ -3,15 +3,15 @@ # REQUIRED: The two ReferenceDir must already exist. They may be created by # untaring a previous distribution. # -OldBuild=11 -OldVersion=2.10.1.$OldBuild -NewBuild=12 -NewVersion=2.10.1.$NewBuild +OldBuild=0 +OldVersion=2.11.0.$OldBuild +NewBuild=1 +NewVersion=2.11.0.$NewBuild ChangesDir=mux -ReferenceDir=mux2.10_$OldBuild -DistroDir=mux2.10 -NewDir=mux2.10_$NewBuild +ReferenceDir=mux2.11_$OldBuild +DistroDir=mux2.11 +NewDir=mux2.11_$NewBuild patchableFiles=`cat win32/TOC.src.patchable` unpatchedFiles=`cat win32/TOC.src.unpatched` removeFiles=`cat win32/TOC.src.removed` diff --git a/mux/ALPHA b/mux/ALPHA index 5c5343ddd..614c374da 100644 --- a/mux/ALPHA +++ b/mux/ALPHA @@ -1,5 +1,6 @@ -TinyMUX 2.10: ALPHA -Last Update: January 2010 +TinyMUX 2.12: ALPHA +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ General Cautions During the Alpha Period: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/mux/ATTACK b/mux/ATTACK index 76972ddc7..8ca974a97 100644 --- a/mux/ATTACK +++ b/mux/ATTACK @@ -1,5 +1,6 @@ -TinyMUX 2.10: ATTACK -Last Update: January 2010 +TinyMUX 2.12: ATTACK +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ You should familiarize yourself with defensive procedures that serve to thwart the effects of attacks. Don't wait until an attack is mounted against your diff --git a/mux/BETA b/mux/BETA index f788afa47..e283c7693 100644 --- a/mux/BETA +++ b/mux/BETA @@ -1,5 +1,6 @@ -TinyMUX 2.10: BETA -Last Update: May 2011 +TinyMUX 2.12: BETA +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Welcome ~~~~~~~ @@ -13,8 +14,8 @@ This BETA contains at least one crash-bug. We have not been able as of yet, to find or reproduce it. Be careful, and leave yourself a way out. Due to the addition of rich color, -the only path for down-converting a 2.10 database to 2.9 is the use of the -Omega flatfile utility. TinyMUX 2.9 is not able to consume a 2.10 database. +the only path for down-converting a 2.12 database to 2.9 is the use of the +Omega flatfile utility. TinyMUX 2.9 is not able to consume a 2.12 database. General Cautions During the Beta Period: diff --git a/mux/CHANGES b/mux/CHANGES index 94cbfe330..9c8e5fdd1 100644 --- a/mux/CHANGES +++ b/mux/CHANGES @@ -1,101 +1,20 @@ -TinyMUX 2.10: CHANGES -Last Update: May 2012 +TinyMUX 2.12: CHANGES +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Major changes that may affect performance and require softcode tweaks: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- Removed dbpuller tool. Use Omega flatfile tool instead. - -- guest_site configuration option is renamed to noguest_site. + -- None. Feature Additions: ~~~~~~~~~~~~~~~~~ - -- Add 256-color support via COLOR256 flag, %x<>, ansi(), and - translate(). - -- Add 24-bit color support. That is, the database and string - functions can represent 24-bit color. - -- Support for MXP/HTML-style tags representing 24-bit color. - -- IPv6 support. - -- Add password_methods configuration option. - -- Add default_charset configuration option (Issue 575). - -- Add ATAN2(). - -- Add pairs for ACCENT() through U+017F. - -- Extend writetime() and exptime() to show years. - -- Add colordepth() - reflects how much color a target can accept. - -- Update to Unicode 5.2. - -- insert(), ldelete(), and remove() updated to take output delimiter, - list of positions, and negative positions. - -- Updated log() to accept optional base parameter. - -- Add baseconv() and update pack() and unpack() to provide - compatibility options with PennMUSH. - -- Add give, kill, and page to NOSPOOF message. + -- None. Bug Fixes: ~~~~~~~~~ - -- Fix @dbclean to not strip attribute owner and flags on attributes - that it re-numbers (Issue 621). - -- Fix access of uninitialized memory during dbconvert when @queuemax - is set on player object (Issue 623). - -- db_check can potentially crash if exit destination is HOME. - -- Stricter telnet option parsing. - -- Avoid using negative initializers in UTF-8 run-copy table to fix - gcc 3.4.2 and VC -W4 warnings (Issue 573). - -- Detect and revert to de facto telnet behavior for MUSHClient - (Issue 625). - -- Fix space delimiter regression from 2.6 (Issues 620, 628, 629, - 630, 631, 632, 633, and 634). - -- Use CXX instead of CXXCPP in Makefile for modules. - -- Protect ConvertToLatin() from buffer overflow (Issue 637). - -- Return message from shl() and shr() when negative shifts are - requested. - -- Two @program requests to the same player could mix the A_PROGCMD - from one with the registers of the other. - -- Fix color bleed regression (Issue 650). - -- Add potential fix for hang in export_TextHtml (Issue 652). - -- Fix the 'doubling' of text that sometimes occurs in HTML - conversion. - -- Fix lack of normal text at beginning in HTML conversion. - -- Add asserts and potential fix for hang in export_TextHtml - (Issue 652). - -- Fix the 'doubling' of text that sometimes occurs in HTML conversion. - -- Fix lack of normal text at beginning. - -- Change the version headers in ./Backup. - -- For terminfo(), report #-1 NOT CONNECTED for Hidden things. - -- Should use %llX instead of %X for 64-bit type (Issue 656). - -- Fix HTML color bleed via @mail (Issue 653). - -- Fix color use in text snippets containing &, <, >, and " for HTML - clients (Issue 655) - -- Map BULLET (U+2022) which Word uses to an asterisk. - -- Add COLOR256 flag to flag list topic. - -- Add upper/lower-case support for a handful characters including - U+1E9E and U+00DF (Issue 661). - -- Fix @QueueMax (Issue 651). - -- Fix @decompile with colored names, @moniker, and @alias (Issue 577 - and 602). - -- Don't @decomp @mail-related attributes. - -- Include BETA file and remove ALPHA file. - -- For ldelete() and replace(), ignore duplicate positions. - -- Fix @decomp so it avoids translating every attribute -- wrapping - those that need it in @wait 0={} to make quoting work right. - -- Disallow %` (Issue 664). - -- Avoid operation outside the domain of modulus. - -- Using @mail is clearer than check.my.mail. - -- Re-write ANSI SUBSTITUTIONS to document %X (upper-case). - -- Don't returned a dbref for a @reference if the dbref is garbage. - -- Fixes to site list handling. - -- Fix crashbug in TruncateToBuffer. - -- Fix memory leaks from recent code. - -- Fix tr() so transformations don't accumulate. - -- Fix mail-loading bug from TinyMUX 1.6. - -- Make older code valgrind-friendly and AppVerifier-friendly. - -- Reconnect to MySQL with given credentials when MySQL itself fails to - do so. - -- Fix crashbug in @reference. - -- Fix build for VS2005. - -- Add /Qopenmp-link:static to 64-bit libmux.dll build to avoid - libiomp5md.dll dependency. - -- These memset calls were being called with an incorrect number of - bytes. + -- None. Performance Enhancements: @@ -105,21 +24,9 @@ Performance Enhancements: Cosmetic Changes: ~~~~~~~~~~~~~~~~ - -- Remove reference to STRINGS in FAILURE help topic. - -- Fix connects/disconnects typo in @ADISCONNECT topic. + -- None. Miscellaneous: ~~~~~~~~~~~~~ - -- Removed search class type=GARBAGE. - -- Switch to Intel Compiler v11.1. - -- Update and freshen autoconf to v2.62. - -- Add and use test cases for shuffle, pickrand, columns, and - elements. - -- Document defaults for log and log_options. - -- Dark Purple is #800080. - -- Typo. Should be hiding instead of hidding (Issue 654). - -- Remove IDENT query. Everyone blocks it these days. - -- Windows 2000 is now the oldest supported version. Note: The - pre-built binaries haven't supported pre-Win2k for some time. - -- Minimum version of Visual Studio is now 2005 (from 2003). + -- None. diff --git a/mux/INSTALL b/mux/INSTALL index c88849d4e..a3c41395b 100644 --- a/mux/INSTALL +++ b/mux/INSTALL @@ -1,6 +1,6 @@ -TinyMUX 2.10: INSTALL -Last Update: January 2010 -~~~~~~~~~~~~~~~~~~~~~~~~~ +TinyMUX 2.12: INSTALL +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Please note that there are two sets of instructions included in this file. Please skip to 'Instructions for Existing Games' for how to @@ -39,7 +39,7 @@ Instructions for New Installations: - cd to the game directory. 'cd ../game' - Make your configuration file, as described in docs/CONFIGURATION - - Type './Startmux'. TinyMUX 2.10 automatically creates a minimal + - Type './Startmux'. TinyMUX 2.12 automatically creates a minimal DB if one does not exist in the game/data directory. - Log into the game as player wizard 'connect wizard potrzebie', and shut it down again. @@ -47,7 +47,7 @@ Instructions for New Installations: 5. Edit the .txt files in game/text to your liking. In particular, connect.txt and motd.txt. -6. Start up TinyMUX 2.10 by running './Startmux' again. +6. Start up TinyMUX 2.12 by running './Startmux' again. 7. @ccreate a channel named 'Public', and a channel named 'Guests' from within the TinyMUX. Created players will automatically be joined to @@ -121,5 +121,5 @@ or upgrade.] accordingly, BEFORE you restart the game, or else ALL @mail older than the default value of 14 days will be deleted. -5. Start TinyMUX 2.10 by running './Startmux'. +5. Start TinyMUX 2.12 by running './Startmux'. diff --git a/mux/LOCAL b/mux/LOCAL index 8dba2ace8..10e213c81 100644 --- a/mux/LOCAL +++ b/mux/LOCAL @@ -1,5 +1,6 @@ -TinyMUX 2.10: LOCAL -Last Update: January 2010 +TinyMUX 2.12: LOCAL +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Notes on TinyMUX's local.cpp extensions --------------------------------------- diff --git a/mux/MODULES b/mux/MODULES index b7169d070..9e9dd9f32 100644 --- a/mux/MODULES +++ b/mux/MODULES @@ -1,6 +1,6 @@ -TinyMUX 2.10: MODULES -Last Update: January 2010 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +TinyMUX 2.12: MODULES +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Modules are a separate package of hardcode that provide and use well-defined interfaces within the main server to accomplish their purpose. Modules diff --git a/mux/NOTES b/mux/NOTES index 99d26a8a0..6143f0885 100644 --- a/mux/NOTES +++ b/mux/NOTES @@ -1,5 +1,6 @@ -TinyMUX 2.10: NOTES -Last Update: January 2010 +TinyMUX 2.12: NOTES +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ This is a list of information that never seems to be handy enough when you need it. @@ -87,7 +88,7 @@ On Flatfiles: On Making Backups: ~~~~~~~~~~~~~~~~~ - - TinyMUX 2.10 includes a backup script. It produces a flatfile with the + - TinyMUX 2.12 includes a backup script. It produces a flatfile with the name GAMENAME.DATE.tar.gz that contains both the mail.db and comsys.db which will appear in the game directory. To make use of the Backup script: diff --git a/mux/README b/mux/README index 819852e3b..94998f192 100644 --- a/mux/README +++ b/mux/README @@ -1,7 +1,8 @@ -TinyMUX 2.10: README (Unix-based) -Last Update: January 2010 +TinyMUX 2.12: README (Unix-based) +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -Congratulations and welcome to the README file for TinyMUX 2.10. That +Congratulations and welcome to the README file for TinyMUX 2.12. That you have chosen to actually read the file is a sign of bravery equal to that of Beowulf facing Grendel or anyone who has ever faced the garden variety lumbering behemoth. @@ -18,7 +19,7 @@ because we want you to succeed, we are happy to provide a file that will, in our sincerest hopes, provide you with enough information to make that possible. If not, it should be at least an entertaining read.... -The TinyMUX 2.10 README and supplemental documentation has been divided into +The TinyMUX 2.12 README and supplemental documentation has been divided into multiple files. For discussion and instructions on how to do various things associated with the care and feeding of your TinyMUX, please refer to the following files: @@ -33,11 +34,11 @@ following files: NOTES All kinds of tidbits made much easier to find. Known compiling issues and known fixes are located - here. Known OSes that TinyMUX 2.10 will run on and + here. Known OSes that TinyMUX 2.12 will run on and compiling issues. Contains basic conversion information. - docs/BACKUP A file about the TinyMUX 2.10 Backup script. + docs/BACKUP A file about the TinyMUX 2.12 Backup script. docs/CONFIGURATION How to set up your TinyMUX, including an explanation of the common configuration items, as well as how to set up @@ -62,7 +63,7 @@ following files: General Information: ~~~~~~~~~~~~~~~~~~~ -TinyMUX 2.10 is written in a mix of C and C++ and is currently being developed +TinyMUX 2.12 is written in a mix of C and C++ and is currently being developed on Win32, Win64, Debian, and FreeBSD. It is a continuation of the TinyMUX 1.x flavor of MUSH servers. @@ -109,7 +110,7 @@ Conversions from Other Database Formats: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Support for other database formats was removed circa TinyMUX 2.1. To import one of the following formats, you must first use dbconvert from TinyMUX 2.0 -before using the resulting flatfile with TinyMUX 2.10. +before using the resulting flatfile with TinyMUX 2.12. TinyMUX 1.4, 1.5, 1.6 (not beta) TinyMUX(Win32Beta) 1.5, 1.6, 2.0 @@ -166,7 +167,7 @@ due to lack of available time, it is ad-hoc. Environment: ~~~~~~~~~~~ -TinyMUX 2.10 should run on most Unixes with BSD-style sockets and a C++ +TinyMUX 2.12 should run on most Unixes with BSD-style sockets and a C++ compiler that groks function prototypes. It is 64-bit 'clean' code. It has been compiled and run successfully 'out of the box' on the following platforms: @@ -189,5 +190,5 @@ Solaris 2.4, 2.5, 2.6, 5.1, 9, 10. SuSE 6.2, 9.3-10.2 Ubuntu 5.10 -If you get TinyMUX 2.10 working on another platform, please let us know +If you get TinyMUX 2.12 working on another platform, please let us know about it! diff --git a/mux/REALITY.SETUP b/mux/REALITY.SETUP index 1a9dc4b24..9474eccfe 100644 --- a/mux/REALITY.SETUP +++ b/mux/REALITY.SETUP @@ -1,6 +1,6 @@ -TinyMUX 2.10: Reality Level Setup -Last Update: January 2010 -~~~~~~~~~~~~~~~~~~~~~~~~~ +TinyMUX 2.12: Reality Level Setup +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Reality levels are a means to forbid (or allow) interaction between objects in the same location. diff --git a/mux/SGP b/mux/SGP index 4fb9f08c7..445fe27b3 100644 --- a/mux/SGP +++ b/mux/SGP @@ -1,6 +1,6 @@ -TinyMUX 2.10: SGP Minimal DB -Last Update: January 2018 -~~~~~~~~~~~~~~~~~~~~~~~~~ +TinyMUX 2.12: SGP Minimal DB +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ The Sandbox Globals Project(SGP) has been included as part of a minimal DB with this distribution of TinyMUX. The current version is 1.0, dated diff --git a/mux/SQL b/mux/SQL index 07034c2da..1e15e4674 100644 --- a/mux/SQL +++ b/mux/SQL @@ -1,8 +1,8 @@ -TinyMUX 2.10: SQL -Last Update: January 2008 -~~~~~~~~~~~~~~~~~~~~~~~~~ +TinyMUX 2.12: SQL +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -TinyMUX 2.10 supports both asynchronous and synchronous SQL. The synchronous/ +TinyMUX 2.12 supports both asynchronous and synchronous SQL. The synchronous/ in-line support is similar to that of PennMUSH and TinyMUSH, namely the sql() function. The asynchronous support is unique to TinyMUX at this time and is the recommended method for SQL access. diff --git a/mux/SSL b/mux/SSL index 41f3687c9..6f352961d 100644 --- a/mux/SSL +++ b/mux/SSL @@ -1,8 +1,8 @@ -TinyMUX 2.10: SSL -Last Update: January 2010 -~~~~~~~~~~~~~~~~~~~~~~~~~ +TinyMUX 2.12: SSL +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -1) To compile TinyMUX 2.10 with support for SSL and TLS, you will need to +1) To compile TinyMUX 2.12 with support for SSL and TLS, you will need to use the --enable-ssl option. This option requires OpenSSL 0.9.6 or later, and 0.9.7 is highly recommended if possible. It may be necessary to append -lcrypto to the SSL_LIBS line in the Makefile. @@ -46,7 +46,7 @@ Last Update: January 2010 If you do not see this line, look for SSL error messages in the log. A likely cause is an improper certificate passphrase. - If TinyMUX 2.10 cannot initialize the SSL engine, the game will still run + If TinyMUX 2.12 cannot initialize the SSL engine, the game will still run but the SSL ports will not be opened and the TLS option will be disabled. 6) When users are connected via SSL ports or the TLS extension, their diff --git a/mux/docs/BACKUPS b/mux/docs/BACKUPS index 0bb1aa5c1..f9e995c08 100644 --- a/mux/docs/BACKUPS +++ b/mux/docs/BACKUPS @@ -1,5 +1,6 @@ -TinyMUX 2.10: BACKUPS -Last Update: January 2010 +TinyMUX 2.12: BACKUPS +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ The importance of good backups: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/mux/docs/CONFIGURATION b/mux/docs/CONFIGURATION index 428d12db3..aaa9659be 100644 --- a/mux/docs/CONFIGURATION +++ b/mux/docs/CONFIGURATION @@ -1,7 +1,8 @@ -TinyMUX 2.10: CONFIGURATION -Last Update: January 2010 +TinyMUX 2.12: CONFIGURATION +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -TinyMUX 2.10 gets the information it needs to operate the game (aside from +TinyMUX 2.12 gets the information it needs to operate the game (aside from the database itself) from a configuration file that is read in at startup. The configuration file contains various parameters, such as where to find the database, what port to listen for connects, and many other things. diff --git a/mux/docs/CONVERSION b/mux/docs/CONVERSION index 7dd3e0adf..e5ba85e78 100644 --- a/mux/docs/CONVERSION +++ b/mux/docs/CONVERSION @@ -1,30 +1,31 @@ -TinyMUX 2.10: CONVERSION -Last Update: January 2010 +TinyMUX 2.12: CONVERSION +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Conversions from Other Database Formats: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -TinyMUX 2.10 has been proven to read the following database formats: - TinyMUX 2.0, 2.1, 2.2, 2.3, 2.4, 2.6, 2.7, 2.9 +TinyMUX 2.12 has been proven to read the following database formats: + TinyMUX 2.0, 2.1, 2.2, 2.3, 2.4, 2.6, 2.7, 2.9, 2.10 Upgrading An Existing TinyMUX: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - @shutdown the game. Make a flatfile of your DB and move it to a safe location. - - Compile TinyMUX 2.10 per INSTALL. Note that TinyMUX 2.10 untars into a + - Compile TinyMUX 2.12 per INSTALL. Note that TinyMUX 2.12 untars into a separate directory. - - Copy the flatfile to game/data in the TinyMUX 2.10 directory and use + - Copy the flatfile to game/data in the TinyMUX 2.12 directory and use db_load to convert the database to binary. - Copy .txt files to text/ - Copy existing mux.config - - **Important** Your old GAMENAME.conf file will not work under TinyMUX 2.10 + - **Important** Your old GAMENAME.conf file will not work under TinyMUX 2.12 if you are converting from a version prior to TinyMUX 2.0. - To make a proper file, you must edit the GAMENAME.conf in the TinyMUX 2.10 + To make a proper file, you must edit the GAMENAME.conf in the TinyMUX 2.12 game/ and add in the config parameters. - You can save a little time by 'cat oldfile >> newfile' and using diff --git a/mux/docs/CREDITS b/mux/docs/CREDITS index f51b088b8..ad925ade8 100644 --- a/mux/docs/CREDITS +++ b/mux/docs/CREDITS @@ -1,7 +1,8 @@ -TinyMUX 2.10: CREDITS -Last Update: January 2010 +TinyMUX 2.12: CREDITS +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -TinyMUX 2.10 is maintained by Stephen Dennis (Brazil@BrazilMUX) and would not +TinyMUX 2.12 is maintained by Stephen Dennis (Brazil@BrazilMUX) and would not exist without the generous contributions of many individuals. Ideas for features, occasionally code, documentation, project support, bug hunting, came from many places, including TinyMUSH, ChaoticMUX, RhostMUSH, and diff --git a/mux/docs/DISTRIBUTIONS b/mux/docs/DISTRIBUTIONS index 4d72a3e46..6b420ddde 100644 --- a/mux/docs/DISTRIBUTIONS +++ b/mux/docs/DISTRIBUTIONS @@ -1,10 +1,11 @@ -TinyMUX 2.10: DISTRIBUTIONS -Last Update: January 2010 +TinyMUX 2.12: DISTRIBUTIONS +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -Where you can get TinyMUX 2.10: +Where you can get TinyMUX 2.12: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -TinyMUX 2.10 is developed by Stephen Dennis (brazilofmux@gmail.com) and a small +TinyMUX 2.12 is developed by Stephen Dennis (brazilofmux@gmail.com) and a small group of enthusiastic volunteers. The server is simultaneously developed on Windows and Unix platforms. For the latest version, updates, and news, please look at any of the project websites: @@ -38,7 +39,8 @@ the game 2005-2006 2.6 2007 2.7 2008-2009 2.9 - 2010 2.10 + 2010-2011 2.10 + 2012 2.12 2.x.1 Feature Change. After Beta has started, the third number indicates a change in the feature set -- usually the addition of diff --git a/mux/docs/GUESTS b/mux/docs/GUESTS index 7a99de2df..a327eb84f 100644 --- a/mux/docs/GUESTS +++ b/mux/docs/GUESTS @@ -1,5 +1,6 @@ -TinyMUX 2.10: GUESTS -Last Update: January 2010 +TinyMUX 2.12: GUESTS +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ This is information pertaining to the automated guests system in the server. These steps will help you get your guests configured: diff --git a/mux/docs/LIMITS b/mux/docs/LIMITS index 89c78f4ed..849d0ef6d 100644 --- a/mux/docs/LIMITS +++ b/mux/docs/LIMITS @@ -1,5 +1,6 @@ -TinyMUX 2.10: LIMITS -Last Update: January 2010 +TinyMUX 2.12: LIMITS +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ While some limits of the server depend on the host environment (CPU architecture, compiler, and operating system), there are certain universal @@ -30,7 +31,7 @@ The number of unique attribute names is limited to the maximum value of a Attributes per Object (for disk-based build): -In TinyMUX 2.10, the number of attributes that can be associated with an object +In TinyMUX 2.12, the number of attributes that can be associated with an object is limited to somewhere between 2666 and 4000 depending on the number of unique attribute names game-wide and in particular which ones are used on that particular object. The total encoded size is limited to 8000 bytes, and each diff --git a/mux/docs/MEMORY b/mux/docs/MEMORY index 7a1a1e2c8..4870b6555 100644 --- a/mux/docs/MEMORY +++ b/mux/docs/MEMORY @@ -1,5 +1,6 @@ -TinyMUX 2.10: MEMORY -Last Update: January 2010 +TinyMUX 2.12: MEMORY +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ This file will explain how to configure for the two memory options of TinyMUX as well as the procedure for converting between them. diff --git a/mux/docs/PATCHES b/mux/docs/PATCHES index 9dcc80e2c..4aaab4f0a 100644 --- a/mux/docs/PATCHES +++ b/mux/docs/PATCHES @@ -1,7 +1,8 @@ -TinyMUX 2.10: PATCHES -Last Update: January 2010 +TinyMUX 2.12: PATCHES +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ -A Word About Patches for TinyMUX 2.10: +A Word About Patches for TinyMUX 2.12: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Changes are distributed in the form of patches, and these occur @@ -46,29 +47,29 @@ and you didn't, you won't be real happy. 1. Download the patch file to your local shell account somewhere. The location is not critical. - The patch file mux-2.10.0.1-2.10.0.2.unix.patch.gz will patch from - version 2.10.0.1 to version 2.10.0.2. This patch file is compressed + The patch file mux-2.12.0.1-2.12.0.2.unix.patch.gz will patch from + version 2.12.0.1 to version 2.12.0.2. This patch file is compressed using gzip. 2. Optionally, you can decompress the patch files with 'gzip -d' like so: - gzip -d mux-2.10.0.1-2.10.0.2.unix.patch.gz + gzip -d mux-2.12.0.1-2.12.0.2.unix.patch.gz - This will change the filename to mux-2.10.0.1-2.10.0.2.unix.patch. + This will change the filename to mux-2.12.0.1-2.12.0.2.unix.patch. 3. Change to your game's top-most directory. For example, - cd mux2.10 + cd mux2.12 4. Apply the patch as follows: - zcat < ../mux-2.10.0.1-2.10.0.2.unix.patch.gz | patch -p0 + zcat < ../mux-2.12.0.1-2.12.0.2.unix.patch.gz | patch -p0 Or, if you optionally decompressed the patch as described in step 2, apply the patch as follows: - patch -p0 < ../mux-2.10.0.1-2.10.0.2.unix.patch + patch -p0 < ../mux-2.12.0.1-2.12.0.2.unix.patch From here, you will usually get to watch a lot of spam fly by as the patch utility modifies the files to be updated. You might occasionally get a @@ -85,5 +86,5 @@ If you have problems: ~~~~~~~~~~~~~~~~~~~~ If the patch fails and you were applying it to a standard beta or release -version of TinyMUX 2.10, then collect the error messages and report it to +version of TinyMUX 2.12, then collect the error messages and report it to brazilofmux@gmail.com following the bug reporting procedures in README. diff --git a/mux/docs/REALMS b/mux/docs/REALMS index 06d56b12c..71c9e4038 100644 --- a/mux/docs/REALMS +++ b/mux/docs/REALMS @@ -1,5 +1,6 @@ -TinyMUX 2.10: REALMS -Last Update: January 2010 +TinyMUX 2.12: REALMS +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ What are Realms?: ~~~~~~~~~~~~~~~~ diff --git a/mux/game/text/help.txt b/mux/game/text/help.txt index 722d29b1f..a987d55b2 100644 --- a/mux/game/text/help.txt +++ b/mux/game/text/help.txt @@ -6166,7 +6166,7 @@ CREATE() Topic: CREDITS -TinyMUX 2.10 is based on TinyMUX 2.9. It is currently maintained by +TinyMUX 2.12 is based on TinyMUX 2.10. It is currently maintained by Stephen Dennis (AKA Brazil). There is a more complete list of credits in the README files for the server itself. diff --git a/mux/readme.txt b/mux/readme.txt index e9a8e93cb..0b74c4eeb 100644 --- a/mux/readme.txt +++ b/mux/readme.txt @@ -1,5 +1,6 @@ -TinyMUX 2.10: README (Win32/64-based) -Last Update: January 2010 +TinyMUX 2.12: README (Win32/64-based) +Last Update: July 2012 +~~~~~~~~~~~~~~~~~~~~~~ Herein are extra notes for the Win32/64 distribution. These notes do not apply well to the Unix distribution. @@ -34,7 +35,7 @@ named incorrectly. Use version 2.50 of PKZip or use WinZip. Regarding tar/gzip on Win32, I'm using the Cygwin version of these tools. You can use Cygwin tools to unpack the Win32 distribution. However, as mentioned above, you should not be using the Win32 distribution if you want -to use Cygwin to compile TinyMUX 2.10. +to use Cygwin to compile TinyMUX 2.12. Regarding JAR from ARJ Software, this archiving tool produces the smallest files. It's available via http://www.arjsoftware.com/jar.htm. @@ -48,21 +49,21 @@ To use a binary distribution: following lines (depending on which archiving program you have chosen to use). - jar32 x mux-2.10.0.1.win32.bin.j - tar xzf mux-2.10.0.1.win32.bin.tar.gz - pkzip -extract -directories mux-2.10.0.1.win32.bin.zip + jar32 x mux-2.12.0.1.win32.bin.j + tar xzf mux-2.12.0.1.win32.bin.tar.gz + pkzip -extract -directories mux-2.12.0.1.win32.bin.zip -or- - Unpack the mux-2.10.0.1.win32.bin.zip using WinZip. + Unpack the mux-2.12.0.1.win32.bin.zip using WinZip. - 2. The pre-built binaries for 32-bit are already placed in mux2.10/game/bin and - ready to go. 64-bit binaries are provided in mux2.10/game/bin/win64, but to + 2. The pre-built binaries for 32-bit are already placed in mux2.12/game/bin and + ready to go. 64-bit binaries are provided in mux2.12/game/bin/win64, but to use those, you need to be using a 64-bit version of Windows, and you need - to copy them up one directory level into mux2.10/game/bin. 64-bit versions + to copy them up one directory level into mux2.12/game/bin. 64-bit versions of Windows can use either. - 3. cd mux2.10/game + 3. cd mux2.12/game 4. Possibly edit netmux.conf and mux.config to tweak the configuration. @@ -82,25 +83,25 @@ To use a source distribution: following lines (depending on which archiving program you have chosen to use). - jar32 x mux-2.10.0.1.win32.src.j - tar xzf mux-2.10.0.1.win32.src.tar.gz - pkzip -extract -directories mux-2.10.0.1.win32.src.zip + jar32 x mux-2.12.0.1.win32.src.j + tar xzf mux-2.12.0.1.win32.src.tar.gz + pkzip -extract -directories mux-2.12.0.1.win32.src.zip -or- - Unpack the mux-2.10.0.1.win32.src.zip using WinZip. + Unpack the mux-2.12.0.1.win32.src.zip using WinZip. - 2. Start Visual C++ and open the workspace file (mux2.10/src/netmux.dsw). Your + 2. Start Visual C++ and open the workspace file (mux2.12/src/netmux.dsw). Your version of Visual Studio may want to convert this workspace file into a 'solution' file and also convert all the project files. Let it do this, and then remember to work with the solution file thereafter. 3. Within Visual C++, do a batch build in order to produce netmux.exe. The - non-debug version will be placed in mux2.10/src/bin_release and must be - copied over to mux2.10/game/bin. It will also build a libmux.dll file which - must also be copied over to mux2.10/game/bin. It will also build several - modules under mux2.10/src/modules/bin_release. If you intend to use - these, they must also be copied into the mux2.10/game/bin directory. + non-debug version will be placed in mux2.12/src/bin_release and must be + copied over to mux2.12/game/bin. It will also build a libmux.dll file which + must also be copied over to mux2.12/game/bin. It will also build several + modules under mux2.12/src/modules/bin_release. If you intend to use + these, they must also be copied into the mux2.12/game/bin directory. 4. Start the server with the following: diff --git a/mux/src/Doxyfile b/mux/src/Doxyfile index 394e0040c..8a7fa512f 100644 --- a/mux/src/Doxyfile +++ b/mux/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = TinyMUX # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.10 +PROJECT_NUMBER = 2.12 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/mux/src/Makefile.in b/mux/src/Makefile.in index 141bea1bd..674af2c5f 100644 --- a/mux/src/Makefile.in +++ b/mux/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile for TinyMUX 2.10 +# Makefile for TinyMUX 2.12 # # Search for the text 'CONFIGURATION SECTION' and make any changes needed # there. diff --git a/mux/src/_build.h b/mux/src/_build.h index a99818447..a911ee8ca 100644 --- a/mux/src/_build.h +++ b/mux/src/_build.h @@ -15,10 +15,10 @@ extern char szBuildDate[]; #define MUX_BUILD_DATE szBuildDate #endif // MUX_BUILD_DATE -#define MUX_VERSION "2.10.1.12" // Version number +#define MUX_VERSION "2.12.0.1" // Version number #define MUX_RELEASE_DATE "2012-JUL-07" // Source release date // Define if this release is qualified as ALPHA or BETA. // -//#define ALPHA +#define ALPHA //#define BETA diff --git a/mux/src/autoconf-win32.h b/mux/src/autoconf-win32.h index 503e21a37..0229c984a 100644 --- a/mux/src/autoconf-win32.h +++ b/mux/src/autoconf-win32.h @@ -350,7 +350,7 @@ #define PACKAGE_NAME "TinyMUX" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TinyMUX 2.10" +#define PACKAGE_STRING "TinyMUX 2.12" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "tinymux" @@ -359,7 +359,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.10" +#define PACKAGE_VERSION "2.12" /* Define if calling signal with SIGCHLD when handling SIGCHLD blows chow. */ /* #undef SIGNAL_SIGCHLD_BRAINDAMAGE */ diff --git a/mux/src/configure b/mux/src/configure index 32ee46e6d..d7444321a 100755 --- a/mux/src/configure +++ b/mux/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for TinyMUX 2.10. +# Generated by GNU Autoconf 2.68 for TinyMUX 2.12. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TinyMUX' PACKAGE_TARNAME='tinymux' -PACKAGE_VERSION='2.10' -PACKAGE_STRING='TinyMUX 2.10' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='TinyMUX 2.12' PACKAGE_BUGREPORT='tinymux@googlegroups.com' PACKAGE_URL='' @@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TinyMUX 2.10 to adapt to many kinds of systems. +\`configure' configures TinyMUX 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1323,7 +1323,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TinyMUX 2.10:";; + short | recursive ) echo "Configuration of TinyMUX 2.12:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TinyMUX configure 2.10 +TinyMUX configure 2.12 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2207,7 +2207,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TinyMUX $as_me 2.10, which was +It was created by TinyMUX $as_me 2.12, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -7971,7 +7971,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TinyMUX $as_me 2.10, which was +This file was extended by TinyMUX $as_me 2.12, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8033,7 +8033,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TinyMUX config.status 2.10 +TinyMUX config.status 2.12 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/mux/src/configure.ac b/mux/src/configure.ac index e5ddcbfa0..118cb36ee 100644 --- a/mux/src/configure.ac +++ b/mux/src/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([TinyMUX],[2.10],[tinymux@googlegroups.com]) +AC_INIT([TinyMUX],[2.12],[tinymux@googlegroups.com]) AC_CONFIG_SRCDIR([game.cpp]) AC_CONFIG_HEADER([autoconf.h]) diff --git a/mux/src/copyright.h b/mux/src/copyright.h index 3ac91e5b0..3a309954a 100644 --- a/mux/src/copyright.h +++ b/mux/src/copyright.h @@ -7,9 +7,9 @@ /* -*-C-*- */ /* - * MUX Source Code (version 2.0 through 2.10). + * MUX Source Code (version 2.0 through 2.12). * Copyright (C) 1999-2004 by Solid Vertical Domains, Ltd. - * Copyright (C) 2005-2010 Stephen Dennis + * Copyright (C) 2005-2012 Stephen Dennis * * TinyMUX Source Code (versions 1.0 through 1.6) * Copyright (c) 1995, 1996, 1997, 1998, 1999, David Passmore. @@ -52,7 +52,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * - * TinyMUX 2.10 Copyright: The Artistic License + * TinyMUX 2.12 Copyright: The Artistic License * * Preamble * diff --git a/mux/src/modules/autoconf-win32.h b/mux/src/modules/autoconf-win32.h index 9d3ae23e2..0c736c912 100644 --- a/mux/src/modules/autoconf-win32.h +++ b/mux/src/modules/autoconf-win32.h @@ -62,7 +62,7 @@ #define PACKAGE_NAME "TinyMUX" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "TinyMUX 2.10" +#define PACKAGE_STRING "TinyMUX 2.12" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "tinymux" @@ -71,7 +71,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.10" +#define PACKAGE_VERSION "2.12" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 diff --git a/mux/src/modules/configure b/mux/src/modules/configure index 741702ea6..c65886526 100755 --- a/mux/src/modules/configure +++ b/mux/src/modules/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for TinyMUX 2.10. +# Generated by GNU Autoconf 2.68 for TinyMUX 2.12. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='TinyMUX' PACKAGE_TARNAME='tinymux' -PACKAGE_VERSION='2.10' -PACKAGE_STRING='TinyMUX 2.10' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='TinyMUX 2.12' PACKAGE_BUGREPORT='tinymux@googlegroups.com' PACKAGE_URL='' @@ -1231,7 +1231,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TinyMUX 2.10 to adapt to many kinds of systems. +\`configure' configures TinyMUX 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1296,7 +1296,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TinyMUX 2.10:";; + short | recursive ) echo "Configuration of TinyMUX 2.12:";; esac cat <<\_ACEOF @@ -1386,7 +1386,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TinyMUX configure 2.10 +TinyMUX configure 2.12 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1763,7 +1763,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TinyMUX $as_me 2.10, which was +It was created by TinyMUX $as_me 2.12, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -5033,7 +5033,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TinyMUX $as_me 2.10, which was +This file was extended by TinyMUX $as_me 2.12, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5095,7 +5095,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -TinyMUX config.status 2.10 +TinyMUX config.status 2.12 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/mux/src/modules/configure.ac b/mux/src/modules/configure.ac index 935af98e2..1e1a178b1 100644 --- a/mux/src/modules/configure.ac +++ b/mux/src/modules/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([TinyMUX],[2.10],[tinymux@googlegroups.com]) +AC_INIT([TinyMUX],[2.12],[tinymux@googlegroups.com]) AC_CONFIG_SRCDIR([sample.cpp]) AC_CONFIG_HEADER([autoconf.h]) diff --git a/mux/src/modules/sample.mak b/mux/src/modules/sample.mak index 0449be182..981334a31 100644 --- a/mux/src/modules/sample.mak +++ b/mux/src/modules/sample.mak @@ -69,7 +69,7 @@ CPP_PROJ=/nologo /MT /W3 /EHsc /Ot /Oa /O3 /Oi /Ob2 /Gy /D "NDEBUG" /D "WIN32" / << LINK32=xilink.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.10 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sample.pdb" /machine:amd64 /def:".\sample.def" /out:"$(OUTDIR)\sample.dll" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.12 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sample.pdb" /machine:amd64 /def:".\sample.def" /out:"$(OUTDIR)\sample.dll" DEF_FILE= \ ".\sample.def" LINK32_OBJS= \ diff --git a/mux/src/modules/sqlproxy.mak b/mux/src/modules/sqlproxy.mak index bd0f7274d..dcd8170dd 100644 --- a/mux/src/modules/sqlproxy.mak +++ b/mux/src/modules/sqlproxy.mak @@ -69,7 +69,7 @@ CPP_PROJ=/nologo /MT /W3 /EHsc /Ot /Oa /O3 /Oi /Ob2 /Gy /D "NDEBUG" /D "WIN32" / << LINK32=xilink.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.10 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sqlproxy.pdb" /machine:amd64 /def:".\sqlproxy.def" /out:"$(OUTDIR)\sqlproxy.dll" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.12 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sqlproxy.pdb" /machine:amd64 /def:".\sqlproxy.def" /out:"$(OUTDIR)\sqlproxy.dll" DEF_FILE= \ ".\sqlproxy.def" LINK32_OBJS= \ diff --git a/mux/src/modules/sqlslave.mak b/mux/src/modules/sqlslave.mak index e59abe7af..c6a456eff 100644 --- a/mux/src/modules/sqlslave.mak +++ b/mux/src/modules/sqlslave.mak @@ -69,7 +69,7 @@ CPP_PROJ=/nologo /MT /W3 /EHsc /Ot /Oa /O3 /Oi /Ob2 /Gy /D "NDEBUG" /D "WIN32" / << LINK32=xilink.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.10 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sqlslave.pdb" /machine:amd64 /def:".\sqlslave.def" /out:"$(OUTDIR)\sqlslave.dll" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.12 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sqlslave.pdb" /machine:amd64 /def:".\sqlslave.def" /out:"$(OUTDIR)\sqlslave.dll" DEF_FILE= \ ".\sqlslave.def" LINK32_OBJS= \ diff --git a/mux/src/modules/sum.mak b/mux/src/modules/sum.mak index fccc095ba..9168d63ec 100644 --- a/mux/src/modules/sum.mak +++ b/mux/src/modules/sum.mak @@ -69,7 +69,7 @@ CPP_PROJ=/nologo /MT /W3 /EHsc /Ot /Oa /O3 /Oi /Ob2 /Gy /D "NDEBUG" /D "WIN32" / << LINK32=xilink.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.10 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sum.pdb" /machine:amd64 /def:".\sum.def" /out:"$(OUTDIR)\sum.dll" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib "..\bin_release\libmux.lib" /nologo /version:2.12 /subsystem:console /dll /incremental:no /pdb:"$(OUTDIR)\sum.pdb" /machine:amd64 /def:".\sum.def" /out:"$(OUTDIR)\sum.dll" DEF_FILE= \ ".\sum.def" LINK32_OBJS= \ diff --git a/mux/src/netmux.mak b/mux/src/netmux.mak index 629588587..65d7d7696 100644 --- a/mux/src/netmux.mak +++ b/mux/src/netmux.mak @@ -129,7 +129,7 @@ CPP_PROJ=/nologo /MT /Qopenmp-link:static /W3 /EHsc /Ot /Oa /O3 /Oi /Ob2 /Gy /D << LINK32=xilink.exe -LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib advapi32.lib "$(OUTDIR)\libmux.lib" /nologo /version:2.10 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\netmux.pdb" /machine:amd64 /out:"$(OUTDIR)\netmux.exe" +LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib wsock32.lib advapi32.lib "$(OUTDIR)\libmux.lib" /nologo /version:2.12 /subsystem:console /incremental:no /pdb:"$(OUTDIR)\netmux.pdb" /machine:amd64 /out:"$(OUTDIR)\netmux.exe" LINK32_OBJS= \ "$(INTDIR)\_build.obj" \ "$(INTDIR)\alarm.obj" \ diff --git a/mux/src/netmux.vcproj b/mux/src/netmux.vcproj index c48963c79..8c1cc5896 100644 --- a/mux/src/netmux.vcproj +++ b/mux/src/netmux.vcproj @@ -161,7 +161,7 @@ Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" OutputFile=".\bin_release/netmux.exe" - Version="2.10" + Version="2.12" LinkIncremental="1" SuppressStartupBanner="true" ProgramDatabaseFile=".\bin_release/netmux.pdb" diff --git a/mux/src/netmux_intel_gen.vcproj b/mux/src/netmux_intel_gen.vcproj index e42cc8ef7..8d15d3d4d 100644 --- a/mux/src/netmux_intel_gen.vcproj +++ b/mux/src/netmux_intel_gen.vcproj @@ -164,7 +164,7 @@ Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" OutputFile=".\bin_release/netmux.exe" - Version="2.10" + Version="2.12" LinkIncremental="1" SuppressStartupBanner="true" ProgramDatabaseFile=".\bin_release/netmux.pdb" diff --git a/mux/src/netmux_intel_use.vcproj b/mux/src/netmux_intel_use.vcproj index 5b7b53731..bc7f6f37a 100644 --- a/mux/src/netmux_intel_use.vcproj +++ b/mux/src/netmux_intel_use.vcproj @@ -164,7 +164,7 @@ Name="VCLinkerTool" AdditionalDependencies="wsock32.lib" OutputFile=".\bin_release/netmux.exe" - Version="2.10" + Version="2.12" LinkIncremental="1" SuppressStartupBanner="true" ProgramDatabaseFile=".\bin_release/netmux.pdb" diff --git a/mux/src/tools/configure b/mux/src/tools/configure index 4bd6d9d1b..2baf63722 100755 --- a/mux/src/tools/configure +++ b/mux/src/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for announce 2.10. +# Generated by GNU Autoconf 2.68 for announce 2.12. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='announce' PACKAGE_TARNAME='announce' -PACKAGE_VERSION='2.10' -PACKAGE_STRING='announce 2.10' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='announce 2.12' PACKAGE_BUGREPORT='brazilofmux@gmail.com' PACKAGE_URL='' @@ -1207,7 +1207,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures announce 2.10 to adapt to many kinds of systems. +\`configure' configures announce 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of announce 2.10:";; + short | recursive ) echo "Configuration of announce 2.12:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -announce configure 2.10 +announce configure 2.12 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1771,7 +1771,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by announce $as_me 2.10, which was +It was created by announce $as_me 2.12, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -4130,7 +4130,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by announce $as_me 2.10, which was +This file was extended by announce $as_me 2.12, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4183,7 +4183,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -announce config.status 2.10 +announce config.status 2.12 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/mux/src/tools/configure.ac b/mux/src/tools/configure.ac index d03252130..1412312c4 100644 --- a/mux/src/tools/configure.ac +++ b/mux/src/tools/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([announce], [2.10], [brazilofmux@gmail.com]) +AC_INIT([announce], [2.12], [brazilofmux@gmail.com]) AC_CONFIG_SRCDIR([announce.c]) AC_CONFIG_HEADERS([autoconf.h]) diff --git a/unix/TOC.patchable b/unix/TOC.patchable index 2c9af86e6..93dfedbaf 100644 --- a/unix/TOC.patchable +++ b/unix/TOC.patchable @@ -1,3 +1,4 @@ +ALPHA ATTACK CHANGES INSTALL diff --git a/unix/TOC.removed b/unix/TOC.removed index ea89c7bd3..900e00b33 100644 --- a/unix/TOC.removed +++ b/unix/TOC.removed @@ -1,10 +1 @@ -ALPHA BETA -src/table.cpp -src/table.h -src/configure.in -src/modules/configure.in -src/tools/dbpuller.c -src/tools/muxattrs.dat -src/tools/muxlocks.dat -src/tools/README.muxdbpuller diff --git a/utf/configure b/utf/configure index 3fe8b3c64..2e03b9868 100755 --- a/utf/configure +++ b/utf/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Tinymux-UTF 2.10 tinymux@googlegroups.com. +# Generated by GNU Autoconf 2.68 for Tinymux-UTF 2.12 tinymux@googlegroups.com. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -555,10 +555,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='Tinymux-UTF 2.10' -PACKAGE_TARNAME='tinymux-utf-2-10' +PACKAGE_NAME='Tinymux-UTF 2.12' +PACKAGE_TARNAME='tinymux-utf-2-12' PACKAGE_VERSION='tinymux@googlegroups.com' -PACKAGE_STRING='Tinymux-UTF 2.10 tinymux@googlegroups.com' +PACKAGE_STRING='Tinymux-UTF 2.12 tinymux@googlegroups.com' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1211,7 +1211,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Tinymux-UTF 2.10 tinymux@googlegroups.com to adapt to many kinds of systems. +\`configure' configures Tinymux-UTF 2.12 tinymux@googlegroups.com to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1273,7 +1273,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Tinymux-UTF 2.10 tinymux@googlegroups.com:";; + short | recursive ) echo "Configuration of Tinymux-UTF 2.12 tinymux@googlegroups.com:";; esac cat <<\_ACEOF @@ -1355,7 +1355,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Tinymux-UTF 2.10 configure tinymux@googlegroups.com +Tinymux-UTF 2.12 configure tinymux@googlegroups.com generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1812,7 +1812,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Tinymux-UTF 2.10 $as_me tinymux@googlegroups.com, which was +It was created by Tinymux-UTF 2.12 $as_me tinymux@googlegroups.com, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -4345,7 +4345,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Tinymux-UTF 2.10 $as_me tinymux@googlegroups.com, which was +This file was extended by Tinymux-UTF 2.12 $as_me tinymux@googlegroups.com, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4407,7 +4407,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Tinymux-UTF 2.10 config.status tinymux@googlegroups.com +Tinymux-UTF 2.12 config.status tinymux@googlegroups.com configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/utf/configure.ac b/utf/configure.ac index 874b59495..3f8266a1b 100644 --- a/utf/configure.ac +++ b/utf/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.68]) -AC_INIT([Tinymux-UTF 2.10],[tinymux@googlegroups.com]) +AC_INIT([Tinymux-UTF 2.12],[tinymux@googlegroups.com]) AC_CONFIG_SRCDIR([ConvertUTF.cpp]) AC_CONFIG_HEADERS([autoconf.h]) diff --git a/win32/TOC.bin.patchable b/win32/TOC.bin.patchable index 689120e3c..4e19e519f 100644 --- a/win32/TOC.bin.patchable +++ b/win32/TOC.bin.patchable @@ -1,3 +1,4 @@ +ALPHA ATTACK CHANGES MODULES diff --git a/win32/TOC.bin.removed b/win32/TOC.bin.removed index 357376e2c..900e00b33 100644 --- a/win32/TOC.bin.removed +++ b/win32/TOC.bin.removed @@ -1,2 +1 @@ -ALPHA BETA diff --git a/win32/TOC.src.patchable b/win32/TOC.src.patchable index aaf442b65..a5028d033 100644 --- a/win32/TOC.src.patchable +++ b/win32/TOC.src.patchable @@ -1,3 +1,4 @@ +ALPHA ATTACK CHANGES MODULES diff --git a/win32/TOC.src.removed b/win32/TOC.src.removed index df6ad1fb7..900e00b33 100644 --- a/win32/TOC.src.removed +++ b/win32/TOC.src.removed @@ -1,11 +1 @@ -ALPHA BETA -src/table.cpp -src/table.h -src/libmux.dsp -src/netmux.dsw -src/netmux.dsp -src/modules/sample.dsp -src/modules/sum.dsp -src/modules/sqlproxy.dsp -src/modules/sqlslave.dsp