changeset 282:918db59d3814

[gaim-migrate @ 292] Libfaim is versioned. committer: Tailor Script <[e-mail]>

--- a/libfaim/CHANGES	Tue May 30 23:49:54 2000 +0000
+++ b/libfaim/CHANGES	Wed May 31 00:57:39 2000 +0000
@@ -1,6 +1,14 @@
 
 No release numbers
 ------------------
+ - Tue May 30 22:32:31 UTC 2000
+   - Added lock around tx seqnum to prevent that race when transmitting
+       from diverse threads. (actually committed earlier today)
+   - Added aim_meta.c and a few constants and things to keep
+       track of "releases".  
+   - Added mkbuildinfo.sh to automatically update build string
+       "constants" on every invocation of 'make all'.
+
  - Mon May 29 12:08:28 GMT 2000
    - Rearranged aim_tx_flushqueue(); moved write operation 
        to aim_tx_sendframe()

--- a/libfaim/CHANGES.gaim	Tue May 30 23:49:54 2000 +0000
+++ b/libfaim/CHANGES.gaim	Wed May 31 00:57:39 2000 +0000
@@ -1,3 +1,18 @@
+
+Wed May 31 00:40:42 UTC 2000 EWarmenhoven
+	- Adam added a file to libfaim, aim_meta.c, that has one main function:
+	  to return the libfaim version and when it was build (date/time). So
+	  I added it to gaim's copy.
+	- aim_meta.c included a file, aim_buildcode.h, which was created by a
+	  shell script, and defined two values at build time. Instead of have
+	  the Makefile run that script, I decided it would be easier to have
+	  the Makefile define those values itself. This marks now two minor
+	  changes to libfaim: changing some printf's to faimdprintf's, and not
+	  including the shell script in favor of the Makefile way of doing it.
+	- Just for grins (mostly to see if the code I added to Makefile.am did
+	  what I wanted it to), I added a line to oscar.c to print the gaim and
+	  libfaim versions to the debug window when you sign on. Maybe it'll be
+	  useful in debugging at some point?
 
 Tue May 30 23:40:11 UTC 2000 EWarmenhoven
 	- So today, somone IMs me and says that he thinks that allowing only the

--- a/libfaim/Makefile.am	Tue May 30 23:49:54 2000 +0000
+++ b/libfaim/Makefile.am	Wed May 31 00:57:39 2000 +0000
@@ -11,9 +11,9 @@
 #                    aim_global.c aim_logoff.c aim_search.c aim_util.c \
 #                    aim_chat.c aim_im.c aim_misc.c aim_snac.c
 libfaim_a_SOURCES = aim_auth.c aim_buddylist.c aim_chat.c aim_chatnav.c \
-		    aim_conn.c aim_im.c aim_info.c aim_login.c \
-		    aim_logoff.c aim_misc.c aim_rxhandlers.c aim_rxqueue.c \
+		    aim_conn.c aim_im.c aim_info.c aim_login.c aim_logoff.c \
+		    aim_meta.c aim_misc.c aim_rxhandlers.c aim_rxqueue.c \
 		    aim_search.c aim_snac.c aim_tlv.c aim_txqueue.c aim_util.c
 
-CFLAGS += $(GAIM_CFLAGS) -I../src
+CFLAGS += $(GAIM_CFLAGS) -I../src -DAIM_BUILDDATE=`date +%Y%m%e` -DAIM_BUILDTIME=`date +%H%M%S`
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libfaim/aim_meta.c	Wed May 31 00:57:39 2000 +0000
@@ -0,0 +1,35 @@
+/*
+ * Administrative things for libfaim.
+ *
+ * Changes by EWarmenhoven Wed May 31 00:31:52 UTC 2000
+ * - I don't wanna use aim_buildcode! :) I'll put the things that get made
+ *   by the .sh file into Makefile.am and hopefully that'll work better.
+ *  
+ */
+
+#include <faim/aim.h>
+/* #include <aim_buildcode.h> /* generated by mkbuildinfo.sh */
+
+long long aim_getbuilddate(void)
+{
+  return AIM_BUILDDATE;
+}
+
+long long aim_getbuildtime(void)
+{
+  return AIM_BUILDTIME;
+}
+
+char *aim_getbuildstring(void)
+{
+  static char string[100];
+
+  snprintf(string, 99, "%d.%d.%d-%Ld%Ld", 
+	   FAIM_VERSION_MAJOR,
+	   FAIM_VERSION_MINOR,
+	   FAIM_VERSION_MINORMINOR,
+	   aim_getbuilddate(),
+	   aim_getbuildtime());
+  return string;
+}
+

--- a/libfaim/faimconfig.h	Tue May 30 23:49:54 2000 +0000
+++ b/libfaim/faimconfig.h	Wed May 31 00:57:39 2000 +0000
@@ -6,13 +6,6 @@
  * that they'll get set here.  Notably, the 'debug' of this file is _not_ 
  * the same as the frontend 'debug'.  They can be different values.
  *
- * Changes by EWarmenhoven Mon May 29 20:08:17 UTC 2000:
- * - since gaim requires pthreads to be present at ./configure-time, all
- * systems gaim runs on theoretically have pthreads (this may not be true
- * since gaim does not use pthreads itself, hence there are ways around it).
- * Therefore, #define FAIM_USEPTHREADS should not be surrounded by
- * #ifdef __linux__/#endif.
- *
  */
 
 #ifndef __FAIMCONFIG_H__
@@ -115,13 +108,9 @@
  * 
  * Default: defined on Linux, otherwise undefined
  */
-/* gaim requires pthreads (though only at configure time), so this applies to
- * more than just linux
 #ifdef __linux__
 #define FAIM_USEPTHREADS
 #endif
-*/
-#define FAIM_USEPTHREADS
 
 #endif /* __FAIMCONFIG_H__ */
 

--- a/src/oscar.c	Tue May 30 23:49:54 2000 +0000
+++ b/src/oscar.c	Wed May 31 00:57:39 2000 +0000
@@ -577,6 +577,9 @@
 
 	sprintf(debug_buff, "MOTD: %s\n", msg);
 	debug_print(debug_buff);
+	sprintf(debug_buff, "Gaim %s / Libfaim %s\n",
+			VERSION, aim_getbuildstring());
+	debug_print(debug_buff);
 
 	return 1;
 }