[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
From: <gi...@ir...> - 2012-03-19 21:48:37
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Firewall Builder GUI and Policy Compilers Open Source Code". The branch, development has been updated via a576ebac58a7999861d400c064a47cba3840a3e1 (commit) from bf72cebcf6eed83eac684f324c68ade522b3120c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a576ebac58a7999861d400c064a47cba3840a3e1 Author: Vadim Kurland <va...@ne...> Date: Mon Mar 19 14:17:02 2012 -0700 need to define variables GENERATION and GENERATION_SHORT for .nsi file diff --git a/configure.in b/configure.in index 739e8c5..a822f75 100644 --- a/configure.in +++ b/configure.in @@ -19,6 +19,7 @@ dnl . ./VERSION RELEASE_NUM=$BUILD_NUM +GENERATION_SHORT=$(echo $GENERATION | sed 's/\.//') AC_DEFINE_UNQUOTED(BUILD_NUM, "$BUILD_NUM") AC_SUBST(BUILD_NUM) @@ -28,6 +29,8 @@ AC_SUBST(FWB_MAJOR_VERSION) AC_SUBST(FWB_MINOR_VERSION) AC_SUBST(FWB_MICRO_VERSION) AC_SUBST(FWB_VERSION) +AC_SUBST(GENERATION) +AC_SUBST(GENERATION_SHORT) # libfwbuilder versions dnl AC_SUBST(LIBFWBUILDER_VERSION) diff --git a/packaging/fwbuilder.nsi b/packaging/fwbuilder.nsi index 66cfebf..2c9fe3c 100644 --- a/packaging/fwbuilder.nsi +++ b/packaging/fwbuilder.nsi @@ -11,8 +11,8 @@ Var STARTMENU_FOLDER ; GENERATION is used to build the path in the registry, it should be coordinated ; with the path defined in FWBSettings class ; -!define GENERATION "@GENERATION@" -!define GENERATION_SHORT "@GENERATION_SHORT@" +!define GENERATION "5.1" +!define GENERATION_SHORT "51" !define VERSION "5.1.0.3598" diff --git a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h index 073499a..15bab9f 100644 --- a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h +++ b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h @@ -13,7 +13,7 @@ * Template files directory dir * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! */ -# define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598" +# define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598" /* #undef UCD_SNMP */ # define HAVE_LIBSNMP 1 @@ -59,7 +59,7 @@ * Template files directory dir * DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! */ -#define RES_DIR "/home/vadim/src/v4/build/install_root/share/fwbuilder-5.1.0.3598" +#define RES_DIR "/usr/local/share/fwbuilder-5.1.0.3598" #define HAVE_LIBSNMP 1 /* #undef UCD_SNMP */ ----------------------------------------------------------------------- Summary of changes: configure.in | 3 +++ packaging/fwbuilder.nsi | 4 ++-- .../src/fwbuilder/libfwbuilder-config.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) hooks/post-receive -- Firewall Builder GUI and Policy Compilers Open Source Code |