onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-10 23:22:33 +02:00
Code Issues Releases Wiki Activity

need to define variables GENERATION and GENERATION_SHORT for .nsi file

Browse Source
This commit is contained in:
Vadim Kurland
2012-03-19 14:17:02 -07:00
parent bf72cebcf6
commit a576ebac58
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+3
View File
@@ -19,6 +19,7 @@ dnl
. ./VERSION . ./VERSION
RELEASE_NUM=$BUILD_NUM RELEASE_NUM=$BUILD_NUM
GENERATION_SHORT=$(echo $GENERATION | sed 's/\.//')
AC_DEFINE_UNQUOTED(BUILD_NUM, "$BUILD_NUM") AC_DEFINE_UNQUOTED(BUILD_NUM, "$BUILD_NUM")
AC_SUBST(BUILD_NUM) AC_SUBST(BUILD_NUM)
@@ -28,6 +29,8 @@ AC_SUBST(FWB_MAJOR_VERSION)
AC_SUBST(FWB_MINOR_VERSION) AC_SUBST(FWB_MINOR_VERSION)
AC_SUBST(FWB_MICRO_VERSION) AC_SUBST(FWB_MICRO_VERSION)
AC_SUBST(FWB_VERSION) AC_SUBST(FWB_VERSION)
AC_SUBST(GENERATION)
AC_SUBST(GENERATION_SHORT)
# libfwbuilder versions # libfwbuilder versions
dnl AC_SUBST(LIBFWBUILDER_VERSION) dnl AC_SUBST(LIBFWBUILDER_VERSION)
packaging/fwbuilder.nsi
+2 -2
View File
@@ -11,8 +11,8 @@ Var STARTMENU_FOLDER
; GENERATION is used to build the path in the registry, it should be coordinated ; GENERATION is used to build the path in the registry, it should be coordinated
; with the path defined in FWBSettings class ; with the path defined in FWBSettings class
; ;
!define GENERATION "@GENERATION@" !define GENERATION "5.1"
!define GENERATION_SHORT "@GENERATION_SHORT@" !define GENERATION_SHORT "51"
!define VERSION "5.1.0.3598" !define VERSION "5.1.0.3598"
src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h
+2 -2
View File
@@ -13,7 +13,7 @@
* Template files directory dir * Template files directory dir
* DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! * 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 */ /* #undef UCD_SNMP */
# define HAVE_LIBSNMP 1 # define HAVE_LIBSNMP 1
@@ -59,7 +59,7 @@
* Template files directory dir * Template files directory dir
* DO NOT USE THIS CONSTANT DIRECTLY - USE Constants class instead! * 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 #define HAVE_LIBSNMP 1
/* #undef UCD_SNMP */ /* #undef UCD_SNMP */