onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 03:37:15 +01:00
Code Issues Releases Wiki Activity

using BUILD_NUM instead of RELEASE everywhere

Browse Source
This commit is contained in:
Vadim Kurland 2009-10-01 17:14:32 +00:00
parent c9d5309011
commit f1d722a0c0
16 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.h
View File

@ -1,2 +1 @@
#define VERSION "3.1.0"
#define RELEASE_NUM ""

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 1532
#define BUILD_NUM 1533

13
configure.in
View File

@ -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

2
src/cisco_lib/CompilerDriver_iosacl_run.cpp
View File

@ -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
<< " "

4
src/fwbedit/fwbedit.cpp
View File

@ -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;

2
src/gui/FWBAboutDialog.cpp
View File

@ -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() ) );

5
src/gui/debugDialog.cpp
View File

@ -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() ) );

3
src/iosacl/iosacl.cpp
View File

@ -24,6 +24,7 @@
*/
#include "../../config.h"
#include "../../build_num"
#include <fstream>
#include <iostream>
@ -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;
}

3
src/ipf/ipf.cpp
View File

@ -24,6 +24,7 @@
*/
#include "../../config.h"
#include "../../build_num"
#ifdef HAVE_LOCALE_H
#include <locale.h>
@ -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;
}

3
src/ipfw/ipfw.cpp
View File

@ -24,6 +24,7 @@
*/
#include "../../config.h"
#include "../../build_num"
#ifdef HAVE_LOCALE_H
#include <locale.h>
@ -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;
}

2
src/ipt/ipt.cpp
View File

@ -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;

3
src/pf/pf.cpp
View File

@ -24,6 +24,7 @@
*/
#include "../../config.h"
#include "../../build_num"
#include <fstream>
#include <iostream>
@ -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;
}

2
src/pflib/CompilerDriver_ipf_run.cpp
View File

@ -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";

2
src/pflib/CompilerDriver_ipfw_run.cpp
View File

@ -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";

2
src/pflib/CompilerDriver_pf_run.cpp
View File

@ -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";

3
src/pix/pix.cpp
View File

@ -24,6 +24,7 @@
*/
#include "../../config.h"
#include "../../build_num"
#include <fstream>
#include <iostream>
@ -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;
}