x2goadmincenter.git - master (branch) updated: fe6fabbadf912adec623835961884679fe19fb35 - x2go-commits

22 Sep 2011

The branch, master has been updated
       via  fe6fabbadf912adec623835961884679fe19fb35 (commit)
      from  daa0777c0f62c864a15617f95cda4057f3af6679 (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 fe6fabbadf912adec623835961884679fe19fb35
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Thu Sep 22 02:36:58 2011 +0200

    fix plugin build

-----------------------------------------------------------------------

Summary of changes:
 debian/x2goadmincenter.install              |    5 +++--
 x2goadmincenter/Makefile                    |   26 ++++++++++++++++++++++----
 x2goadmincenter/lib/x2goadmincenter/plugins |    1 +
 x2goadmincenter/x2goadmincenter.cpp         |    2 +-
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 120000 x2goadmincenter/lib/x2goadmincenter/plugins

The diff of changes is:

diff --git a/debian/x2goadmincenter.install b/debian/x2goadmincenter.install
index f6c43b7..b4cb467 100644
--- a/debian/x2goadmincenter.install
+++ b/debian/x2goadmincenter.install
@@ -1,2 +1,3 @@
-x2goadmincenter/.build/x2goadmincenter                  usr/bin
-x2goadmincenter/icons/x2goadmincenter.xpm               usr/share/x2goadmincenter/icons/
+x2goadmincenter/.build/x2goadmincenter			usr/bin
+x2goadmincenter/icons/x2goadmincenter.xpm		usr/share/x2goadmincenter/icons/
+x2goadmincenter/plugins/*				usr/lib/x2goadmincenter/plugins/
diff --git a/x2goadmincenter/Makefile b/x2goadmincenter/Makefile
index 610c3bb..b0b44f7 100755
--- a/x2goadmincenter/Makefile
+++ b/x2goadmincenter/Makefile
@@ -4,6 +4,8 @@ SRC_DIR=$(CURDIR)
 BUILD_DIR=$(SRC_DIR)/.build
 BUILD_BINARY=$(CLIENT_DIR)/x2goadmincenter
 
+PLUGINS_DIR=$(SRC_DIR)/plugins
+
 SHELL=/bin/bash
 
 INSTALL_DIR=install -d -o root -g root -m 755
@@ -18,12 +20,13 @@ PREFIX=/usr/local
 BINDIR=$(PREFIX)/bin
 SHAREDIR=$(PREFIX)/share
 MANDIR=$(SHAREDIR)/man
+LIBDIR=$(PREFIX)/lib/x2goadmincenter
 
 all: build
 
 build: build-arch build-indep
 
-build-arch: build_admincenter
+build-arch: build_admincenter build_plugins
 
 build-indep: build_man
 
@@ -31,10 +34,13 @@ build_admincenter:
 	mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && qmake-qt4 ../x2goadmincenter.pro
 	cd $(BUILD_DIR) && $(MAKE)
 
+build_plugins:
+	for module in `ls modules`; do cd $(SRC_DIR)/modules/$$module && qmake-qt4 $$module.pro && make; done
+
 build_man:
 	make -f Makefile.man2html build
 
-clean: clean_admincenter clean_man
+clean: clean_admincenter clean_plugins clean_man
 	find . -type f -name '*.o' -exec rm -vf {} +
 	find . -type f -name 'moc_*.cpp' -exec rm -vf {} +
 	find . -type f -name 'ui_*.h' -exec rm -vf {} +
@@ -45,28 +51,40 @@ clean: clean_admincenter clean_man
 clean_admincenter:
 	rm -fr $(CLIENT_DIR)
 
+clean_plugins:
+	rm -fr $(PLUGINS_DIR)/*
+
 clean_man:
 	make -f Makefile.man2html clean
 
-install: install_admincenter install_man
+install: install_admincenter install_plugins install_man
 
 install_admincenter:
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/
 	$(INSTALL_FILE) $(SRC_DIR)/icons/x2goadmincenter.xpm          $(DESTDIR)$(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
 
+install_plugins:
+	$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/
+	$(INSTALL_FILE) $(PLUGINS_DIR)/* $(LIBDIR)/plugins/
+
 install_man:
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
 	$(INSTALL_FILE) $(SRC_DIR)/man/man8/x2goadmincenter.8    $(DESTDIR)$(MANDIR)/man1/x2goadmincenter.8
 	gzip -f $(DESTDIR)$(MANDIR)/man8/x2goadmincenter.8
 
-uninstall: uninstall_admincenter uninstall_man
+uninstall: uninstall_admincenter uninstall_plugins uninstall_man
 
 uninstall_admincenter:
 	$(RM_FILE) $(BINDIR)/x2goadmincenter
 	$(RM_FILE) $(SHAREDIR)/x2goadmincenter/icons/x2goadmincenter.xpm
 	$(RM_DIR) $(SHAREDIR)/x2goadmincenter/icons
 
+uninstall_plugins:
+	$(RM_FILE) $(LIBDIR)/plugins/*
+	$(RM_DIR) $(LIBDIR)/plugins/
+	$(RM_DIR) $(LIBDIR)/
+
 uninstall_man:
 	$(RM_FILE) $(MANDIR)/man8/x2goadmincenter.8.gz
 	$(RM_DIR) $(MANDIR)/man8
diff --git a/x2goadmincenter/lib/x2goadmincenter/plugins b/x2goadmincenter/lib/x2goadmincenter/plugins
new file mode 120000
index 0000000..9aa30ad
--- /dev/null
+++ b/x2goadmincenter/lib/x2goadmincenter/plugins
@@ -0,0 +1 @@
+../../plugins
\ No newline at end of file
diff --git a/x2goadmincenter/x2goadmincenter.cpp b/x2goadmincenter/x2goadmincenter.cpp
index f4d911a..6a77027 100644
--- a/x2goadmincenter/x2goadmincenter.cpp
+++ b/x2goadmincenter/x2goadmincenter.cpp
@@ -120,7 +120,7 @@ X2GoAdminCenter::~X2GoAdminCenter()
 void X2GoAdminCenter::loadPlugins()
 {
     QDir pluginsDir = QDir(qApp->applicationDirPath());
-    pluginsDir.cd("../lib/x2goadmincenter/modules");
+    pluginsDir.cd("../lib/x2goadmincenter/plugins");
     foreach (QString fileName, pluginsDir.entryList(QDir::Files))
     {
         QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));


hooks/post-receive
-- 
x2goadmincenter.git (X2go Administration Center)

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 "x2goadmincenter.git" (X2go Administration Center).

    