stop using ChangeLog file--can be autogenerated for releases using ChangeLog.SH now

diff --git a/ChangeLog.SH b/ChangeLog.SH
new file mode 100755 (executable)
index 0000000..ed700f2
--- /dev/null
+++ b/ChangeLog.SH
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Convert git log to GNU-style ChangeLog file.
+# (C) Chris
+TARGET=$(dirname $0)/ChangeLog
+CLASSIC=$(dirname $0)/ChangeLog.classic
+MSG="X3 ChangeLog (Generated by ChangeLog.SH from GIT commit logs)\nThis file is auto-generated from ChangeLog.SH\n\n"
+if test -d ".git"; then
+    #Put new stuff at the top, starting at 1.8.1 the revision we started
+    #using git and stopped using ChangeLog manually
+    echo "$MSG" > "$TARGET"
+    git log --format="%ai %aN %n%n%x09* %s%d%n" 1.8.1..HEAD >> "$TARGET"
+    #Then put historical stuff in as it was
+    cat "$CLASSIC" >> "$TARGET"
+    exit 0
+else
+    echo "No git repository present."
+    exit 1
+fi

diff --git a/ChangeLog b/ChangeLog.classic
similarity index 99%
rename from ChangeLog
rename to ChangeLog.classic
index 595bda6aafa48cb5c4f1d0404ed168e2acbb018e..2f1078c1c50418a9b8e2c28fadc4968ec94e6d11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog.classic
@@ -1,5 +1,4 @@
-/***********************************************************************
-X3 ChangeLog
+X3 ChangeLog (Classic GNU version)
 
 2013-02-18  Alex Schumann  <rubin@afternet.org>
        * all: Converted from mercurial to git. (testing email commit messages again)
@@ -3977,7 +3976,4 @@ X3 ChangeLog
 
        * src/nickserv.help: Added odelcookie section.
 
-***********************************************************************/
-
-#define CVS_VERSION "$Id$"
 

diff --git a/src/modcmd.c b/src/modcmd.c
index dfd9ed967ab9095a8f15cb2d5ec94c0e08bb9bc9..84cb36d337ebfb302e15af552221f8b64b070f95 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -18,7 +18,6 @@
  * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
 
-#include "../ChangeLog"
 #include "chanserv.h"
 #include "conf.h"
 #include "compat.h"
@@ -977,28 +976,6 @@ svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *c
     return argc ? svccmd_invoke_argv(user, service, channel, argc, argv, server_qualified) : 0;
 }
 
-char *cvs_verstring() {
-  static char verstring[MAXLEN] = { 0 };
-  
-  if(!*verstring) {
-    char *svn = NULL, *svnver = NULL, *svndate = NULL, *v = 0, ver[MAXLEN];
-    int vc = 0;
-
-    strcpy(ver, CVS_VERSION);
-    for (svn = x3_strtok(&v, ver, " "); svn;
-         svn = x3_strtok(&v, 0, " ")) {
-        if (vc == 2)
-            svnver = svn;
-        else if (vc == 3)
-            svndate = svn;
-        vc++;
-    }
-    sprintf(verstring, "%s %s", svnver, svndate);
-  }
-  return verstring;
-}
-
-
 void
 modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, int server_qualified) {
     struct service *service;