started 3.0.4

This commit is contained in:
Vadim Kurland
2008-12-14 02:25:03 +00:00
parent 3cb2ed2afe
commit bb69226215
24 changed files with 44 additions and 42 deletions
+4 -4
View File
@@ -3,16 +3,16 @@
FWB_MAJOR_VERSION=3 FWB_MAJOR_VERSION=3
FWB_MINOR_VERSION=0 FWB_MINOR_VERSION=0
FWB_MICRO_VERSION=3 FWB_MICRO_VERSION=4
VERSION="3.0.3" VERSION="3.0.4"
SHORTVERSION="303" SHORTVERSION="304"
# RELEASE="1" # RELEASE="1"
RELEASE="b@BUILD_NUM@" RELEASE="b@BUILD_NUM@"
BETA="no" BETA="no"
REQUIRED_LIBFWBUILDER_VERSION="3.0.3" REQUIRED_LIBFWBUILDER_VERSION="3.0.4"
# current (or major) version number of the library so file # current (or major) version number of the library so file
# #
+1 -1
View File
@@ -1,2 +1,2 @@
#define VERSION "3.0.3" #define VERSION "3.0.4"
#define RELEASE_NUM "" #define RELEASE_NUM ""
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 688 #define BUILD_NUM 690
+2
View File
@@ -1,5 +1,7 @@
2008-12-13 Vadim Kurland <vadim@vk.crocodile.org> 2008-12-13 Vadim Kurland <vadim@vk.crocodile.org>
* VERSION (VERSION): started v3.0.4
* v3.0.3 released, merged to trunk. This comment is -r689 * v3.0.3 released, merged to trunk. This comment is -r689
2008-12-08 Vadim Kurland <vadim@vk.crocodile.org> 2008-12-08 Vadim Kurland <vadim@vk.crocodile.org>
+17 -17
View File
@@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@
DEFINES += $$(DEFINES) DEFINES += $$(DEFINES)
LANGUAGE = C++ LANGUAGE = C++
UI_DIR = ui UI_DIR = ui
MANDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/man/ MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
DOCDIR = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.3 DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4
HAVE_ANTLR_RUNTIME = 1 HAVE_ANTLR_RUNTIME = 1
HAVE_EXTERNAL_ANTLR = 0 HAVE_EXTERNAL_ANTLR = 0
unix { unix {
ANTLR_INCLUDEPATH = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/ ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /Users/vadim/src/fwbuilder/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a
FWBPARSER_LIB = ../parsers/libfwbparser.a FWBPARSER_LIB = ../parsers/libfwbparser.a
} }
@@ -30,38 +30,38 @@ unix {
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj OBJECTS_DIR = .obj
PREFIX = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root PREFIX = /home/vadim/src/fwb3-branch-v3/install_root
exec_prefix = @EXEC_PREFIX@ exec_prefix = @EXEC_PREFIX@
DESTDIR = DESTDIR =
ICONSDIR = ICONSDIR = /home/vadim/src/fwb3-branch-v3/install_root/share//icons/hicolor/
INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/ /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2 INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /home/vadim/src/fwb3-branch-v3/install_root/include/ /home/vadim/src/fwb3-branch-v3/install_root/include/fwb-3 /usr/include/libxml2
LIBS_FWCOMPILER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lz -lxslt -lxml2 -lnetsnmp -lm -lwrap
LIBS_FWBUILDER = -L/Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lz -lxslt -lxml2 -lnetsnmp -lm -lwrap
target.path = $$PREFIX/bin target.path = $$PREFIX/bin
dtd.path = @TEMPLATE_DIR@/ dtd.path = @TEMPLATE_DIR@/
migration.path = @TEMPLATE_DIR@/migration migration.path = @TEMPLATE_DIR@/migration
doc.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.3 doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.4
datadir.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share/ datadir.path = /home/vadim/src/fwb3-branch-v3/install_root/share/
# win32:target.path = $$PREFIX/ # win32:target.path = $$PREFIX/
# unix:target.path = $$PREFIX/share/fwbuilder/ # unix:target.path = $$PREFIX/share/fwbuilder/
# macx:target.path = $$PREFIX/ # macx:target.path = $$PREFIX/
res.path = ../Resources res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4
res_os.path = ../Resources/os/ res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/os/
res_platform.path = ../Resources/platform/ res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/platform/
res_help.path = ../Resources/help/ res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.4/help/
res_desktop.path = /Users/vadim/src/fwbuilder/fwb3-branch-v3/install_root/share//applications/ res_desktop.path = /home/vadim/src/fwb3-branch-v3/install_root/share//applications/
INSTALLS += res INSTALLS += res
INSTALLS += res_os INSTALLS += res_os
INSTALLS += res_platform INSTALLS += res_platform
# INSTALLS += icns # INSTALLS += icns
LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll LIBS += $$LIBS_FWBUILDER -lutil
PKGLOCALEDIR = $$res.path/locale PKGLOCALEDIR = $$res.path/locale
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="freebsd"> <Target name="freebsd">
<description>FreeBSD</description> <description>FreeBSD</description>
<family>freebsd</family> <family>freebsd</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3-"> <FWBuilderResources version="3.0.4-">
<Target name="pix_os"> <Target name="pix_os">
<description>Cisco FWSM</description> <description>Cisco FWSM</description>
<compiler>fwb_pix</compiler> <compiler>fwb_pix</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3-"> <FWBuilderResources version="3.0.4-">
<Target name="ios"> <Target name="ios">
<description>Cisco IOS</description> <description>Cisco IOS</description>
<compiler>fwb_iosacl</compiler> <compiler>fwb_iosacl</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="linksys"> <Target name="linksys">
<description>Linksys/Sveasoft</description> <description>Linksys/Sveasoft</description>
<family>linux24</family> <family>linux24</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="linux24"> <Target name="linux24">
<description>Linux 2.4/2.6</description> <description>Linux 2.4/2.6</description>
<family>linux24</family> <family>linux24</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="macosx"> <Target name="macosx">
<description>Mac OS X</description> <description>Mac OS X</description>
<family>macosx</family> <family>macosx</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="openbsd"> <Target name="openbsd">
<description>OpenBSD</description> <description>OpenBSD</description>
<family>openbsd</family> <family>openbsd</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3-"> <FWBuilderResources version="3.0.4-">
<Target name="pix_os"> <Target name="pix_os">
<description>Cisco PIX</description> <description>Cisco PIX</description>
<compiler>fwb_pix</compiler> <compiler>fwb_pix</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="solaris"> <Target name="solaris">
<description>Solaris</description> <description>Solaris</description>
<family>solaris</family> <family>solaris</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <!-- -*- mode: xml; -*- --> <?xml version="1.0"?> <!-- -*- mode: xml; -*- -->
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="unknown_os"> <Target name="unknown_os">
<description>Unknown</description> <description>Unknown</description>
<family>unknown</family> <family>unknown</family>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3-"> <FWBuilderResources version="3.0.4-">
<Target name="FWSM"> <Target name="FWSM">
<description>FWSM</description> <description>FWSM</description>
<compiler>fwb_pix</compiler> <compiler>fwb_pix</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3-"> <FWBuilderResources version="3.0.4-">
<Target name="iosacl"> <Target name="iosacl">
<description>IOS ACL</description> <description>IOS ACL</description>
<compiler>fwb_iosacl</compiler> <compiler>fwb_iosacl</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="ipf"> <Target name="ipf">
<description>ipfilter</description> <description>ipfilter</description>
<compiler>fwb_ipf</compiler> <compiler>fwb_ipf</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="ipfw"> <Target name="ipfw">
<description>ipfw</description> <description>ipfw</description>
<compiler>fwb_ipfw</compiler> <compiler>fwb_ipfw</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="iptables"> <Target name="iptables">
<description>iptables</description> <description>iptables</description>
<compiler>fwb_ipt</compiler> <compiler>fwb_ipt</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="pf"> <Target name="pf">
<description>PF</description> <description>PF</description>
<compiler>fwb_pf</compiler> <compiler>fwb_pf</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3-"> <FWBuilderResources version="3.0.4-">
<Target name="pix"> <Target name="pix">
<description>PIX</description> <description>PIX</description>
<compiler>fwb_pix</compiler> <compiler>fwb_pix</compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Target name="unknown"> <Target name="unknown">
<description>Unknown</description> <description>Unknown</description>
<compiler></compiler> <compiler></compiler>
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<FWBuilderResources version="3.0.3"> <FWBuilderResources version="3.0.4">
<Paths> <Paths>
<Icndir>@PACKAGE_PIXMAPS_DIR@</Icndir> <Icndir>@PACKAGE_PIXMAPS_DIR@</Icndir>
</Paths> </Paths>