[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, releas
Brought to you by:
mikehorn
Menu
▾
▴
[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, release-4.2.1, updated. v4.2.2-1-g6abe920
|
From: <gi...@ir...> - 2011-05-24 19:52:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Firewall Builder GUI and Policy Compilers Open Source Code".
The branch, release-4.2.1 has been updated
via 6abe9204df77d62293de2fc38a8703c2f6ca33b0 (commit)
from 40e08b70d1c5d16e82261bde9a791a1c9dfef243 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6abe9204df77d62293de2fc38a8703c2f6ca33b0
Author: Vadim Kurland <va...@ne...>
Date: Thu May 19 19:22:58 2011 -0700
Back-porting changes for building with mingw on windows from af8031a
diff --git a/src/cisco_lib/cisco_lib.pro b/src/cisco_lib/cisco_lib.pro
index ed7fc36..672ec39 100644
--- a/src/cisco_lib/cisco_lib.pro
+++ b/src/cisco_lib/cisco_lib.pro
@@ -100,7 +100,7 @@ macx:LIBS += $$LIBS_FWCOMPILER
INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
-win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib
+win32:PRE_TARGETDEPS = ../compiler_lib/release/libcompilerdriver.a
!win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a
CONFIG += staticlib
diff --git a/src/fwbedit/fwbedit.pro b/src/fwbedit/fwbedit.pro
index 25b9174..8027ccf 100644
--- a/src/fwbedit/fwbedit.pro
+++ b/src/fwbedit/fwbedit.pro
@@ -10,7 +10,8 @@ QT += network
SOURCES = fwbedit.cpp new_object.cpp repair_tree.cpp list_object.cpp merge.cpp import.cpp
HEADERS = ../../config.h fwbedit.h upgradePredicate.h
-INCLUDEPATH += ../libfwbuilder/src ../import ../compiler_lib/ ../libgui
+INCLUDEPATH += ../libfwbuilder/src ../import ../compiler_lib ../libgui
+DEPENDPATH += ../libfwbuilder/src ../import ../compiler_lib ../libgui
win32:INCLUDEPATH += ../libgui/ui
!win32:INCLUDEPATH += ../libgui/.ui
@@ -21,32 +22,16 @@ TARGET = fwbedit
QMAKE_COPY = ../../install.sh -m 0755 -s
}
-DEPENDPATH = ../common \
- ../libfwbuilder/src/fwbuilder \
- ../libfwbuilder/src/fwcompiler
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../import/$$BINARY_SUBDIR/libimport.a \
+ ../parsers/$$BINARY_SUBDIR/libfwbparser.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libgui/$$BINARY_SUBDIR/libgui.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
-!win32:LIBS = ../common/libcommon.a \
- ../import/libimport.a \
- ../parsers/libfwbparser.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- ../libgui/libgui.a \
- $$ANTLR_LIBS \
- $$LIBS
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+LIBS += $$PRE_TARGETDEPS $$ANTLR_LIBS $$LIBS
win32:CONFIG += console
-win32:LIBS += ../common/release/common.lib \
- ../import/release/import.lib \
- ../parsers/release/fwbparser.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libgui/release/gui.lib \
- $$ANTLR_LIBS \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib
+
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index bec18fe..512f73f 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -11,24 +11,17 @@ SOURCES += main.cpp
# Arrange static libraries before dynamic ones in the linker command
# line. libgui goes first
-win32 {
- IMPORT_LIB = ../import/release/import.lib
- FWBPARSER_LIB = ../parsers/release/fwbparser.lib
- FWTRANSFER_LIB = ../fwtransfer/release/fwtransfer.lib
- STATIC_LIBS += ../libgui/release/gui.lib
-}
-!win32 {
- IMPORT_LIB = ../import/libimport.a
- FWBPARSER_LIB = ../parsers/libfwbparser.a
- FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a
- STATIC_LIBS += ../libgui/libgui.a
-}
+IMPORT_LIB = ../import/$$BINARY_SUBDIR/libimport.a
+FWBPARSER_LIB = ../parsers/$$BINARY_SUBDIR/libfwbparser.a
+FWTRANSFER_LIB = ../fwtransfer/$$BINARY_SUBDIR/libfwtransfer.a
INCLUDEPATH += $$ANTLR_INCLUDEPATH
-STATIC_LIBS += $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES
+STATIC_LIBS += ../libgui/$$BINARY_SUBDIR/libgui.a \
+ $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS
+
# fwtransfer lib. Add this before adding -lQtDBus to LIBS below
STATIC_LIBS += $$FWTRANSFER_LIB
contains( HAVE_QTDBUS, 1 ):unix {
@@ -63,47 +56,17 @@ DEPENDPATH = \
../libfwbuilder/src/fwbuilder \
../libfwbuilder/src/fwcompiler
-win32:STATIC_LIBS += \
- ../common/release/common.lib \
- ../iptlib/release/iptlib.lib \
- ../pflib/release/fwbpf.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:STATIC_LIBS += \
- ../common/libcommon.a \
- ../iptlib/libiptlib.a \
- ../pflib/libfwbpf.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
-
-win32:PRE_TARGETDEPS = \
- ../libgui/release/gui.lib \
- ../common/release/common.lib \
- ../iptlib/release/iptlib.lib \
- ../pflib/release/fwbpf.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \
- $$FWBPARSER_LIB \
- $$IMPORT_LIB
-
-!win32:PRE_TARGETDEPS = \
- ../libgui/libgui.a \
- ../common/libcommon.a \
- ../iptlib/libiptlib.a \
- ../pflib/libfwbpf.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- $$FWBPARSER_LIB \
- $$IMPORT_LIB
+OTHER_LIBS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../iptlib/$$BINARY_SUBDIR/libiptlib.a \
+ ../pflib/$$BINARY_SUBDIR/libfwbpf.a \
+ ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a
+
+PRE_TARGETDEPS = $$OTHER_LIBS $$IMPORT_LIB $$FWBPARSER_LIB $$ANTLR_LIBS
+
+STATIC_LIBS += $$OTHER_LIBS
macx:STATIC_LIBS += -framework \
Carbon
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index eebab30..d94d9a4 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -109,6 +109,8 @@ void usage()
int main( int argc, char *argv[] )
{
+ cout << "Firewall Builder GUI " VERSION << endl << flush;
+
filename = "";
print_output_file_name = "";
fwbdebug = 0;
diff --git a/src/import/import.pro b/src/import/import.pro
index 875f57c..cbe638b 100644
--- a/src/import/import.pro
+++ b/src/import/import.pro
@@ -35,7 +35,9 @@ HEADERS = QStringListOperators.h \
CONFIG += staticlib
-INCLUDEPATH += $$ANTLR_INCLUDEPATH ../compiler_lib ../parsers ../libfwbuilder/src/
+# need to add "." for g++ on mingw
+INCLUDEPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib .
+DEPENDPATH += $$ANTLR_INCLUDEPATH ../libfwbuilder/src ../compiler_lib
LIBS += $$ANTLR_LIBS
DEFINES += $$ANTLR_DEFINES
diff --git a/src/iosacl/iosacl.pro b/src/iosacl/iosacl.pro
index 380a363..1f0ee0e 100644
--- a/src/iosacl/iosacl.pro
+++ b/src/iosacl/iosacl.pro
@@ -20,31 +20,13 @@ win32:CONFIG += console
INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib ../libfwbuilder/src
-win32:LIBS += ../common/release/common.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_iosacl
diff --git a/src/ipf/ipf.pro b/src/ipf/ipf.pro
index 83e34d6..7652d73 100644
--- a/src/ipf/ipf.pro
+++ b/src/ipf/ipf.pro
@@ -18,29 +18,12 @@ INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../pflib
-win32:LIBS += ../common/release/common.lib \
- ../pflib/release/fwbpf.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../pflib/libfwbpf.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../pflib/release/fwbpf.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../pflib/libfwbpf.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../pflib/$$BINARY_SUBDIR/libfwbpf.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_ipf
diff --git a/src/ipfw/ipfw.pro b/src/ipfw/ipfw.pro
index 5d6d469..e8f56ba 100644
--- a/src/ipfw/ipfw.pro
+++ b/src/ipfw/ipfw.pro
@@ -16,30 +16,12 @@ INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src
DEPENDPATH = ../pflib
-win32:LIBS += ../common/release/common.lib \
- ../pflib/release/fwbpf.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../pflib/libfwbpf.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../pflib/release/fwbpf.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../pflib/libfwbpf.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../pflib/$$BINARY_SUBDIR/libfwbpf.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_ipfw
diff --git a/src/ipt/ipt.cpp b/src/ipt/ipt.cpp
index e4ce3f5..4deb0c1 100644
--- a/src/ipt/ipt.cpp
+++ b/src/ipt/ipt.cpp
@@ -43,6 +43,8 @@
#include <QApplication>
#include <QStringList>
#include <QTextCodec>
+#include <QTime>
+
#include "../common/init.cpp"
@@ -76,6 +78,9 @@ int main(int argc, char **argv)
{
QApplication app(argc, argv, false);
+ QTime total_time_timer;
+ total_time_timer.start();
+
// compilers always write file names into manifest in Utf8
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("Utf8"));
QTextCodec::setCodecForLocale(QTextCodec::codecForName("Utf8"));
@@ -153,6 +158,10 @@ int main(int argc, char **argv)
driver->compile();
int ret = (driver->getStatus() == BaseCompiler::FWCOMPILER_SUCCESS) ? 0 : 1;
+ QTime time_spent = QTime().addMSecs(total_time_timer.elapsed());
+ cerr << "Compile time: "
+ << time_spent.toString("hh:mm:ss").toStdString() << endl;
+
delete driver;
delete objdb;
diff --git a/src/ipt/ipt.pro b/src/ipt/ipt.pro
index 6828d72..8142ed5 100644
--- a/src/ipt/ipt.pro
+++ b/src/ipt/ipt.pro
@@ -16,30 +16,13 @@ INCLUDEPATH += ../common ../iptlib ../compiler_lib/ ../libfwbuilder/src
DEPENDPATH = ../common ../iptlib ../compiler_lib
-win32:LIBS += ../common/release/common.lib \
- ../iptlib/release/iptlib.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../iptlib/libiptlib.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../iptlib/release/iptlib.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../iptlib/libiptlib.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../iptlib/$$BINARY_SUBDIR/libiptlib.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_ipt
diff --git a/src/iptlib/iptlib.pro b/src/iptlib/iptlib.pro
index 36465b4..0113dc3 100644
--- a/src/iptlib/iptlib.pro
+++ b/src/iptlib/iptlib.pro
@@ -52,9 +52,9 @@ INCLUDEPATH += ../compiler_lib/ ../libfwbuilder/src
DEPENDPATH = ../compiler_lib
-win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib
+win32:PRE_TARGETDEPS = ../compiler_lib/release/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/release/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/release/libfwbuilder.a
!win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a \
../libfwbuilder/src/fwcompiler/libfwcompiler.a \
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
index 9b9e184..1c28b20 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase.cpp
@@ -99,7 +99,9 @@ using namespace libfwbuilder;
int id_seed = 1000;
#ifdef _WIN32
static int cached_pid = _getpid();
+# ifndef __GNUC__
#define snprintf sprintf_s
+# endif
#else
static int cached_pid = getpid();
#endif
diff --git a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
index 112cebe..06e5452 100644
--- a/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
+++ b/src/libfwbuilder/src/fwbuilder/FWObjectDatabase_tree_ops.cpp
@@ -48,9 +48,6 @@
using namespace std;
using namespace libfwbuilder;
-#ifdef _WIN32
-#define snprintf sprintf_s
-#endif
class FWObjectTreeScanner {
diff --git a/src/libfwbuilder/src/fwbuilder/RuleElement.h b/src/libfwbuilder/src/fwbuilder/RuleElement.h
index 51b47cf..2490cd8 100644
--- a/src/libfwbuilder/src/fwbuilder/RuleElement.h
+++ b/src/libfwbuilder/src/fwbuilder/RuleElement.h
@@ -36,11 +36,6 @@
#include <fwbuilder/ServiceGroup.h>
#include <fwbuilder/IntervalGroup.h>
-#ifdef _WIN32
-// disable "warning C4250: 'libfwbuilder::RuleElementTDst' : inherits 'libfwbuilder::RuleElement::addRef' via dominance"
-# pragma warning(disable:4250)
-#endif
-
namespace libfwbuilder
{
diff --git a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp b/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
index 7d88673..6c7a363 100644
--- a/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
+++ b/src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp
@@ -33,9 +33,6 @@
using namespace libfwbuilder;
using namespace std;
-#ifdef _WIN32
-#define snprintf sprintf_s
-#endif
const char *TCPUDPService::TYPENAME={"TCPUDPService"};
diff --git a/src/libfwbuilder/src/fwbuilder/dns.cpp b/src/libfwbuilder/src/fwbuilder/dns.cpp
index 4ee63f6..52a9e42 100644
--- a/src/libfwbuilder/src/fwbuilder/dns.cpp
+++ b/src/libfwbuilder/src/fwbuilder/dns.cpp
@@ -40,8 +40,7 @@
# include <arpa/nameser.h>
# include <unistd.h>
#else
-# include <winsock2.h>
-# pragma warning(disable:4101)
+# include <windows.h>
#endif
#include <pthread.h>
diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
index 4669924..0a2e7a4 100644
--- a/src/libfwbuilder/src/fwbuilder/uint128.h
+++ b/src/libfwbuilder/src/fwbuilder/uint128.h
@@ -36,6 +36,9 @@
#include <stdio.h>
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h> // for sprintf formats for "long long"
+
// convinience macro
#define U128_C(s) uint128(#s)
@@ -463,9 +466,9 @@ public:
{
char buf[33];
if (hi)
- sprintf(buf,"%llX%08llX",(unsigned long long)hi,(unsigned long long)lo);
+ sprintf(buf, "%"PRIX64"%08"PRIX64, (unsigned long long)hi,(unsigned long long)lo);
else
- sprintf(buf,"%llX",(unsigned long long)lo);
+ sprintf(buf,"%"PRIX64,(unsigned long long)lo);
return buf;
}
diff --git a/src/pf/pf.pro b/src/pf/pf.pro
index 2b52cd0..c8dd9ca 100644
--- a/src/pf/pf.pro
+++ b/src/pf/pf.pro
@@ -16,30 +16,13 @@ INCLUDEPATH += ../common ../pflib ../compiler_lib ../libfwbuilder/src/
DEPENDPATH = ../pflib
-win32:LIBS += ../common/release/common.lib \
- ../pflib/release/fwbpf.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../pflib/libfwbpf.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../pflib/release/fwbpf.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../pflib/libfwbpf.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../pflib/$$BINARY_SUBDIR/libfwbpf.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_pf
diff --git a/src/pflib/pflib.pro b/src/pflib/pflib.pro
index b02e331..6ee21a4 100644
--- a/src/pflib/pflib.pro
+++ b/src/pflib/pflib.pro
@@ -65,7 +65,7 @@ macx:LIBS += $$LIBS_FWCOMPILER
INCLUDEPATH += ../compiler_lib ../libfwbuilder/src
-win32:PRE_TARGETDEPS = ../compiler_lib/release/compilerdriver.lib
+win32:PRE_TARGETDEPS = ../compiler_lib/release/libcompilerdriver.a
!win32:PRE_TARGETDEPS = ../compiler_lib/libcompilerdriver.a
diff --git a/src/pix/pix.pro b/src/pix/pix.pro
index ddb823f..bf7145a 100644
--- a/src/pix/pix.pro
+++ b/src/pix/pix.pro
@@ -14,30 +14,13 @@ win32:CONFIG += console
INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib ../libfwbuilder/src/
-win32:LIBS += ../common/release/common.lib \
- ../cisco_lib/release/fwbcisco.lib\
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_pix
diff --git a/src/procurve_acl/procurve_acl.pro b/src/procurve_acl/procurve_acl.pro
index 55f6f88..c0028fb 100644
--- a/src/procurve_acl/procurve_acl.pro
+++ b/src/procurve_acl/procurve_acl.pro
@@ -20,31 +20,13 @@ win32:CONFIG += console
INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib ../libfwbuilder/src/
-win32:LIBS += ../common/release/common.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:LIBS = ../common/libcommon.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a \
- $$LIBS
-
-win32:PRE_TARGETDEPS = ../common/release/common.lib \
- ../cisco_lib/release/fwbcisco.lib \
- ../compiler_lib/release/compilerdriver.lib \
- ../libfwbuilder/src/fwbuilder/release/fwbuilder.lib \
- ../libfwbuilder/src/fwcompiler/release/fwcompiler.lib
-
-!win32:PRE_TARGETDEPS = ../common/libcommon.a \
- ../cisco_lib/libfwbcisco.a \
- ../compiler_lib/libcompilerdriver.a \
- ../libfwbuilder/src/fwcompiler/libfwcompiler.a \
- ../libfwbuilder/src/fwbuilder/libfwbuilder.a
+PRE_TARGETDEPS = ../common/$$BINARY_SUBDIR/libcommon.a \
+ ../cisco_lib/$$BINARY_SUBDIR/libfwbcisco.a \
+ ../compiler_lib/$$BINARY_SUBDIR/libcompilerdriver.a \
+ ../libfwbuilder/src/fwcompiler/$$BINARY_SUBDIR/libfwcompiler.a \
+ ../libfwbuilder/src/fwbuilder/$$BINARY_SUBDIR/libfwbuilder.a \
+LIBS += $$PRE_TARGETDEPS $$LIBS
TARGET = fwb_procurve_acl
diff --git a/src/src.pro b/src/src.pro
index 55220d8..94e934e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -18,17 +18,17 @@ SUBDIRS = libfwbuilder \
compiler_lib \
fwtransfer \
iptlib \
- pflib \
- cisco_lib \
- libgui \
- gui \
ipt \
+ pflib \
pf \
ipf \
ipfw \
+ cisco_lib \
iosacl \
pix \
procurve_acl \
transfer_agents \
- fwbedit
+ libgui \
+ fwbedit \
+ gui \
diff --git a/src/transfer_agents/secuwall/secuwall.pro b/src/transfer_agents/secuwall/secuwall.pro
index c6092c3..68bd3e0 100644
--- a/src/transfer_agents/secuwall/secuwall.pro
+++ b/src/transfer_agents/secuwall/secuwall.pro
@@ -25,9 +25,9 @@ contains( HAVE_QTDBUS, 1 ):unix {
win32 {
CONFIG += console
- LIBS += ../../fwtransfer/release/fwtransfer.lib \ # -lQtDBus
- ../../libfwbuilder/src/fwcompiler/release/fwcompiler.lib \
- ../../libfwbuilder/src/fwbuilder/release/fwbuilder.lib
+ LIBS += ../../fwtransfer/release/libfwtransfer.a \ # -lQtDBus
+ ../../libfwbuilder/src/fwcompiler/release/libfwcompiler.a \
+ ../../libfwbuilder/src/fwbuilder/release/libfwbuilder.a
}
TARGET = transfer_secuwall
-----------------------------------------------------------------------
Summary of changes:
src/cisco_lib/cisco_lib.pro | 2 +-
src/fwbedit/fwbedit.pro | 37 +++-------
src/gui/gui.pro | 71 +++++---------------
src/gui/main.cpp | 2 +
src/import/import.pro | 4 +-
src/iosacl/iosacl.pro | 30 ++-------
src/ipf/ipf.pro | 31 ++-------
src/ipfw/ipfw.pro | 30 ++-------
src/ipt/ipt.cpp | 9 +++
src/ipt/ipt.pro | 31 ++-------
src/iptlib/iptlib.pro | 6 +-
.../src/fwbuilder/FWObjectDatabase.cpp | 2 +
.../src/fwbuilder/FWObjectDatabase_tree_ops.cpp | 3 -
src/libfwbuilder/src/fwbuilder/RuleElement.h | 5 --
src/libfwbuilder/src/fwbuilder/TCPUDPService.cpp | 3 -
src/libfwbuilder/src/fwbuilder/dns.cpp | 3 +-
src/libfwbuilder/src/fwbuilder/uint128.h | 7 ++-
src/pf/pf.pro | 31 ++-------
src/pflib/pflib.pro | 2 +-
src/pix/pix.pro | 31 ++-------
src/procurve_acl/procurve_acl.pro | 30 ++-------
src/src.pro | 10 ++--
src/transfer_agents/secuwall/secuwall.pro | 6 +-
23 files changed, 109 insertions(+), 277 deletions(-)
hooks/post-receive
--
Firewall Builder GUI and Policy Compilers Open Source Code
|