onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-14 09:00:01 +02:00
Code Issues Releases Wiki Activity

removed dependency on QT in compilers

Browse Source
This commit is contained in:
Vadim Kurland
2008-08-02 04:59:32 +00:00
parent 5ffdd891e3
commit 60bec65e08
15 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 433 #define BUILD_NUM 434
doc/ChangeLog
+4 -1
View File
@@ -1,4 +1,7 @@
2008-08-01 vadim <vadim@vk.crocodile.org> 2008-08-01 Vadim Kurland <vadim@vk.crocodile.org>
* 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): * ObjectManipulator.cpp (ObjectManipulator::contextMenuRequested):
fixed bug #2023243: "IPv6 - Some objects missing from context fixed bug #2023243: "IPv6 - Some objects missing from context
qmake.inc
+13 -13
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/fwb3-branch-v3/install_root/share/man/ MANDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/man/
DOCDIR = /Users/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0 DOCDIR = /home/vadim/src/fwb3-branch-v3/install_root/share/doc/fwbuilder-3.0.0
HAVE_ANTLR_RUNTIME = 1 HAVE_ANTLR_RUNTIME = 1
HAVE_EXTERNAL_ANTLR = 0 HAVE_EXTERNAL_ANTLR = 0
unix { unix {
ANTLR_INCLUDEPATH = /Users/vadim/src/fwb3-branch-v3/source/fwbuilder/src/ ANTLR_INCLUDEPATH = /home/vadim/src/fwb3-branch-v3/source/fwbuilder/src/
ANTLR_LIBS = /Users/vadim/src/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,36 +30,36 @@ unix {
MOC_DIR = .moc MOC_DIR = .moc
OBJECTS_DIR = .obj 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@ exec_prefix = @EXEC_PREFIX@
DESTDIR = 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_FWCOMPILER = -L/home/vadim/src/fwb3-branch-v3/install_root/lib -pthread -lfwcompiler -lfwbuilder -lxslt -lxml2 -lnetsnmp -lm -lwrap
LIBS_FWBUILDER = -L/Users/vadim/src/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 -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/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/ # 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.files = src/res/objects_init.xml src/res/templates.xml src/res/resources.xml 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.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.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
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
src/iosacl/iosacl.cpp
-2
View File
@@ -25,8 +25,6 @@
#include "../../config.h" #include "../../config.h"
#include <qsettings.h>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
src/iosacl/iosacl.pro
+2 -1
View File
@@ -20,7 +20,6 @@ HEADERS = ../../config.h \
../cisco_lib/ACL.h \ ../cisco_lib/ACL.h \
../cisco_lib/Helper.h ../cisco_lib/Helper.h
# CONFIG -= qt
!win32 { !win32 {
QMAKE_COPY = /usr/bin/install -m 0755 -s QMAKE_COPY = /usr/bin/install -m 0755 -s
} }
@@ -34,5 +33,7 @@ win32:LIBS += ../cisco_lib/release/fwbcisco.lib
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
unix: CONFIG -= qt
TARGET = fwb_iosacl TARGET = fwb_iosacl
src/ipf/ipf.cpp
-2
View File
@@ -25,8 +25,6 @@
#include "../../config.h" #include "../../config.h"
#include <qsettings.h>
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#include <locale.h> #include <locale.h>
#endif #endif
src/ipf/ipf.pro
+2
View File
@@ -27,4 +27,6 @@ win32:LIBS += ../pflib/release/fwbpf.lib
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
unix: CONFIG -= qt
TARGET = fwb_ipf TARGET = fwb_ipf
src/ipfw/ipfw.cpp
-2
View File
@@ -25,8 +25,6 @@
#include "../../config.h" #include "../../config.h"
#include <qsettings.h>
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#include <locale.h> #include <locale.h>
#endif #endif
src/ipfw/ipfw.pro
+2
View File
@@ -27,4 +27,6 @@ win32:LIBS += ../pflib/release/fwbpf.lib
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
unix: CONFIG -= qt
TARGET = fwb_ipfw TARGET = fwb_ipfw
src/ipt/ipt.cpp
-2
View File
@@ -26,8 +26,6 @@
#include "../../config.h" #include "../../config.h"
#include "../../build_num" #include "../../build_num"
#include <qsettings.h>
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#include <locale.h> #include <locale.h>
#endif #endif
src/ipt/ipt.pro
+2
View File
@@ -35,6 +35,8 @@ HEADERS = ../../config.h \
win32:CONFIG += console win32:CONFIG += console
unix: CONFIG -= qt
TARGET = fwb_ipt TARGET = fwb_ipt
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
src/pf/pf.cpp
-2
View File
@@ -25,8 +25,6 @@
#include "../../config.h" #include "../../config.h"
#include <qsettings.h>
#ifdef HAVE_LOCALE_H #ifdef HAVE_LOCALE_H
#include <locale.h> #include <locale.h>
#endif #endif
src/pf/pf.pro
+2
View File
@@ -23,4 +23,6 @@ win32:LIBS += ../pflib/release/fwbpf.lib
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
unix: CONFIG -= qt
TARGET = fwb_pf TARGET = fwb_pf
src/pix/pix.cpp
-2
View File
@@ -25,8 +25,6 @@
#include "../../config.h" #include "../../config.h"
#include <qsettings.h>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
src/pix/pix.pro
+2 -1
View File
@@ -27,7 +27,6 @@ HEADERS = ../../config.h \
../cisco_lib/ACL.h \ ../cisco_lib/ACL.h \
../cisco_lib/Helper.h ../cisco_lib/Helper.h
# CONFIG -= qt
!win32 { !win32 {
QMAKE_COPY = /usr/bin/install -m 0755 -s QMAKE_COPY = /usr/bin/install -m 0755 -s
} }
@@ -41,5 +40,7 @@ win32:LIBS += ../cisco_lib/release/fwbcisco.lib
LIBS += $$LIBS_FWCOMPILER LIBS += $$LIBS_FWCOMPILER
unix: CONFIG -= qt
TARGET = fwb_pix TARGET = fwb_pix