You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/30 18:11:29 UTC
svn commit: r809367 - in /commons/sandbox/runtime/trunk/src/main/native:
include/acr_version.h shared/buildmark.c test/testsuite.c
Author: mturk
Date: Sun Aug 30 16:11:29 2009
New Revision: 809367
URL: http://svn.apache.org/viewvc?rev=809367&view=rev
Log:
Add about instead referencing versions directly
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr_version.h
commons/sandbox/runtime/trunk/src/main/native/shared/buildmark.c
commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr_version.h
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr_version.h?rev=809367&r1=809366&r2=809367&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr_version.h (original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr_version.h Sun Aug 30 16:11:29 2009
@@ -96,6 +96,10 @@
*/
ACR_DECLARE(const char *) ACR_GetLibraryBuilt(void);
+/** Return about string
+ */
+ACR_DECLARE(const char *) ACR_GetLibraryAbout(void);
+
#ifdef __cplusplus
}
#endif
Modified: commons/sandbox/runtime/trunk/src/main/native/shared/buildmark.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/buildmark.c?rev=809367&r1=809366&r2=809367&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/buildmark.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/buildmark.c Sun Aug 30 16:11:29 2009
@@ -15,7 +15,11 @@
*/
#include "acr.h"
+#include "acr_private.h"
+#include "acr_arch.h"
#include "acr_version.h"
+#include "bzip2/bzlib.h"
+#include "zlib/zlib.h"
#if defined(__DATE__) && defined(__TIME__)
static const char library_built[] = __DATE__ " " __TIME__;
@@ -27,3 +31,16 @@
{
return library_built;
}
+
+ACR_DECLARE(const char *) ACR_GetLibraryAbout()
+{
+ static char about[ACR_HBUFF_SIZ] = "";
+ if (!about[0]) {
+ snprintf(about, ACR_HBUFF_LEN,
+ "Apache Commons Runtime (%s) / zlib (%s) / bzlib (%s)",
+ ACR_VERSION_STRING,
+ zlibVersion(),
+ BZ2_bzlibVersion());
+ }
+ return about;
+}
Modified: commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c?rev=809367&r1=809366&r2=809367&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/test/testsuite.c Sun Aug 30 16:11:29 2009
@@ -42,9 +42,6 @@
#include "acr_time.h"
#include "acr_version.h"
-#include "zlib/zlib.h"
-#include "bzip2/bzlib.h"
-
#if defined (WIN32)
#include <io.h>
#include <sys/stat.h>
@@ -476,12 +473,7 @@
fprintf(stdout,
"Running Apache Commons Runtime %s (%s version) test suite.\n",
ACR_VERSION_STRING, ACR_GetLibraryBuilt());
- fprintf(stdout,
- "Using embedded zlib : `%s'\n",
- acr_z_zlibVersion());
- fprintf(stdout,
- "Using embedded bzlib : `%s'\n",
- acr_BZ2_bzlibVersion());
+ fprintf(stdout, "%s\n", ACR_GetLibraryAbout());
fflush(stdout);
if ((rv = ACR_Initialize(NULL)))