Browse Source

Write release id if rspamd is built from hg.

tags/0.3.7
Vsevolod Stakhov 13 years ago
parent
commit
426963bff9
3 changed files with 26 additions and 2 deletions
  1. 23
    0
      CMakeLists.txt
  2. 1
    0
      config.h.in
  3. 2
    2
      src/main.c

+ 23
- 0
CMakeLists.txt View File

SET(RSPAMD_VERSION_MINOR 3) SET(RSPAMD_VERSION_MINOR 3)
SET(RSPAMD_VERSION_PATCH 3) SET(RSPAMD_VERSION_PATCH 3)



SET(RSPAMD_VERSION "${RSPAMD_VERSION_MAJOR}.${RSPAMD_VERSION_MINOR}.${RSPAMD_VERSION_PATCH}") SET(RSPAMD_VERSION "${RSPAMD_VERSION_MAJOR}.${RSPAMD_VERSION_MINOR}.${RSPAMD_VERSION_PATCH}")
SET(RSPAMD_MASTER_SITE_URL "http://bitbucket.org/vstakhov/rspamd") SET(RSPAMD_MASTER_SITE_URL "http://bitbucket.org/vstakhov/rspamd")
SET(RSPAMD_USER "nobody") SET(RSPAMD_USER "nobody")
SET(DESTDIR $ENV{DESTDIR}) SET(DESTDIR $ENV{DESTDIR})
ENDIF(NOT DESTDIR) ENDIF(NOT DESTDIR)


# Try to detect tip version from hg
SET(ID "unknown")
FIND_PROGRAM(HG "hg")

IF(HG)
EXECUTE_PROCESS(COMMAND ${HG} "id" OUTPUT_VARIABLE HG_ID)
IF(HG_ID)
STRING(REGEX MATCH ^[0-9a-z]+ ID "${HG_ID}")
ENDIF(HG_ID)
ELSE(HG)
# Now check .hg_archival.txt
FIND_FILE(HG_ARCH ".hg_archival.txt" "${CMAKE_CURRENT_SOURCE_DIR}")
IF(HG_ARCH)
FILE(READ ${HG_ARCH} HG_ID)
IF(HG_ID)
STRING(REGEX MATCH "node: [0-9a-z]+" _tmp "${HG_ID}")
STRING(SUBSTRING "${_tmp}" 6 12 ID)
ENDIF(HG_ID)
ENDIF(HG_ARCH)
ENDIF(HG)

################################ SOURCES SECTION ########################### ################################ SOURCES SECTION ###########################


SET(RSPAMDSRC src/modules.c SET(RSPAMDSRC src/modules.c

+ 1
- 0
config.h.in View File

#cmakedefine HAVE_CLOCK_GETTIME 1 #cmakedefine HAVE_CLOCK_GETTIME 1


#define RVERSION "${RSPAMD_VERSION}" #define RVERSION "${RSPAMD_VERSION}"
#define RID "${ID}"
#define RSPAMD_MASTER_SITE_URL "${RSPAMD_MASTER_SITE_URL}" #define RSPAMD_MASTER_SITE_URL "${RSPAMD_MASTER_SITE_URL}"


#define MODULES_NUM ${RSPAMD_MODULES_NUM} #define MODULES_NUM ${RSPAMD_MODULES_NUM}

+ 2
- 2
src/main.c View File

GOptionContext *context; GOptionContext *context;


context = g_option_context_new ("- run rspamd daemon"); context = g_option_context_new ("- run rspamd daemon");
g_option_context_set_summary (context, "Summary:\n Rspamd daemon version " RVERSION);
g_option_context_set_summary (context, "Summary:\n Rspamd daemon version " RVERSION "\n Release id: " RID);
g_option_context_add_main_entries (context, entries, NULL); g_option_context_add_main_entries (context, entries, NULL);
if (!g_option_context_parse (context, &argc, &argv, &error)) { if (!g_option_context_parse (context, &argc, &argv, &error)) {
fprintf (stderr, "option parsing failed: %s\n", error->message); fprintf (stderr, "option parsing failed: %s\n", error->message);


config_logger (rspamd, TRUE); config_logger (rspamd, TRUE);


msg_info ("rspamd " RVERSION " is starting");
msg_info ("rspamd " RVERSION " is starting, build id: " RID);
rspamd->cfg->cfg_name = memory_pool_strdup (rspamd->cfg->cfg_pool, rspamd->cfg->cfg_name); rspamd->cfg->cfg_name = memory_pool_strdup (rspamd->cfg->cfg_pool, rspamd->cfg->cfg_name);


if (!rspamd->cfg->no_fork && daemon (0, 0) == -1) { if (!rspamd->cfg->no_fork && daemon (0, 0) == -1) {

Loading…
Cancel
Save