[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7124 - in gnunet-qt: . src src/common src/core src/include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r7124 - in gnunet-qt: . src src/common src/core src/include src/plugins src/plugins/about src/plugins/fs src/plugins/general src/plugins/stats |
|
Date: |
Tue, 10 Jun 2008 11:31:00 -0600 (MDT) |
Author: durner
Date: 2008-06-10 11:31:00 -0600 (Tue, 10 Jun 2008)
New Revision: 7124
Added:
gnunet-qt/src/Makefile.am
gnunet-qt/src/common/Makefile.am
gnunet-qt/src/common/plugin.h
gnunet-qt/src/core/Makefile.am
gnunet-qt/src/plugins/Makefile.am
gnunet-qt/src/plugins/about/Makefile.am
gnunet-qt/src/plugins/fs/Makefile.am
gnunet-qt/src/plugins/general/Makefile.am
gnunet-qt/src/plugins/stats/Makefile.am
Removed:
gnunet-qt/gnunet_qt.pro.in
gnunet-qt/src/common/common.pro.in
gnunet-qt/src/core/core.pro.in
gnunet-qt/src/plugins/about/about.pro.in
gnunet-qt/src/plugins/fs/fs.pro.in
gnunet-qt/src/plugins/general/general.pro.in
gnunet-qt/src/plugins/plugins.pro.in
gnunet-qt/src/plugins/stats/stats.pro.in
gnunet-qt/src/src.pro.in
Modified:
gnunet-qt/configure.ac
gnunet-qt/src/common/pluginLoader.h
gnunet-qt/src/core/main.cc
gnunet-qt/src/include/gnunet_qt_common.h
Log:
automake
Modified: gnunet-qt/configure.ac
===================================================================
--- gnunet-qt/configure.ac 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/configure.ac 2008-06-10 17:31:00 UTC (rev 7124)
@@ -17,20 +17,120 @@
# Check system type
case "$host_os" in
*cygwin* | *mingw*)
- LIBPREFIX=lib
- DLLDIR=bin
+ LIBPREFIX=lib
+ DLLDIR=bin
;;
*)
- LIBPREFIX=
- DLLDIR=lib
+ LIBPREFIX=
+ DLLDIR=lib
;;
esac
+
+AC_PATH_XTRA
+
+case "$host_os" in
+*darwin* | *rhapsody* | *macosx*)
+ AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
+ CFLAGS="-no-cpp-precomp $CFLAGS"
+ LDFLAGS="-flat_namespace -undefined suppress $LDFLAGS"
+ QTLIBS="-L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore $X_LIBS -lX11 -lXext
-lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+linux*)
+ AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
+ QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+freebsd*)
+ AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+ AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
+ CFLAGS="-D_THREAD_SAFE $CFLAGS"
+ QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+openbsd*)
+ AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+ AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
+ LIBS=`echo $LIBS | sed -e "s/-ldl//"`
+ QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+netbsd*)
+ AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
+ AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
+ LIBPREFIX=
+ DLLDIR=lib
+ QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+*solaris*)
+ AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
+ AC_DEFINE_UNQUOTED(_REENTRANT,1,[Need with solaris or errno doesnt work])
+ QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+*arm-linux*)
+ AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
+ CFLAGS="-D_REENTRANT -fPIC -pipe $CFLAGS"
+ QTLIBS="-Wl,-rpath,$QTDIR/lib -L$QTDIR/lib -lQtGui -lQtOpenGL -lQtCore
$X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lGLU -lGL -lpthread"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtGui -I$QTDIR/include/QtCore
-I$QTDIR/include/QtOpenGL $X_CFLAGS -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
-DQT_SHARED"
+ QTBIN="$QTDIR/bin"
+ ;;
+*cygwin*)
+ AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
+ AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
+ LDFLAGS="$LDFLAGS -no-undefined"
+ CFLAGS="-mms-bitfields $CFLAGS"
+ AC_PROG_CXX
+ QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lmingw32
-lqtmain -lQtOpenGL4 -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup
-Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc -Wl,-subsystem,windows"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui
-I$QTDIR/include/QtOpenGL -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL
-DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT
-DQT_NEEDS_QMAIN -frtti -fexceptions"
+ QTBIN="$QTDIR/bin"
+ ;;
+*mingw*)
+ AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
+ AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
+ AC_DEFINE_UNQUOTED(_WIN32,1,[This is a Windows system])
+ LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
+ LIBS="$LIBS -lws2_32 -lplibc"
+ CFLAGS="-mms-bitfields $CFLAGS"
+ QTLIBS="-L$QTDIR/lib -lopengl32 -lglu32 -lgdi32 -luser32 -lqtmain
-lQtOpenGL4 -lQtGui4 -lQtCore4 -mthreads -Wl,-enable-stdcall-fixup
-Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc"
+ QTINC="-I$QTDIR/include -I$QTDIR/include/QtCore -I$QTDIR/include/QtGui
-I$QTDIR/include/QtOpenGL -DUNICODE -DQT_LARGEFILE_SUPPORT -DQT_DLL
-DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT
-DQT_NEEDS_QMAIN -frtti -fexceptions"
+ QTBIN="$QTDIR/bin"
+ ;;
+*)
+ AC_MSG_RESULT(Unrecognised OS $host_os)
+ AC_DEFINE_UNQUOTED(OTHEROS,1,[Some strange OS])
+ ;;
+esac
+
dnl Checks for programs.
-AC_PROG_INSTALL
+AC_PROG_AWK
AC_PROG_CC
+AC_PROG_CPP
AC_PROG_CXX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_LIBTOOL_DLOPEN
+AC_DISABLE_STATIC
+AC_LIBTOOL_WIN32_DLL
+AC_LIBLTDL_INSTALLABLE
+AC_PROG_LIBTOOL
+AC_CANONICAL_HOST
+AC_LIB_LTDL
+m4_ifdef([_AC_SEEN_TAG(libltdl)], [], [AC_CONFIG_SUBDIRS(libltdl)])
+AC_SUBST(LTDLINCL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(MKDIR_P)
+
dnl Checks for libraries.
AC_HEADER_MAJOR
@@ -141,75 +241,52 @@
;;
yes)
AC_CHECK_HEADERS([Qt/qpixmap.h],
- AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
- qt=1,
- AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
- qt=1)))
+ AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
+ qt=1))
;;
*)
- LDFLAGS="-L$with_qt/lib $LDFLAGS"
- CPPFLAGS="-I$with_qt/include -I$with_qt/include/qt4 $CPPFLAGS"
+ QTLIBS="$QTLIBS -L$with_qt/lib"
+ LDFLAGS="$QTLIBS $LDFLAGS"
+ QTINC="$QTINC -I$with_qt/include -I$with_qt/include/qt4"
+ CPPFLAGS="$QTINC $CPPFLAGS"
AC_CHECK_HEADERS([Qt/qpixmap.h],
- AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
- EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
- qt=1,
- AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
- EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
- qt=1)))
+ AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
+ EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
+ qt=1))
;;
esac
],
- [AC_MSG_RESULT([--with-qt not specified])
- LDFLAGS="-L/usr/lib $LDFLAGS"
- CPPFLAGS="-I/usr/include -I/usr/include/qt4 $CPPFLAGS"
+ [AC_MSG_RESULT([--with-qt not specified])
+ QTLIBS="$QTLIBS -L/usr/lib"
+ LDFLAGS="$QTLIBS $LDFLAGS"
+ QTINC="$QTINC -I/usr/include -I/usr/include/qt4"
+ CPPFLAGS="$QTINC $CPPFLAGS"
AC_CHECK_HEADERS([Qt/qpixmap.h],
- AC_CHECK_LIB([QtGui4], [_ZN7QPixmap12defaultDepthEv],
- EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
- qt=1,
- AC_CHECK_LIB([QtGui], [_ZN7QPixmap12defaultDepthEv],
- EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
- qt=1)))])
+ AC_SEARCH_LIBS([_ZN7QPixmap12defaultDepthEv], [QtGui QtGui4],
+ EXT_LIB_PATH="-L$with_qt/lib $EXT_LIB_PATH"
+ qt=1))])
-if test x$qt = x0
-then
- AC_MSG_ERROR([gnunet-qt requires Qt4])
-fi
+LIBS="$LIBS $QTLIBS"
+INCLUDES="$INCLUDES $QTINC"
+PATH="$PATH:$QTBIN"
+CXXFLAGS="$CXXFLAGS $QTINC"
+AC_SUBST(QTINC)
+AC_SUBST(QTLIBS)
-# check whether to build a debug version
-AC_MSG_CHECKING([whether to build a debug version])
-AC_ARG_ENABLE(debug,
- [AC_HELP_STRING([--enable-debug],[enable debug build])],
- [case "$enableval" in
- no) AC_MSG_RESULT(no)
- QT_CONFIG=release
- ;;
- *) AC_MSG_RESULT(yes)
- QT_CONFIG=debug
- ;;
- esac])
+AC_LANG_POP([C++])
-AC_SUBST(LIBPREFIX)
-AC_SUBST(DLLDIR)
-AC_SUBST(QT_CONFIG)
-AC_SUBST(QT_CFLAGS)
+
AC_SUBST(INCLUDEPATH)
AC_SUBST(LIBPATH)
AC_OUTPUT([
Makefile
-dist.sh
-gnunet_qt.lsm
-gnunet_qt.pro
-src/src.pro
-src/common/common.pro
-src/core/core.pro
-src/plugins/plugins.pro
-src/plugins/about/about.pro
-src/plugins/general/general.pro
-src/plugins/fs/fs.pro
-src/plugins/stats/stats.pro
+src/Makefile
+src/common/Makefile
+src/core/Makefile
+src/plugins/Makefile
+src/plugins/about/Makefile
+src/plugins/general/Makefile
+src/plugins/fs/Makefile
+src/plugins/stats/Makefile
])
-
-AC_MSG_NOTICE([Running qmake])
-MINGW_IN_SHELL=1 $QMAKE gnunet_qt.pro -unix -recursive
-
Deleted: gnunet-qt/gnunet_qt.pro.in
===================================================================
--- gnunet-qt/gnunet_qt.pro.in 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/gnunet_qt.pro.in 2008-06-10 17:31:00 UTC (rev 7124)
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = src
Added: gnunet-qt/src/Makefile.am
===================================================================
--- gnunet-qt/src/Makefile.am (rev 0)
+++ gnunet-qt/src/Makefile.am 2008-06-10 17:31:00 UTC (rev 7124)
@@ -0,0 +1 @@
+SUBDIRS = common core plugins
Added: gnunet-qt/src/common/Makefile.am
===================================================================
--- gnunet-qt/src/common/Makefile.am (rev 0)
+++ gnunet-qt/src/common/Makefile.am 2008-06-10 17:31:00 UTC (rev 7124)
@@ -0,0 +1,47 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/GNUnet
+
+plugin_LTLIBRARIES = \
+ libgnunetqt_common.la
+
+libgnunetqt_common_la_SOURCES = \
+ assert.cc \
+ pluginLoader.cc \
+ gstring.cc \
+ event.cc \
+ eventDispatcher.cc \
+ textEditor.cc \
+ plugin.h \
+ pluginLoader.h \
+ event.h \
+ eventDispatcher.h \
+ textEditor.h
+
+gstring.cc: ui_textEditor.h
+
+libgnunetqt_common_la_LDFLAGS = \
+ -export-dynamic -avoid-version -module -lgnunetutil @LIBS@
+
+nodist_libgnunetqt_common_la_SOURCES = \
+ ui_textEditor.h \
+ moc_plugin.cpp \
+ moc_pluginLoader.cpp \
+ moc_event.cpp \
+ moc_eventDispatcher.cpp \
+ moc_textEditor.cpp
+
+EXTRA_DIST = \
+ $(nodist_libgnunetqt_common_la_SOURCES:moc_%.cpp=%.h) \
+ textEditor.ui
+
+moc_%.cpp: %.h
+ moc $< -o $@
+
+ui_%.h: %.ui
+ uic $< -o $@
+
+#ui_%.cpp: %.ui
+# uic -impl $*.h $< -o $@
+
+CLEANFILES = $(filter moc_%.cpp,ui_%.h,$(libgnunetqt_common_la_SOURCES))
Deleted: gnunet-qt/src/common/common.pro.in
===================================================================
--- gnunet-qt/src/common/common.pro.in 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/src/common/common.pro.in 2008-06-10 17:31:00 UTC (rev 7124)
@@ -1,19 +0,0 @@
-TEMPLATE = lib
-TARGET = @address@hidden
-dlltarget = $(TARGET)
-CONFIG += @QT_CONFIG@ dll
-DLLDESTDIR = .
-QMAKE_LFLAGS += -shared
-QMAKE_CFLAGS += @QT_CFLAGS@
-QMAKE_CXXFLAGS += @QT_CFLAGS@
-LIBS = -lgnunetutil
-
-INCLUDEPATH = ../include @INCLUDEPATH@
-QMAKE_LIBDIR += @LIBPATH@
-
-target.path = @prefix@/@DLLDIR@
-INSTALLS += target
-
-FORMS = textEditor.ui
-SOURCES = assert.cc pluginLoader.cc gstring.cc event.cc eventDispatcher.cc
textEditor.cc
-HEADERS = pluginLoader.h event.h eventDispatcher.h textEditor.h
../include/gnunet_qt_common.h
\ No newline at end of file
Added: gnunet-qt/src/common/plugin.h
===================================================================
--- gnunet-qt/src/common/plugin.h (rev 0)
+++ gnunet-qt/src/common/plugin.h 2008-06-10 17:31:00 UTC (rev 7124)
@@ -0,0 +1,16 @@
+#ifndef PLUGIN_H_
+#define PLUGIN_H_
+
+#include <QWidget>
+
+class GPlugin: public QWidget
+{
+ Q_OBJECT
+
+public:
+signals:
+ int setStatusText(const QPixmap &icon, const QString strStatus);
+ int setNetworkStatus(const QPixmap &icon, const QString strStatus);
+};
+
+#endif /*PLUGIN_H_*/
Modified: gnunet-qt/src/common/pluginLoader.h
===================================================================
--- gnunet-qt/src/common/pluginLoader.h 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/src/common/pluginLoader.h 2008-06-10 17:31:00 UTC (rev 7124)
@@ -30,10 +30,33 @@
#include <QObject>
#include <QLibrary>
-#include "gnunet_qt_common.h"
+#include "plugin.h"
+typedef struct
+{
+ class QLibrary *lib;
+ class GPlugin *wnd;
+} GPluginSpec;
+class GPluginLoader : public QObject
+{
+ Q_OBJECT
+
+public:
+ ~GPluginLoader();
+ GPlugin *load(const QString &strName, struct GNUNET_GC_Configuration *config,
+ struct GNUNET_GE_Context *errorContext);
+ void unloadAll();
+
+protected:
+ QList<GPluginSpec> plugins;
+};
+
+typedef GPlugin *(*InitPlugin) (const struct GNUNET_GC_Configuration *config,
+ const struct GNUNET_GE_Context *errorContext);
+typedef void (*ShutdownPlugin) (GPlugin *plugin);
+
#endif /*PLUGINLOADER_H_*/
/* end of pluginLoader.h */
Added: gnunet-qt/src/core/Makefile.am
===================================================================
--- gnunet-qt/src/core/Makefile.am (rev 0)
+++ gnunet-qt/src/core/Makefile.am 2008-06-10 17:31:00 UTC (rev 7124)
@@ -0,0 +1,47 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+bin_PROGRAMS = \
+ gnunet-qt
+
+gnunet_qt_SOURCES = \
+ ui_about.h \
+ ui_wndMain.h \
+ aboutDlg.cc \
+ main.cc \
+ wndMain.cc \
+ aboutDlg.h \
+ main.h \
+ wndMain.h
+
+nodist_gnunet_qt_SOURCES = \
+ moc_aboutDlg.cpp \
+ moc_main.cpp \
+ moc_wndMain.cpp \
+ pixmaps.cpp \
+ ui_about.h \
+ ui_wndMain.h
+
+aboutDlg.cc: ui_about.h
+main.cc: ui_wndMain.h
+
+gnunet_qt_LDADD = \
+ $(top_builddir)/src/common/libgnunetqt_common.la
+
+gnunet_qt_LDFLAGS = -lgnunetutil @LIBS@
+
+EXTRA_DIST = \
+ $(nodist_gnunet-qt_SOURCES:moc_%.cpp=%.h) \
+ about.ui \
+ wndMain.ui
+
+moc_%.cpp: %.h
+ moc $< -o $@
+
+pixmaps.cpp : ../../pixmaps/pixmaps.qrc
+ rcc ../../pixmaps/pixmaps.qrc -o pixmaps.cpp
+
+ui_%.h: %.ui
+ uic $< -o $@
+
+CLEANFILES = $(filter moc_%.cpp,ui_%.h,$(gnunet_qt_SOURCES)) pixmaps.cpp
+
Deleted: gnunet-qt/src/core/core.pro.in
===================================================================
--- gnunet-qt/src/core/core.pro.in 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/src/core/core.pro.in 2008-06-10 17:31:00 UTC (rev 7124)
@@ -1,20 +0,0 @@
-TEMPLATE = app
-TARGET = gnunet-qt
-CONFIG += @QT_CONFIG@
-DESTDIR = .
-DEPENDPATH += .
-INCLUDEPATH += ../include @top_builddir@ @INCLUDEPATH@ .
-QMAKE_LIBDIR += @LIBPATH@
-LIBS += -L../common/ -lgnunetqt_common -lgnunetutil
-QMAKE_CFLAGS += @QT_CFLAGS@
-QMAKE_CXXFLAGS += @QT_CFLAGS@
-
-target.path = @prefix@/bin
-INSTALLS += target
-
-# Input
-SOURCES += aboutDlg.cc main.cc wndMain.cc
-HEADERS += aboutDlg.h main.h wndMain.h
-FORMS += about.ui wndMain.ui
-RESOURCES += ../../pixmaps/pixmaps.qrc
-
Modified: gnunet-qt/src/core/main.cc
===================================================================
--- gnunet-qt/src/core/main.cc 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/src/core/main.cc 2008-06-10 17:31:00 UTC (rev 7124)
@@ -227,7 +227,13 @@
return &wnd;
}
-int main(int argc, char * const *argv)
+int
+#if defined(Q_OS_WIN)
+ gn_main
+#else
+ main
+#endif
+(int argc, char * const *argv)
{
int ret = 0;
QTranslator transl;
@@ -274,4 +280,47 @@
return ret;
}
+
+#if defined(Q_OS_WIN)
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
lpCmdLine, int nCmdShow)
+{
+ int argc, ret;
+ char **argv, *idx, *line, *start, mod[4097];
+ bool quoted, esc;
+
+ argc = 0;
+ quoted = esc = 0;
+ line = strdup(lpCmdLine);
+ argv = (char **) malloc(sizeof(char *) * 2);
+
+ GetModuleFileNameA(NULL, mod, 4096);
+ argv[0] = mod;
+ argv[1] = NULL;
+ start = line;
+
+ for (idx = line; *idx != 0; idx++)
+ {
+ if (*idx == '"' && (idx == line || *(idx-1) != '\\'))
+ quoted = !quoted;
+
+ if (!quoted && (*idx == '\t' || *idx == ' '))
+ {
+ argc++;
+ argv = (char **) realloc(argv, (argc + 2) * sizeof(char *));
+ argv[argc] = start;
+ argv[argc + 1] = NULL;
+ *idx = 0;
+ start = idx + 1;
+ }
+ }
+
+ ret = gn_main(argc + 1, (char * const *) argv);
+ free(argv);
+ free(line);
+
+ return ret;
+}
+#endif
+
+
/* end of main.cc */
Modified: gnunet-qt/src/include/gnunet_qt_common.h
===================================================================
--- gnunet-qt/src/include/gnunet_qt_common.h 2008-06-10 14:01:04 UTC (rev
7123)
+++ gnunet-qt/src/include/gnunet_qt_common.h 2008-06-10 17:31:00 UTC (rev
7124)
@@ -34,6 +34,8 @@
#include "../common/event.h"
#include "../common/eventDispatcher.h"
#include "../common/textEditor.h"
+#include "../common/plugin.h"
+#include "../common/pluginLoader.h"
#define GNUNETQT_ASSERT(cond) do { if (! (cond))
gnunet_qt_assert_quit(__FILE__, __LINE__); } while(0);
@@ -52,36 +54,6 @@
typedef QList<int> GIntList;
-typedef struct
-{
- class QLibrary *lib;
- class GPlugin *wnd;
-} GPluginSpec;
-
-class GPlugin: public QWidget
-{
- Q_OBJECT
-
-public:
-signals:
- int setStatusText(const QPixmap &icon, const QString strStatus);
- int setNetworkStatus(const QPixmap &icon, const QString strStatus);
-};
-
-class GPluginLoader : public QObject
-{
- Q_OBJECT
-
-public:
- ~GPluginLoader();
- GPlugin *load(const QString &strName, struct GNUNET_GC_Configuration *config,
- struct GNUNET_GE_Context *errorContext);
- void unloadAll();
-
-protected:
- QList<GPluginSpec> plugins;
-};
-
class GString : public QString
{
public:
@@ -113,11 +85,6 @@
char *cstr;
};
-typedef GPlugin *(*InitPlugin) (const struct GNUNET_GC_Configuration *config,
- const struct GNUNET_GE_Context *errorContext);
-typedef void (*ShutdownPlugin) (GPlugin *plugin);
-
-
#endif /*GNUNET_QT_COMMON_H_*/
/* end of gnunet_qt_common.h */
Added: gnunet-qt/src/plugins/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/Makefile.am (rev 0)
+++ gnunet-qt/src/plugins/Makefile.am 2008-06-10 17:31:00 UTC (rev 7124)
@@ -0,0 +1 @@
+SUBDIRS = about fs general stats
Added: gnunet-qt/src/plugins/about/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/about/Makefile.am (rev 0)
+++ gnunet-qt/src/plugins/about/Makefile.am 2008-06-10 17:31:00 UTC (rev
7124)
@@ -0,0 +1,32 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/GNUnet
+
+plugin_LTLIBRARIES = \
+ libgnunetqtmodule_about.la
+
+libgnunetqtmodule_about_la_SOURCES = \
+ about.cc about.h
+
+nodist_libgnunetqtmodule_about_la_SOURCES = \
+ ui_about.h moc_about.cpp
+
+about.cc: ui_about.h
+
+libgnunetqtmodule_about_la_LIBADD = \
+ $(top_builddir)/src/common/libgnunetqt_common.la
+
+libgnunetqtmodule_about_la_LDFLAGS = \
+ -lgnunetutil @LIBS@ -export-dynamic -avoid-version -module
+
+EXTRA_DIST = \
+ $(nodist_libgnunetqtmodule_about_la_SOURCES:moc_%.cpp=%.h) \
+ about.ui
+
+moc_%.cpp: %.h
+ moc $< -o $@
+
+ui_%.h: %.ui
+ uic $< -o $@
+
+CLEANFILES = $(filter moc_%.cpp,ui_%.h,$(libgnunetqtmodule_about_la_SOURCES))
Deleted: gnunet-qt/src/plugins/about/about.pro.in
===================================================================
--- gnunet-qt/src/plugins/about/about.pro.in 2008-06-10 14:01:04 UTC (rev
7123)
+++ gnunet-qt/src/plugins/about/about.pro.in 2008-06-10 17:31:00 UTC (rev
7124)
@@ -1,17 +0,0 @@
-TEMPLATE = lib
-TARGET = @address@hidden
-dlltarget = $(TARGET)
-CONFIG += @QT_CONFIG@ dll
-INCLUDEPATH = ../../../ ../../include .
-DLLDESTDIR = .
-LIBS = -L../../common -lgnunetqt_common
-QMAKE_LFLAGS += -shared
-QMAKE_CFLAGS += @QT_CFLAGS@
-QMAKE_CXXFLAGS += @QT_CFLAGS@
-
-target.path = @prefix@/@DLLDIR@
-INSTALLS += target
-
-SOURCES = about.cc
-HEADERS = about.h ../../include/gnunet_qt_common.h
-FORMS = about.ui
Added: gnunet-qt/src/plugins/fs/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/fs/Makefile.am (rev 0)
+++ gnunet-qt/src/plugins/fs/Makefile.am 2008-06-10 17:31:00 UTC (rev
7124)
@@ -0,0 +1,81 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/GNUnet
+
+plugin_LTLIBRARIES = \
+ libgnunetqtmodule_fs.la
+
+libgnunetqtmodule_fs_la_SOURCES = \
+ ecrsMetaData.cc \
+ ecrsuri.cc \
+ downloadController.cc \
+ downloadItemDelegate.cc \
+ fshelper.cc \
+ fs.cc \
+ fs-search.cc \
+ searchSummaryController.cc \
+ searchSummaryModel.cc \
+ uploadController.cc \
+ uploadDialog.cc \
+ uploadItemDelegate.cc \
+ searchController.cc \
+ searchItemDelegate.cc \
+ ecrsMetaData.h \
+ ecrsuri.h \
+ downloadController.h \
+ downloadItemDelegate.h \
+ fshelper.h \
+ fs.h \
+ fs-search.h \
+ searchSummaryController.h \
+ searchSummaryModel.h \
+ uploadController.h \
+ uploadDialog.h \
+ uploadItemDelegate.h \
+ searchController.h \
+ searchItemDelegate.h
+
+nodist_libgnunetqtmodule_fs_la_SOURCES = \
+ moc_ecrsMetaData.cpp \
+ moc_ecrsuri.cpp \
+ moc_downloadController.cpp \
+ moc_downloadItemDelegate.cpp \
+ moc_fshelper.cpp \
+ moc_fs.cpp \
+ moc_fs-search.cpp \
+ moc_searchSummaryController.cpp \
+ moc_searchSummaryModel.cpp \
+ moc_uploadController.cpp \
+ moc_uploadDialog.cpp \
+ moc_uploadItemDelegate.cpp \
+ moc_searchController.cpp \
+ moc_searchItemDelegate.cpp \
+ ui_fs.h \
+ ui_fs-search-result.h \
+ ui_fs-upload.h \
+ ui_textEditor.h
+
+downloadController.cc: ui_fs.h
+downloadController.cc: ui_fs-search-result.h
+downloadController.cc: ui_fs-upload.h
+
+libgnunetqtmodule_fs_la_LIBADD = \
+ $(top_builddir)/src/common/libgnunetqt_common.la
+
+libgnunetqtmodule_fs_la_LDFLAGS = \
+ -lextractor -lgnunetutil -lgnunetecrs -lgnunetfsui @LIBS@ -export-dynamic
-avoid-version -module
+
+EXTRA_DIST = \
+ $(nodist_libgnunetqtmodule_fs_la_SOURCES:moc_%.cpp=%.h) \
+ fs.ui \
+ fs-search-result.ui \
+ fs-upload.ui \
+ textEditor.ui
+
+moc_%.cpp: %.h
+ moc $< -o $@
+
+ui_%.h: %.ui
+ uic $< -o $@
+
+CLEANFILES = $(filter moc_%.cpp,ui_%.h,$(libgnunetqtmodule_fs_la_SOURCES))
Deleted: gnunet-qt/src/plugins/fs/fs.pro.in
===================================================================
--- gnunet-qt/src/plugins/fs/fs.pro.in 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/src/plugins/fs/fs.pro.in 2008-06-10 17:31:00 UTC (rev 7124)
@@ -1,45 +0,0 @@
-TEMPLATE = lib
-TARGET = @address@hidden
-dlltarget = $(TARGET)
-CONFIG += @QT_CONFIG@ dll
-INCLUDEPATH = ../../include . @INCLUDEPATH@ @top_builddir@
-DLLDESTDIR = .
-LIBS = -L../../common -lgnunetqt_common -lextractor -lgnunetutil -lgnunetecrs
-lgnunetfsui
-QMAKE_LIBDIR += @LIBPATH@
-QMAKE_LFLAGS += -shared
-QMAKE_CFLAGS += @QT_CFLAGS@
-QMAKE_CXXFLAGS += @QT_CFLAGS@
-
-target.path = @prefix@/@DLLDIR@
-INSTALLS += target
-
-SOURCES = ecrsMetaData.cc \
- ecrsuri.cc \
- downloadController.cc \
- downloadItemDelegate.cc \
- fshelper.cc \
- fs.cc \
- fs-search.cc \
- searchSummaryController.cc \
- searchSummaryModel.cc \
- uploadController.cc \
- uploadDialog.cc \
- uploadItemDelegate.cc \
- searchController.cc \
- searchItemDelegate.cc
-HEADERS = ecrsMetaData.h \
- ecrsuri.h \
- downloadController.h \
- downloadItemDelegate.h \
- fshelper.h \
- fs.h \
- fs-search.h \
- searchSummaryController.h \
- searchSummaryModel.h \
- uploadController.h \
- uploadDialog.h \
- uploadItemDelegate.h \
- searchController.h \
- searchItemDelegate.h \
- ../../include/gnunet_qt_common.h
-FORMS = fs.ui fs-search-result.ui fs-upload.ui textEditor.ui
Added: gnunet-qt/src/plugins/general/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/general/Makefile.am (rev 0)
+++ gnunet-qt/src/plugins/general/Makefile.am 2008-06-10 17:31:00 UTC (rev
7124)
@@ -0,0 +1,40 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/GNUnet
+
+plugin_LTLIBRARIES = \
+ libgnunetqtmodule_general.la
+
+libgnunetqtmodule_general_la_SOURCES = \
+ general.cc \
+ startStopThread.cc \
+ checkDaemonThread.cc \
+ general.h \
+ startStopThread.h \
+ checkDaemonThread.h
+
+nodist_libgnunetqtmodule_general_la_SOURCES = \
+ moc_general.cpp \
+ moc_startStopThread.cpp \
+ moc_checkDaemonThread.cpp \
+ ui_general.h
+
+general.cc: ui_general.h
+
+libgnunetqtmodule_general_la_LIBADD = \
+ $(top_builddir)/src/common/libgnunetqt_common.la
+
+libgnunetqtmodule_general_la_LDFLAGS = \
+ -lgnunetutil -lgnunetgetoption_api -lgnunetutil_network_client @LIBS@
-export-dynamic -avoid-version -module
+
+EXTRA_DIST = \
+ $(nodist_libgnunetqtmodule_general_la_SOURCES:moc_%.cpp=%.h) \
+ general.ui
+
+moc_%.cpp: %.h
+ moc $< -o $@
+
+ui_%.h: %.ui
+ uic $< -o $@
+
+CLEANFILES = $(filter moc_%.cpp,ui_%.h,$(libgnunetqtmodule_general_la_SOURCES))
Deleted: gnunet-qt/src/plugins/general/general.pro.in
===================================================================
--- gnunet-qt/src/plugins/general/general.pro.in 2008-06-10 14:01:04 UTC
(rev 7123)
+++ gnunet-qt/src/plugins/general/general.pro.in 2008-06-10 17:31:00 UTC
(rev 7124)
@@ -1,18 +0,0 @@
-TEMPLATE = lib
-TARGET = @address@hidden
-dlltarget = $(TARGET)
-CONFIG += @QT_CONFIG@ dll
-INCLUDEPATH += ../../include . @INCLUDEPATH@ @top_builddir@
-DLLDESTDIR = .
-LIBS = -lgnunetutil -lgnunetgetoption_api -L../../common -lgnunetqt_common
-QMAKE_LIBDIR += @LIBPATH@
-QMAKE_LFLAGS += -shared
-QMAKE_CFLAGS += @QT_CFLAGS@
-QMAKE_CXXFLAGS += @QT_CFLAGS@
-
-target.path = @prefix@/@DLLDIR@
-INSTALLS += target
-
-SOURCES = general.cc startStopThread.cc checkDaemonThread.cc
-HEADERS = general.h startStopThread.h checkDaemonThread.h
../../include/gnunet_qt_common.h
-FORMS = general.ui
Deleted: gnunet-qt/src/plugins/plugins.pro.in
===================================================================
--- gnunet-qt/src/plugins/plugins.pro.in 2008-06-10 14:01:04 UTC (rev
7123)
+++ gnunet-qt/src/plugins/plugins.pro.in 2008-06-10 17:31:00 UTC (rev
7124)
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = about general fs stats
\ No newline at end of file
Added: gnunet-qt/src/plugins/stats/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/stats/Makefile.am (rev 0)
+++ gnunet-qt/src/plugins/stats/Makefile.am 2008-06-10 17:31:00 UTC (rev
7124)
@@ -0,0 +1,37 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/GNUnet
+
+plugin_LTLIBRARIES = \
+ libgnunetqtmodule_stats.la
+
+libgnunetqtmodule_stats_la_SOURCES = \
+ statsPlugin.cc \
+ statsPlugin.h \
+ statsThread.cc \
+ statsThread.h
+
+nodist_libgnunetqtmodule_stats_la_SOURCES = \
+ moc_statsPlugin.cpp \
+ moc_statsThread.cpp \
+ ui_stats.h
+
+statsPlugin.cc: ui_stats.h
+
+libgnunetqtmodule_stats_la_LIBADD = \
+ $(top_builddir)/src/common/libgnunetqt_common.la
+
+libgnunetqtmodule_stats_la_LDFLAGS = \
+ -lgnunetutil -lgnunetstats_api @LIBS@ -export-dynamic -avoid-version -module
+
+EXTRA_DIST = \
+ $(nodist_libgnunetqtmodule_stats_la_SOURCES:moc_%.cpp=%.h) \
+ stats.ui
+
+moc_%.cpp: %.h
+ moc $< -o $@
+
+ui_%.h: %.ui
+ uic $< -o $@
+
+CLEANFILES = $(filter moc_%.cpp,ui_%.h,$(libgnunetqtmodule_stats_la_SOURCES))
Deleted: gnunet-qt/src/plugins/stats/stats.pro.in
===================================================================
--- gnunet-qt/src/plugins/stats/stats.pro.in 2008-06-10 14:01:04 UTC (rev
7123)
+++ gnunet-qt/src/plugins/stats/stats.pro.in 2008-06-10 17:31:00 UTC (rev
7124)
@@ -1,18 +0,0 @@
-TEMPLATE = lib
-TARGET = @address@hidden
-dlltarget = $(TARGET)
-CONFIG += @QT_CONFIG@ dll
-INCLUDEPATH += ../../include . @INCLUDEPATH@ @top_builddir@
-DLLDESTDIR = .
-LIBS = -lgnunetutil -lgnunetstats_api -L../../common -lgnunetqt_common
-QMAKE_LIBDIR += @LIBPATH@
-QMAKE_LFLAGS += -shared
-QMAKE_CFLAGS += @QT_CFLAGS@
-QMAKE_CXXFLAGS += @QT_CFLAGS@
-
-target.path = @prefix@/@DLLDIR@
-INSTALLS += target
-
-SOURCES = statsPlugin.cc statsThread.cc
-HEADERS = statsPlugin.h statsThread.h ../../include/gnunet_qt_common.h
-FORMS = stats.ui
Deleted: gnunet-qt/src/src.pro.in
===================================================================
--- gnunet-qt/src/src.pro.in 2008-06-10 14:01:04 UTC (rev 7123)
+++ gnunet-qt/src/src.pro.in 2008-06-10 17:31:00 UTC (rev 7124)
@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = common core plugins
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7124 - in gnunet-qt: . src src/common src/core src/include src/plugins src/plugins/about src/plugins/fs src/plugins/general src/plugins/stats,
gnunet <=