From f1d722a0c0e8a4a8b5f9a0b47e6abbcb6d72859e Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Thu, 1 Oct 2009 17:14:32 +0000 Subject: [PATCH] using BUILD_NUM instead of RELEASE everywhere --- VERSION.h | 1 - build_num | 2 +- configure.in | 13 ------------- src/cisco_lib/CompilerDriver_iosacl_run.cpp | 2 +- src/fwbedit/fwbedit.cpp | 4 +++- src/gui/FWBAboutDialog.cpp | 2 +- src/gui/debugDialog.cpp | 5 +++-- src/iosacl/iosacl.cpp | 3 ++- src/ipf/ipf.cpp | 3 ++- src/ipfw/ipfw.cpp | 3 ++- src/ipt/ipt.cpp | 2 +- src/pf/pf.cpp | 3 ++- src/pflib/CompilerDriver_ipf_run.cpp | 2 +- src/pflib/CompilerDriver_ipfw_run.cpp | 2 +- src/pflib/CompilerDriver_pf_run.cpp | 2 +- src/pix/pix.cpp | 3 ++- 16 files changed, 23 insertions(+), 29 deletions(-) diff --git a/VERSION.h b/VERSION.h index 184f74025..f20c9df0f 100644 --- a/VERSION.h +++ b/VERSION.h @@ -1,2 +1 @@ #define VERSION "3.1.0" -#define RELEASE_NUM "" diff --git a/build_num b/build_num index 0e02b4d1b..2f1216bce 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 1532 +#define BUILD_NUM 1533 diff --git a/configure.in b/configure.in index 5f8d2a82f..25739254b 100644 --- a/configure.in +++ b/configure.in @@ -24,14 +24,9 @@ AC_SUBST(FWB_VERSION) SHORTVERSION=${FWB_MAJOR_VERSION}${FWB_MINOR_VERSION}${FWB_MICRO_VERSION} AC_SUBST(SHORTVERSION) -AC_SUBST(RELEASE_NUM) -AC_DEFINE_UNQUOTED(RELEASE_NUM, "$RELEASE_NUM", [release_num]) - echo "Creating VERSION.h file..." echo "#define VERSION \"$VERSION\"" > VERSION.h -echo "#define RELEASE_NUM \"$RELEASE_NUM\"" >> VERSION.h - dnl try to find QT dnl @@ -297,16 +292,8 @@ else DATADIR="${PREFIX}/share/" fi - ICONSDIR="" -if test -z ${RELEASE_NUM}; then - RPMRELEASE="1" -else - RPMRELEASE="${RELEASE_NUM}"; -fi -AC_SUBST(RPMRELEASE) - AC_MSG_CHECKING(what OS this is) case ${host} in diff --git a/src/cisco_lib/CompilerDriver_iosacl_run.cpp b/src/cisco_lib/CompilerDriver_iosacl_run.cpp index bb1f8d3ed..121fc3a91 100644 --- a/src/cisco_lib/CompilerDriver_iosacl_run.cpp +++ b/src/cisco_lib/CompilerDriver_iosacl_run.cpp @@ -326,7 +326,7 @@ string CompilerDriver_iosacl::run(const std::string &cluster_id, script << "!\n\ ! This is automatically generated file. DO NOT MODIFY !\n\ !\n\ -! Firewall Builder fwb_iosacl v" << VERSION << "-" << RELEASE_NUM << " \n\ +! Firewall Builder fwb_iosacl v" << VERSION << "-" << BUILD_NUM << " \n\ !\n\ ! Generated " << timestr << " " diff --git a/src/fwbedit/fwbedit.cpp b/src/fwbedit/fwbedit.cpp index 75359ce5a..2bec9fa2f 100644 --- a/src/fwbedit/fwbedit.cpp +++ b/src/fwbedit/fwbedit.cpp @@ -24,6 +24,8 @@ */ #include "../../config.h" +#include "../../build_num" + #include "fwbuilder/libfwbuilder-config.h" #include "fwbuilder/Constants.h" @@ -140,7 +142,7 @@ void usage() { cout << "Firewall Builder: general purpose object tree editing tool" << endl; - cout << "Version " << VERSION << "-" << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << endl; cout << "Usage: fwbedit command [options]" << endl; cout << endl; diff --git a/src/gui/FWBAboutDialog.cpp b/src/gui/FWBAboutDialog.cpp index 4eebcc9f3..83d16a49b 100644 --- a/src/gui/FWBAboutDialog.cpp +++ b/src/gui/FWBAboutDialog.cpp @@ -39,7 +39,7 @@ FWBAboutDialog::FWBAboutDialog() m_aboutDialog->titleLbl->setText( QString("Firewall Builder v%1").arg(VERSION) ); m_aboutDialog->revLbl->setText( - tr("Revision: %1 ( Build: %2 )").arg(RELEASE_NUM).arg(BUILD_NUM) ); + tr("Build: %1").arg(BUILD_NUM) ); m_aboutDialog->apiLbl->setText( tr("Using Firewall Builder API %1").arg( libfwbuilder::Constants::getLibraryVersion().c_str() ) ); diff --git a/src/gui/debugDialog.cpp b/src/gui/debugDialog.cpp index 0890124e9..cc118d9ac 100644 --- a/src/gui/debugDialog.cpp +++ b/src/gui/debugDialog.cpp @@ -26,6 +26,7 @@ #include "../../config.h" #include "../../build_num" + #include "global.h" #include "utils.h" #include "VERSION.h" @@ -99,8 +100,8 @@ debugDialog::debugDialog(QWidget *parent) : m_dialog->debugText->append( QString("Versions:") ); m_dialog->debugText->append( QString(" Firewall Builder %1") .arg(VERSION) ); - m_dialog->debugText->append( QString(" Revision %1 Build %2") - .arg(RELEASE_NUM).arg(BUILD_NUM) ); + m_dialog->debugText->append( QString(" Build %2") + .arg(BUILD_NUM) ); m_dialog->debugText->append( QString(" Using libfwbuilder %1") .arg( libfwbuilder::Constants::getLibraryVersion().c_str() ) ); diff --git a/src/iosacl/iosacl.cpp b/src/iosacl/iosacl.cpp index 5447a9986..6090ae0c6 100644 --- a/src/iosacl/iosacl.cpp +++ b/src/iosacl/iosacl.cpp @@ -24,6 +24,7 @@ */ #include "../../config.h" +#include "../../build_num" #include #include @@ -82,7 +83,7 @@ void usage(const char *name) { cout << "Firewall Builder: policy compiler for Cisco IOS ACL" << endl; cout << "Copyright 2007-2009 NetCitadel, LLC" << endl; - cout << "Version " << VERSION << "-" << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << "Usage: " << name << " [-tvV] [-f filename.xml] [-d destdir] [-o output.fw] firewall_object_name" << endl; } diff --git a/src/ipf/ipf.cpp b/src/ipf/ipf.cpp index 063d72d92..1efa8a873 100644 --- a/src/ipf/ipf.cpp +++ b/src/ipf/ipf.cpp @@ -24,6 +24,7 @@ */ #include "../../config.h" +#include "../../build_num" #ifdef HAVE_LOCALE_H #include @@ -90,7 +91,7 @@ class UpgradePredicate: public XMLTools::UpgradePredicate void usage(const char *name) { cout << "Firewall Builder: policy compiler for ipfilter" << endl; - cout << "Version " << VERSION << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << "Usage: " << name << " [-x] [-v] [-V] [-f filename.xml] [-o output.fw] [-d destdir] [-m] firewall_object_name" << endl; } diff --git a/src/ipfw/ipfw.cpp b/src/ipfw/ipfw.cpp index b14dc346f..e79160e7b 100644 --- a/src/ipfw/ipfw.cpp +++ b/src/ipfw/ipfw.cpp @@ -24,6 +24,7 @@ */ #include "../../config.h" +#include "../../build_num" #ifdef HAVE_LOCALE_H #include @@ -87,7 +88,7 @@ class UpgradePredicate: public XMLTools::UpgradePredicate void usage(const char *name) { cout << "Firewall Builder: policy compiler for ipfw" << endl; - cout << "Version " << VERSION << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << "Usage: " << name << " [-x] [-v] [-V] [-f filename.xml] [-o output.fw] [-d destdir] [-m] firewall_object_name" << endl; } diff --git a/src/ipt/ipt.cpp b/src/ipt/ipt.cpp index 8e0171708..43b898c5b 100644 --- a/src/ipt/ipt.cpp +++ b/src/ipt/ipt.cpp @@ -66,7 +66,7 @@ void usage(const char *name) { cout << "Firewall Builder: policy compiler for " "Linux 2.4.x and 2.6.x iptables" << endl; - cout << "Version " << VERSION << "-" << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << "Usage: " << name << " [-x level] [-v] [-V] [-q] [-f filename.xml] [-d destdir] " "[-m] [-4|-6] firewall_object_name" << endl; diff --git a/src/pf/pf.cpp b/src/pf/pf.cpp index d33a0c39f..d013e04c7 100644 --- a/src/pf/pf.cpp +++ b/src/pf/pf.cpp @@ -24,6 +24,7 @@ */ #include "../../config.h" +#include "../../build_num" #include #include @@ -66,7 +67,7 @@ class UpgradePredicate: public XMLTools::UpgradePredicate void usage(const char *name) { cout << "Firewall Builder: policy compiler for OpenBSD PF" << endl; - cout << "Version " << VERSION << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << "Usage: " << name << " [-x] [-v] [-V] [-f filename.xml] [-o output.fw] [-d destdir] [-m] [-4|-6] firewall_object_name" << endl; } diff --git a/src/pflib/CompilerDriver_ipf_run.cpp b/src/pflib/CompilerDriver_ipf_run.cpp index 2ff639464..ed45cb2d3 100644 --- a/src/pflib/CompilerDriver_ipf_run.cpp +++ b/src/pflib/CompilerDriver_ipf_run.cpp @@ -370,7 +370,7 @@ string CompilerDriver_ipf::run(const std::string &cluster_id, script << "#\n\ # This is automatically generated file. DO NOT MODIFY !\n\ #\n\ -# Firewall Builder fwb_ipf v" << VERSION << "-" << RELEASE_NUM << " \n\ +# Firewall Builder fwb_ipf v" << VERSION << "-" << BUILD_NUM << " \n\ #\n\ # Generated " << timestr << " " << tzname[stm->tm_isdst] << " by " << user_name << "\n#\n#\n"; diff --git a/src/pflib/CompilerDriver_ipfw_run.cpp b/src/pflib/CompilerDriver_ipfw_run.cpp index 770b86559..a061ceff3 100644 --- a/src/pflib/CompilerDriver_ipfw_run.cpp +++ b/src/pflib/CompilerDriver_ipfw_run.cpp @@ -330,7 +330,7 @@ string CompilerDriver_ipfw::run(const std::string &cluster_id, script << "#\n\ # This is automatically generated file. DO NOT MODIFY !\n\ #\n\ -# Firewall Builder fwb_ipfw v" << VERSION << "-" << RELEASE_NUM << " \n\ +# Firewall Builder fwb_ipfw v" << VERSION << "-" << BUILD_NUM << " \n\ #\n\ # Generated " << timestr << " " << tzname[stm->tm_isdst] << " by " << user_name << "\n#\n"; diff --git a/src/pflib/CompilerDriver_pf_run.cpp b/src/pflib/CompilerDriver_pf_run.cpp index e108db99a..093e58eff 100644 --- a/src/pflib/CompilerDriver_pf_run.cpp +++ b/src/pflib/CompilerDriver_pf_run.cpp @@ -492,7 +492,7 @@ string CompilerDriver_pf::run(const std::string &cluster_id, script << "#\n\ # This is automatically generated file. DO NOT MODIFY !\n\ #\n\ -# Firewall Builder fwb_pf v" << VERSION << "-" << RELEASE_NUM << " \n\ +# Firewall Builder fwb_pf v" << VERSION << "-" << BUILD_NUM << " \n\ #\n\ # Generated " << timestr << " " << tzname[stm->tm_isdst] << " by " << user_name << "\n#\n"; diff --git a/src/pix/pix.cpp b/src/pix/pix.cpp index e42d693c1..1c71501db 100644 --- a/src/pix/pix.cpp +++ b/src/pix/pix.cpp @@ -24,6 +24,7 @@ */ #include "../../config.h" +#include "../../build_num" #include #include @@ -84,7 +85,7 @@ void usage(const char *name) { cout << "Firewall Builder: policy compiler for Cisco PIX firewall (with support for FWSM)" << endl; cout << "Copyright 2002-2009 NetCitadel, LLC" << endl; - cout << "Version " << VERSION << "-" << RELEASE_NUM << endl; + cout << "Version " << VERSION << "-" << BUILD_NUM << endl; cout << "Usage: " << name << " [-tvV] [-f filename.xml] [-d destdir] [-o output.fw] firewall_object_name" << endl; }