[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
Menu
▾
▴
[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, development, updated. v4.1.3-948-ga164655
|
From: <gi...@ir...> - 2011-03-02 05:00:45
|
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, development has been updated
via a16465521637ff22ffbc3bfe0bb870140e3cfd47 (commit)
from 485a681bb04256c0324fbe8269479f1f794339f5 (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 a16465521637ff22ffbc3bfe0bb870140e3cfd47
Author: Vadim Kurland <va...@sl...>
Date: Tue Mar 1 21:11:58 2011 -0800
fixing build problems on windows: added "-I .." to make #include work inside wizard subdirectories
diff --git a/VERSION b/VERSION
index 5f49b8a..6514b2f 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
-BUILD_NUM="3491"
+BUILD_NUM="3492"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
diff --git a/VERSION.h b/VERSION.h
index f0b8b72..1591b12 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION "4.2.0.3491"
+#define VERSION "4.2.0.3492"
#define GENERATION "4.2"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 6d13ea4..340aa10 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
%define name fwbuilder
-%define version 4.2.0.3491
+%define version 4.2.0.3492
%define release 1
%if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index 787f0d2..f629095 100644
--- a/packaging/fwbuilder.control
+++ b/packaging/fwbuilder.control
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
Maintainer: va...@fw...
-Version: 4.2.0.3491-1
+Version: 4.2.0.3492-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index da00deb..105816b 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
%define name fwbuilder
-%define version 4.2.0.3491
+%define version 4.2.0.3492
%define release 1
%if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp b/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp
index aa1ab82..cea0632 100644
--- a/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp
+++ b/src/libgui/importAddressListWizard/ChooseObjectsPage.cpp
@@ -21,14 +21,14 @@
*/
-#include "../../../config.h"
-#include "../global.h"
+#include "../../config.h"
+#include "global.h"
#include "ChooseObjectsPage.h"
#include "HostsFile.h"
-#include "../ObjectDescriptor.h"
-#include "../FilterDialog.h"
+#include "ObjectDescriptor.h"
+#include "FilterDialog.h"
#include <QProgressDialog>
#include <QMessageBox>
diff --git a/src/libgui/importAddressListWizard/ChooseObjectsPage.h b/src/libgui/importAddressListWizard/ChooseObjectsPage.h
index 93eb556..d53d0b7 100644
--- a/src/libgui/importAddressListWizard/ChooseObjectsPage.h
+++ b/src/libgui/importAddressListWizard/ChooseObjectsPage.h
@@ -24,7 +24,6 @@
#ifndef __CHOOSEOBJECTSPAGE_H_
#define __CHOOSEOBJECTSPAGE_H_
-//#include "../../config.h"
#include "ui_chooseobjectspage_q.h"
#include "fwbuilder/InetAddr.h"
diff --git a/src/libgui/importAddressListWizard/CreateObjectsPage.cpp b/src/libgui/importAddressListWizard/CreateObjectsPage.cpp
index ef51b68..8e61b5b 100644
--- a/src/libgui/importAddressListWizard/CreateObjectsPage.cpp
+++ b/src/libgui/importAddressListWizard/CreateObjectsPage.cpp
@@ -21,11 +21,11 @@
*/
-#include "../../../config.h"
-#include "../global.h"
-#include "../events.h"
-#include "../FWWindow.h"
-#include "../ProjectPanel.h"
+#include "../../config.h"
+#include "global.h"
+#include "events.h"
+#include "FWWindow.h"
+#include "ProjectPanel.h"
#include "CreateObjectsPage.h"
diff --git a/src/libgui/importAddressListWizard/CreateObjectsPage.h b/src/libgui/importAddressListWizard/CreateObjectsPage.h
index eb6915f..3204211 100644
--- a/src/libgui/importAddressListWizard/CreateObjectsPage.h
+++ b/src/libgui/importAddressListWizard/CreateObjectsPage.h
@@ -24,7 +24,6 @@
#ifndef __CREATEOBJECTSPAGE_H_
#define __CREATEOBJECTSPAGE_H_
-//#include "../../config.h"
#include "ui_createobjectspage_q.h"
diff --git a/src/libgui/importAddressListWizard/FileNamePage.cpp b/src/libgui/importAddressListWizard/FileNamePage.cpp
index 594f246..78695e0 100644
--- a/src/libgui/importAddressListWizard/FileNamePage.cpp
+++ b/src/libgui/importAddressListWizard/FileNamePage.cpp
@@ -21,9 +21,9 @@
*/
-#include "../../../config.h"
-#include "../global.h"
-#include "../FWBSettings.h"
+#include "../../config.h"
+#include "global.h"
+#include "FWBSettings.h"
#include "FileNamePage.h"
diff --git a/src/libgui/importAddressListWizard/FileNamePage.h b/src/libgui/importAddressListWizard/FileNamePage.h
index 265c981..98f49a5 100644
--- a/src/libgui/importAddressListWizard/FileNamePage.h
+++ b/src/libgui/importAddressListWizard/FileNamePage.h
@@ -24,7 +24,6 @@
#ifndef __FILENAMEPAGE_H_
#define __FILENAMEPAGE_H_
-//#include "../../config.h"
#include "ui_filenamepage_q.h"
diff --git a/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp b/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp
index 85639f1..6ec4fd8 100644
--- a/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp
+++ b/src/libgui/importAddressListWizard/ImportAddressListWizard.cpp
@@ -21,8 +21,7 @@
*/
-//#include "../../../config.h"
-#include "../global.h"
+#include "global.h"
#include "ImportAddressListWizard.h"
#include "FileNamePage.h"
diff --git a/src/libgui/importAddressListWizard/ImportAddressListWizard.h b/src/libgui/importAddressListWizard/ImportAddressListWizard.h
index 6245eb2..ec8250a 100644
--- a/src/libgui/importAddressListWizard/ImportAddressListWizard.h
+++ b/src/libgui/importAddressListWizard/ImportAddressListWizard.h
@@ -24,8 +24,6 @@
#ifndef __IMPORTADDRESSLISTWIZARD_H_
#define __IMPORTADDRESSLISTWIZARD_H_
-//#include "../../config.h"
-
#include <QWizard>
diff --git a/src/libgui/importAddressListWizard/SelectLibraryPage.cpp b/src/libgui/importAddressListWizard/SelectLibraryPage.cpp
index c046204..6e15bd6 100644
--- a/src/libgui/importAddressListWizard/SelectLibraryPage.cpp
+++ b/src/libgui/importAddressListWizard/SelectLibraryPage.cpp
@@ -21,10 +21,9 @@
*/
-//#include "../../config.h"
-#include "../global.h"
-#include "../utils.h"
-#include "../FWWindow.h"
+#include "global.h"
+#include "utils.h"
+#include "FWWindow.h"
#include "SelectLibraryPage.h"
diff --git a/src/libgui/importAddressListWizard/SelectLibraryPage.h b/src/libgui/importAddressListWizard/SelectLibraryPage.h
index 8412574..3ea7087 100644
--- a/src/libgui/importAddressListWizard/SelectLibraryPage.h
+++ b/src/libgui/importAddressListWizard/SelectLibraryPage.h
@@ -24,7 +24,6 @@
#ifndef __SELECTLIBRARYPAGE_H_
#define __SELECTLIBRARYPAGE_H_
-//#include "../../config.h"
#include "ui_selectlibrarypage_q.h"
diff --git a/src/libgui/libgui.pro b/src/libgui/libgui.pro
index eea03f8..d8be31f 100644
--- a/src/libgui/libgui.pro
+++ b/src/libgui/libgui.pro
@@ -518,6 +518,10 @@ FORMS += transferdialog_q.ui
INCLUDEPATH += $$ANTLR_INCLUDEPATH
DEFINES += $$ANTLR_DEFINES
+# add ".." to includepath to make sure #include works when we compile modules
+# in subdirectories, such as importAddressListWizard and other wizards
+INCLUDEPATH += ..
+
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
INCLUDEPATH += ../common \
../iptlib \
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
VERSION.h | 2 +-
packaging/fwbuilder-static-qt.spec | 2 +-
packaging/fwbuilder.control | 2 +-
packaging/fwbuilder.spec | 2 +-
.../importAddressListWizard/ChooseObjectsPage.cpp | 8 ++++----
.../importAddressListWizard/ChooseObjectsPage.h | 1 -
.../importAddressListWizard/CreateObjectsPage.cpp | 10 +++++-----
.../importAddressListWizard/CreateObjectsPage.h | 1 -
.../importAddressListWizard/FileNamePage.cpp | 6 +++---
src/libgui/importAddressListWizard/FileNamePage.h | 1 -
.../ImportAddressListWizard.cpp | 3 +--
.../ImportAddressListWizard.h | 2 --
.../importAddressListWizard/SelectLibraryPage.cpp | 7 +++----
.../importAddressListWizard/SelectLibraryPage.h | 1 -
src/libgui/libgui.pro | 4 ++++
16 files changed, 25 insertions(+), 29 deletions(-)
hooks/post-receive
--
Firewall Builder GUI and Policy Compilers Open Source Code
|