diff --git a/build_num b/build_num index 48d35b8fa..95a299d55 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 433 +#define BUILD_NUM 434 diff --git a/doc/ChangeLog b/doc/ChangeLog index f99c4297e..a95a4c685 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,7 @@ -2008-08-01 vadim +2008-08-01 Vadim Kurland + + * ipt.pro: Eliminated dependency on QT in all policy compilers. + Compiler binaries can be deployed on machines without QT and X11. * ObjectManipulator.cpp (ObjectManipulator::contextMenuRequested): fixed bug #2023243: "IPv6 - Some objects missing from context diff --git a/qmake.inc b/qmake.inc index dacae5284..235850e66 100644 --- a/qmake.inc +++ b/qmake.inc @@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui -MANDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/man/ -DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 +MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/ +DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ - ANTLR_LIBS = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a + ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ + ANTLR_LIBS = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/antlr/libantlr.a FWBPARSER_LIB = ../parsers/libfwbparser.a } @@ -30,36 +30,36 @@ unix { MOC_DIR = .moc OBJECTS_DIR = .obj - PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root + PREFIX = /home/vadim/src/fwb3-branch-v3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = - INCLUDEPATH += .. ../.. $$(INCLUDEPATH) /Users/vadim/src/fwb3-branch-v3/install_root/include/ /Users/vadim/src/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/fwb3-branch-v3/install_root/lib -lfwcompiler -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp - LIBS_FWBUILDER = -L/Users/vadim/src/fwb3-branch-v3/install_root/lib -lfwbuilder -lxslt -lxml2 -lz -lpthread -licucore -lm -lnetsnmp + LIBS_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap + LIBS_FWBUILDER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 + doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 # win32:target.path = $$PREFIX/ # unix:target.path = $$PREFIX/share/fwbuilder/ # macx:target.path = $$PREFIX/ res.files = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml - res.path = ../Resources + res.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0 res_os.files = src/res/os/*.xml - res_os.path = ../Resources/os/ + res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/ res_platform.files = src/res/platform/*.xml - res_platform.path = ../Resources/platform/ + res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/ INSTALLS += res INSTALLS += res_os INSTALLS += res_platform # INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll + LIBS += $$LIBS_FWBUILDER -lutil PKGLOCALEDIR = $$res.path/locale diff --git a/src/iosacl/iosacl.cpp b/src/iosacl/iosacl.cpp index 99086478f..18f76648c 100644 --- a/src/iosacl/iosacl.cpp +++ b/src/iosacl/iosacl.cpp @@ -25,8 +25,6 @@ #include "../../config.h" -#include - #include #include #include diff --git a/src/iosacl/iosacl.pro b/src/iosacl/iosacl.pro index d6b36b1e8..872f19c0c 100644 --- a/src/iosacl/iosacl.pro +++ b/src/iosacl/iosacl.pro @@ -20,7 +20,6 @@ HEADERS = ../../config.h \ ../cisco_lib/ACL.h \ ../cisco_lib/Helper.h -# CONFIG -= qt !win32 { QMAKE_COPY = /usr/bin/install -m 0755 -s } @@ -34,5 +33,7 @@ win32:LIBS += ../cisco_lib/release/fwbcisco.lib LIBS += $$LIBS_FWCOMPILER +unix: CONFIG -= qt + TARGET = fwb_iosacl diff --git a/src/ipf/ipf.cpp b/src/ipf/ipf.cpp index 01b7c1578..97478a671 100644 --- a/src/ipf/ipf.cpp +++ b/src/ipf/ipf.cpp @@ -25,8 +25,6 @@ #include "../../config.h" -#include - #ifdef HAVE_LOCALE_H #include #endif diff --git a/src/ipf/ipf.pro b/src/ipf/ipf.pro index b09ce5e70..e05a28d75 100644 --- a/src/ipf/ipf.pro +++ b/src/ipf/ipf.pro @@ -27,4 +27,6 @@ win32:LIBS += ../pflib/release/fwbpf.lib LIBS += $$LIBS_FWCOMPILER +unix: CONFIG -= qt + TARGET = fwb_ipf diff --git a/src/ipfw/ipfw.cpp b/src/ipfw/ipfw.cpp index 9d0278e0f..62d7f2060 100644 --- a/src/ipfw/ipfw.cpp +++ b/src/ipfw/ipfw.cpp @@ -25,8 +25,6 @@ #include "../../config.h" -#include - #ifdef HAVE_LOCALE_H #include #endif diff --git a/src/ipfw/ipfw.pro b/src/ipfw/ipfw.pro index 96cbef8c2..bfc3817c1 100644 --- a/src/ipfw/ipfw.pro +++ b/src/ipfw/ipfw.pro @@ -27,4 +27,6 @@ win32:LIBS += ../pflib/release/fwbpf.lib LIBS += $$LIBS_FWCOMPILER +unix: CONFIG -= qt + TARGET = fwb_ipfw diff --git a/src/ipt/ipt.cpp b/src/ipt/ipt.cpp index e1f900f5f..915f86aca 100644 --- a/src/ipt/ipt.cpp +++ b/src/ipt/ipt.cpp @@ -26,8 +26,6 @@ #include "../../config.h" #include "../../build_num" -#include - #ifdef HAVE_LOCALE_H #include #endif diff --git a/src/ipt/ipt.pro b/src/ipt/ipt.pro index cc1a324fd..1e2cf84d9 100644 --- a/src/ipt/ipt.pro +++ b/src/ipt/ipt.pro @@ -35,6 +35,8 @@ HEADERS = ../../config.h \ win32:CONFIG += console +unix: CONFIG -= qt + TARGET = fwb_ipt LIBS += $$LIBS_FWCOMPILER diff --git a/src/pf/pf.cpp b/src/pf/pf.cpp index 47bf1d518..b6171933c 100644 --- a/src/pf/pf.cpp +++ b/src/pf/pf.cpp @@ -25,8 +25,6 @@ #include "../../config.h" -#include - #ifdef HAVE_LOCALE_H #include #endif diff --git a/src/pf/pf.pro b/src/pf/pf.pro index 56e4e42fe..0867fd0f1 100644 --- a/src/pf/pf.pro +++ b/src/pf/pf.pro @@ -23,4 +23,6 @@ win32:LIBS += ../pflib/release/fwbpf.lib LIBS += $$LIBS_FWCOMPILER +unix: CONFIG -= qt + TARGET = fwb_pf diff --git a/src/pix/pix.cpp b/src/pix/pix.cpp index bbf0b4b68..0d6da1eb7 100644 --- a/src/pix/pix.cpp +++ b/src/pix/pix.cpp @@ -25,8 +25,6 @@ #include "../../config.h" -#include - #include #include #include diff --git a/src/pix/pix.pro b/src/pix/pix.pro index 3b57ac8d7..6ba882a82 100644 --- a/src/pix/pix.pro +++ b/src/pix/pix.pro @@ -27,7 +27,6 @@ HEADERS = ../../config.h \ ../cisco_lib/ACL.h \ ../cisco_lib/Helper.h -# CONFIG -= qt !win32 { QMAKE_COPY = /usr/bin/install -m 0755 -s } @@ -41,5 +40,7 @@ win32:LIBS += ../cisco_lib/release/fwbcisco.lib LIBS += $$LIBS_FWCOMPILER +unix: CONFIG -= qt + TARGET = fwb_pix