[fwbuilder-commits] r2177 - in branches/v3_1: . src src/common src/fwbedit src/gui src/iosacl src/i
Brought to you by:
mikehorn
Menu
▾
▴
[fwbuilder-commits] r2177 - in branches/v3_1: . src src/common src/fwbedit src/gui src/iosacl src/ipf src/ipfw src/ipt src/pf src/pix
|
From: <va...@in...> - 2009-12-17 02:18:09
|
Author: vadim
Date: 2009-12-16 18:17:47 -0800 (Wed, 16 Dec 2009)
New Revision: 2177
Added:
branches/v3_1/src/common/common.pro
Modified:
branches/v3_1/build_num
branches/v3_1/src/common/init.cpp
branches/v3_1/src/fwbedit/fwbedit.pro
branches/v3_1/src/gui/gui.pro
branches/v3_1/src/gui/main.cpp
branches/v3_1/src/iosacl/iosacl.pro
branches/v3_1/src/ipf/ipf.pro
branches/v3_1/src/ipfw/ipfw.pro
branches/v3_1/src/ipt/ipt.pro
branches/v3_1/src/pf/pf.pro
branches/v3_1/src/pix/pix.pro
branches/v3_1/src/src.pro
Log:
fixes #923 converted src/common to a library
Modified: branches/v3_1/build_num
===================================================================
--- branches/v3_1/build_num 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/build_num 2009-12-17 02:17:47 UTC (rev 2177)
@@ -1 +1 @@
-#define BUILD_NUM 2174
+#define BUILD_NUM 2176
Added: branches/v3_1/src/common/common.pro
===================================================================
--- branches/v3_1/src/common/common.pro (rev 0)
+++ branches/v3_1/src/common/common.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -0,0 +1,21 @@
+#-*- mode: makefile; tab-width: 4; -*-
+#
+# This library provides basic initialization function used in all executables,
+# including the GUI and all compilers
+# on QT
+
+include(../../qmake.inc)
+
+TEMPLATE = lib
+
+SOURCES = init.cpp
+
+HEADERS = ../../config.h commoninit.h
+
+CONFIG += staticlib
+
+TARGET = common
+
+INSTALLS -= target
+
+exists(qmake.inc):include( qmake.inc)
Modified: branches/v3_1/src/common/init.cpp
===================================================================
--- branches/v3_1/src/common/init.cpp 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/common/init.cpp 2009-12-17 02:17:47 UTC (rev 2177)
@@ -4,29 +4,11 @@
#include <qglobal.h>
-#if defined(Q_OS_MACX) || defined(Q_OS_WIN32)
-# include <qsettings.h>
-# include <QDir>
-# include <QApplication>
-//# include <QCoreApplication>
-#else
-# include <limits.h>
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include <QString>
#include <QtDebug>
-#ifndef _WIN32
-# include <unistd.h>
-# include <pwd.h>
-#else
-# include <direct.h>
-# include <stdlib.h>
-# include <io.h>
-# include <windows.h>
-#endif
-
#include <string>
#include "fwbuilder/libfwbuilder-config.h"
@@ -53,33 +35,15 @@
using namespace libfwbuilder;
+#if defined(Q_OS_WIN32) || defined(Q_OS_MACX)
+extern void init_win();
+#endif
void init(char * const*)
{
-
-
-/*
- * Note appRootDir is the path to the directory where fwbuilder binary
- * is installed (on Mac it is <wherever>/fwbuilder3.app/Contents/MacOS.
- * On Windows it is c:\FWBuilder30, on Linux it is something like
- * /usr/bin or /usr/local/bin and so on.
- */
#if defined(Q_OS_WIN32) || defined(Q_OS_MACX)
- if (QCoreApplication::instance()==NULL)
- {
- int ac = 0;
- char **av = { NULL };
- new QApplication( ac, av );
- }
- QDir dir(QApplication::applicationDirPath());
- appRootDir = string(dir.absolutePath().toAscii().constData());
-/* On windows and mac we install API resources (DTD etc) in the
- * dir right above the one where we install resources for the GUI and compilers
- */
- if (respath=="") respath = appRootDir + FS_SEPARATOR + RES_DIR;
- string::size_type n0 = respath.find_last_of("/\\");
- librespath = respath.substr(0, n0);
+ init_win();
#else
appRootDir = string(PREFIX) + FS_SEPARATOR + "bin";
@@ -88,18 +52,11 @@
if (respath=="") respath = RES_DIR;
librespath = LIBFWBUILDER_TEMPLATE_DIR;
-#endif
-
libfwbuilder::init();
-
-#if defined(Q_OS_WIN32)
- argv0 = appRootDir + FS_SEPARATOR + "fwbuilder.exe";
-#else
/* need argv0 for built-in installer on unix and mac */
argv0 = appRootDir + FS_SEPARATOR + "fwbuilder";
-#endif
sysfname = respath + FS_SEPARATOR + "objects_init.xml";
tempfname = respath+ FS_SEPARATOR + "templates.xml";
@@ -108,36 +65,8 @@
localepath = respath + "/locale";
/* default directory where the user may want to save files */
-#if defined(Q_OS_WIN32)
- userDataDir = string(getenv("USERPROFILE"))+"\\Documents";
-#elif defined(Q_OS_MACX)
- userDataDir = string(getenv("HOME"))+"/Documents";
-#else
userDataDir = string(getenv("HOME"));
-#endif
-
-#ifdef _WIN32
-
-#define INFO_BUFFER_SIZE 32767
-
-TCHAR infoBuf[INFO_BUFFER_SIZE];
-DWORD bufCharCount = INFO_BUFFER_SIZE;
-
- bufCharCount = INFO_BUFFER_SIZE;
- if( GetUserName( infoBuf, &bufCharCount ) )
- {
-#ifdef UNICODE
- user_name = QString::fromUtf16((ushort*)infoBuf);
-#else
- user_name = QString::fromLocal8Bit(infoBuf);
-#endif
- }
-
- user_name = user_name.replace(' ','_');
-
-#else
-
char *lname = getenv("LOGNAME");
if (lname!=NULL)
user_name = QString(lname);
Modified: branches/v3_1/src/fwbedit/fwbedit.pro
===================================================================
--- branches/v3_1/src/fwbedit/fwbedit.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/fwbedit/fwbedit.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -13,5 +13,12 @@
QMAKE_COPY = ../../install.sh -m 0755 -s
+DEPENDPATH = ../common
+
+!win32:LIBS += ../common/libcommon.a
+!win32:PRE_TARGETDEPS = ../common/libcommon.a
+
win32:CONFIG += console
+win32:LIBS += ../common/libcommon.lib
+win32:PRE_TARGETDEPS = ../common/libcommon.lib
Modified: branches/v3_1/src/gui/gui.pro
===================================================================
--- branches/v3_1/src/gui/gui.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/gui/gui.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -463,27 +463,33 @@
}
# !macx:LIBS += -lQtDBus # workaround for QT += dbus not working with Qt < 4.4.0
-INCLUDEPATH += ../iptlib \
+INCLUDEPATH += ../common \
+ ../iptlib \
../pflib \
../cisco_lib/ \
../compiler_lib/
-DEPENDPATH = ../iptlib \
+DEPENDPATH = ../common \
+ ../iptlib \
../pflib \
../cisco_lib/ \
../compiler_lib
-win32:LIBS += ../iptlib/release/iptlib.lib \
+win32:LIBS += ../common/release/libcommon.lib \
+ ../iptlib/release/iptlib.lib \
../pflib/release/fwbpf.lib \
../cisco_lib/release/fwbcisco.lib \
../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../iptlib/libiptlib.a \
+!win32:LIBS += ../common/libcommon.a \
+ ../iptlib/libiptlib.a \
../pflib/libfwbpf.a \
../cisco_lib/libfwbcisco.a \
../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../iptlib/release/iptlib.lib \
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib \
+ ../iptlib/release/iptlib.lib \
../pflib/release/fwbpf.lib \
../cisco_lib/release/fwbcisco.lib \
../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../iptlib/libiptlib.a \
+!win32:PRE_TARGETDEPS = ../common/libcommon.a \
+ ../iptlib/libiptlib.a \
../pflib/libfwbpf.a \
../cisco_lib/libfwbcisco.a \
../compiler_lib/libcompilerdriver.a
Modified: branches/v3_1/src/gui/main.cpp
===================================================================
--- branches/v3_1/src/gui/main.cpp 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/gui/main.cpp 2009-12-17 02:17:47 UTC (rev 2177)
@@ -99,8 +99,6 @@
#include <sys/stat.h>
#include <fcntl.h>
-#include "../common/init.cpp"
-
#if defined(Q_WS_MAC)
extern void connectOdocHandler();
#endif
Modified: branches/v3_1/src/iosacl/iosacl.pro
===================================================================
--- branches/v3_1/src/iosacl/iosacl.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/iosacl/iosacl.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -18,13 +18,13 @@
win32:CONFIG += console
-INCLUDEPATH += ../cisco_lib/ ../compiler_lib
+INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib
-win32:LIBS += ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
+win32:LIBS += ../common/release/libcommon.lib ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
+!win32:LIBS += ../common/libcommon.a ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
+!win32:PRE_TARGETDEPS = ../common/libcommon.a ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
LIBS += $$LIBS_FWCOMPILER
Modified: branches/v3_1/src/ipf/ipf.pro
===================================================================
--- branches/v3_1/src/ipf/ipf.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/ipf/ipf.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -14,14 +14,14 @@
# unix { !macx: CONFIG -= qt }
-INCLUDEPATH += ../pflib ../compiler_lib
+INCLUDEPATH += ../common ../pflib ../compiler_lib
DEPENDPATH = ../pflib
-win32:LIBS += ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
+win32:LIBS += ../common/release/libcommon.lib ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
+!win32:LIBS += ../common/libcommon.a ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
+!win32:PRE_TARGETDEPS = ../common/libcommon.a ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
LIBS += $$LIBS_FWCOMPILER
Modified: branches/v3_1/src/ipfw/ipfw.pro
===================================================================
--- branches/v3_1/src/ipfw/ipfw.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/ipfw/ipfw.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -12,14 +12,14 @@
win32:CONFIG += console
-INCLUDEPATH += ../pflib ../compiler_lib
+INCLUDEPATH += ../common ../pflib ../compiler_lib
DEPENDPATH = ../pflib
-win32:LIBS += ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
+win32:LIBS += ../common/release/libcommon.lib ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
+!win32:LIBS += ../common/libcommon.a ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
+!win32:PRE_TARGETDEPS = ../common/libcommon.a ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
LIBS += $$LIBS_FWCOMPILER
Modified: branches/v3_1/src/ipt/ipt.pro
===================================================================
--- branches/v3_1/src/ipt/ipt.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/ipt/ipt.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -14,14 +14,14 @@
LIBS += $$LIBS_FWCOMPILER
-INCLUDEPATH += ../iptlib ../compiler_lib/
-DEPENDPATH = ../iptlib ../compiler_lib
+INCLUDEPATH += ../common ../iptlib ../compiler_lib/
+DEPENDPATH = ../common ../iptlib ../compiler_lib
-win32:LIBS += ../iptlib/release/iptlib.lib ../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../iptlib/libiptlib.a ../compiler_lib/libcompilerdriver.a
+win32:LIBS += ../common/release/libcommon.lib ../iptlib/release/iptlib.lib ../compiler_lib/release/compilerdriver.lib
+!win32:LIBS += ../common/libcommon.a ../iptlib/libiptlib.a ../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../iptlib/release/iptlib.lib ../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../iptlib/libiptlib.a ../compiler_lib/libcompilerdriver.a
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib ../iptlib/release/iptlib.lib ../compiler_lib/release/compilerdriver.lib
+!win32:PRE_TARGETDEPS = ../common/libcommon.a ../iptlib/libiptlib.a ../compiler_lib/libcompilerdriver.a
TARGET = fwb_ipt
Modified: branches/v3_1/src/pf/pf.pro
===================================================================
--- branches/v3_1/src/pf/pf.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/pf/pf.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -12,14 +12,14 @@
win32:CONFIG += console
-INCLUDEPATH += ../pflib ../compiler_lib
+INCLUDEPATH += ../common ../pflib ../compiler_lib
DEPENDPATH = ../pflib
-win32:LIBS += ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
+win32:LIBS += ../common/release/libcommon.lib ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
+!win32:LIBS += ../common/libcommon.a ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib ../pflib/release/fwbpf.lib ../compiler_lib/release/compilerdriver.lib
+!win32:PRE_TARGETDEPS = ../common/libcommon.a ../pflib/libfwbpf.a ../compiler_lib/libcompilerdriver.a
LIBS += $$LIBS_FWCOMPILER
Modified: branches/v3_1/src/pix/pix.pro
===================================================================
--- branches/v3_1/src/pix/pix.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/pix/pix.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -12,13 +12,13 @@
win32:CONFIG += console
-INCLUDEPATH += ../cisco_lib/ ../compiler_lib
+INCLUDEPATH += ../common ../cisco_lib/ ../compiler_lib
-win32:LIBS += ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
-!win32:LIBS += ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
+win32:LIBS += ../common/release/libcommon.lib ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
+!win32:LIBS += ../common/libcommon.a ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
-win32:PRE_TARGETDEPS = ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
-!win32:PRE_TARGETDEPS = ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
+win32:PRE_TARGETDEPS = ../common/release/libcommon.lib ../cisco_lib/release/fwbcisco.lib ../compiler_lib/release/compilerdriver.lib
+!win32:PRE_TARGETDEPS = ../common/libcommon.a ../cisco_lib/libfwbcisco.a ../compiler_lib/libcompilerdriver.a
LIBS += $$LIBS_FWCOMPILER
Modified: branches/v3_1/src/src.pro
===================================================================
--- branches/v3_1/src/src.pro 2009-12-17 01:32:24 UTC (rev 2176)
+++ branches/v3_1/src/src.pro 2009-12-17 02:17:47 UTC (rev 2177)
@@ -8,7 +8,7 @@
CONFIG += ordered
TARGET = src
-SUBDIRS = res fwbedit fwtransfer
+SUBDIRS = res
# NOTE: 2.1 does not install scripts from src/tools ( fwb_install , fwb_compile_all)
contains( HAVE_ANTLR_RUNTIME, 1 ) {
@@ -18,7 +18,10 @@
}
}
-SUBDIRS += compiler_lib \
+SUBDIRS += common \
+ compiler_lib \
+ fwbedit \
+ fwtransfer \
iptlib \
pflib \
cisco_lib \
|