From 4045cd39cb7fda311b24c2374ea60d7cb1856389 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Sat, 2 Aug 2008 21:26:20 +0000 Subject: [PATCH] changelog entry --- build_num | 2 +- doc/ChangeLog | 8 ++++++++ qmake.inc | 28 ++++++++++++++-------------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/build_num b/build_num index e5321a837..00b4f58b5 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 437 +#define BUILD_NUM 438 diff --git a/doc/ChangeLog b/doc/ChangeLog index a95a4c685..5ab3523bf 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,11 @@ +2008-08-02 vadim + + * Help.cpp (Help::Help): generic built-in help framework. Help + files are created in .html format in src/res/help directory. First + dialog to get associated help panel that can be activated by + clicking "Help" button is Linux 2.4/2.6 firewall host settings + dialog. + 2008-08-01 Vadim Kurland * ipt.pro: Eliminated dependency on QT in all policy compilers. diff --git a/qmake.inc b/qmake.inc index 1f7814d6b..7f83d40af 100644 --- a/qmake.inc +++ b/qmake.inc @@ -11,15 +11,15 @@ SO_VERSION = @LIBFWBUILDER_SOLIB_VERSION@ DEFINES += $$(DEFINES) LANGUAGE = C++ UI_DIR = ui -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 +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 HAVE_ANTLR_RUNTIME = 1 HAVE_EXTERNAL_ANTLR = 0 unix { - 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 + 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 FWBPARSER_LIB = ../parsers/libfwbparser.a } @@ -30,38 +30,38 @@ unix { MOC_DIR = .moc OBJECTS_DIR = .obj - PREFIX = /home/vadim/src/fwb3-branch-v3/install_root + PREFIX = /Users/vadim/src/fwb3-branch-v3/install_root exec_prefix = @EXEC_PREFIX@ DESTDIR = - 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 + 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 - 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 + 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 target.path = $$PREFIX/bin dtd.path = @TEMPLATE_DIR@/ migration.path = @TEMPLATE_DIR@/migration - doc.path = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 + doc.path = /Users/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 = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0 + res.path = ../Resources res_os.files = src/res/os/*.xml - res_os.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/os/ + res_os.path = ../Resources/os/ res_platform.files = src/res/platform/*.xml - res_platform.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/platform/ + res_platform.path = ../Resources/platform/ res_help.files = src/res/help/*.html - res_help.path = /home/vadim/src/fwb3-branch-v3/install_root/share/fwbuilder-3.0.0/help/ + res_help.path = ../Resources/help/ INSTALLS += res INSTALLS += res_os INSTALLS += res_platform # INSTALLS += icns - LIBS += $$LIBS_FWBUILDER -lutil + LIBS += $$LIBS_FWBUILDER -L/sw/lib -lpoll PKGLOCALEDIR = $$res.path/locale