Commit b26d50a6 authored by Michael Terry's avatar Michael Terry

Rename libcommon to libdeja; Reorganize source to better delineate GNOME bits from libdeja bits

parent 010ff55a
common/BackendFile.c
common/BackendRackspace.c
common/BackendS3.c
common/BackendU1.c
common/Backend.c
common/CommonUtils.c
common/DuplicityInfo.c
common/DuplicityInstance.c
common/Duplicity.c
common/FilteredSettings.c
common/Network.c
common/OperationBackup.c
common/OperationFiles.c
common/OperationRestore.c
common/OperationStatus.c
common/Operation.c
common/RecursiveDelete.c
common/RecursiveMove.c
common/RecursiveOp.c
libdeja/BackendFile.c
libdeja/BackendRackspace.c
libdeja/BackendS3.c
libdeja/BackendU1.c
libdeja/Backend.c
libdeja/CommonUtils.c
libdeja/DuplicityInfo.c
libdeja/DuplicityInstance.c
libdeja/Duplicity.c
libdeja/FilteredSettings.c
libdeja/Network.c
libdeja/OperationBackup.c
libdeja/OperationFiles.c
libdeja/OperationRestore.c
libdeja/OperationStatus.c
libdeja/Operation.c
libdeja/RecursiveDelete.c
libdeja/RecursiveMove.c
libdeja/RecursiveOp.c
deja-dup/AssistantBackup.c
deja-dup/AssistantOperation.c
deja-dup/AssistantRestore.c
......@@ -25,43 +25,42 @@ deja-dup/Assistant.c
deja-dup/main.c
deja-dup/MountOperationAssistant.c
deja-dup/StatusIcon.c
monitor/monitor.c
preferences/PreferencesDialog.c
preferences/preferences.c
tests/data/symlink.tar.gz
widgets/ConfigBool.c
widgets/ConfigChoice.c
widgets/ConfigDelete.c
widgets/ConfigEntry.c
widgets/ConfigFolder.c
widgets/ConfigLabelBackupDate.c
widgets/ConfigLabelBool.c
widgets/ConfigLabelList.c
widgets/ConfigLabelLocation.c
widgets/ConfigLabelPolicy.c
widgets/ConfigLabel.c
widgets/ConfigList.c
widgets/ConfigLocation.c
widgets/ConfigLocationCustom.c
widgets/ConfigLocationDAV.c
widgets/ConfigLocationFTP.c
widgets/ConfigLocationFile.c
widgets/ConfigLocationRackspace.c
widgets/ConfigLocationS3.c
widgets/ConfigLocationSMB.c
widgets/ConfigLocationSSH.c
widgets/ConfigLocationTable.c
widgets/ConfigLocationU1.c
widgets/ConfigLocationVolume.c
widgets/ConfigNumber.c
widgets/ConfigPeriod.c
widgets/ConfigRelPath.c
widgets/ConfigSwitch.c
widgets/ConfigURLPart.c
widgets/ConfigURLPartBool.c
widgets/ConfigWidget.c
widgets/ToggleGroup.c
widgets/WidgetUtils.c
deja-dup/monitor/monitor.c
deja-dup/preferences/PreferencesDialog.c
deja-dup/preferences/preferences.c
deja-dup/widgets/ConfigBool.c
deja-dup/widgets/ConfigChoice.c
deja-dup/widgets/ConfigDelete.c
deja-dup/widgets/ConfigEntry.c
deja-dup/widgets/ConfigFolder.c
deja-dup/widgets/ConfigLabelBackupDate.c
deja-dup/widgets/ConfigLabelBool.c
deja-dup/widgets/ConfigLabelList.c
deja-dup/widgets/ConfigLabelLocation.c
deja-dup/widgets/ConfigLabelPolicy.c
deja-dup/widgets/ConfigLabel.c
deja-dup/widgets/ConfigList.c
deja-dup/widgets/ConfigLocation.c
deja-dup/widgets/ConfigLocationCustom.c
deja-dup/widgets/ConfigLocationDAV.c
deja-dup/widgets/ConfigLocationFTP.c
deja-dup/widgets/ConfigLocationFile.c
deja-dup/widgets/ConfigLocationRackspace.c
deja-dup/widgets/ConfigLocationS3.c
deja-dup/widgets/ConfigLocationSMB.c
deja-dup/widgets/ConfigLocationSSH.c
deja-dup/widgets/ConfigLocationTable.c
deja-dup/widgets/ConfigLocationU1.c
deja-dup/widgets/ConfigLocationVolume.c
deja-dup/widgets/ConfigNumber.c
deja-dup/widgets/ConfigPeriod.c
deja-dup/widgets/ConfigRelPath.c
deja-dup/widgets/ConfigSwitch.c
deja-dup/widgets/ConfigURLPart.c
deja-dup/widgets/ConfigURLPartBool.c
deja-dup/widgets/ConfigWidget.c
deja-dup/widgets/ToggleGroup.c
deja-dup/widgets/WidgetUtils.c
ABOUT-NLS
*.lo
**/Makefile
......@@ -69,8 +68,6 @@ ABOUT-NLS
*.gmo
*.stamp
*.la
tests/duplicity
tests/duplicity-src
**/.libs
**/.deps
config.h
......@@ -87,18 +84,18 @@ man/[a-z][a-z]
man/[a-z][a-z]_[A-Z][A-Z]
man/C
man/locales
help/[a-z][a-z]/*.page
help/[a-z][a-z]_[A-Z][A-Z]/*.page
help/[a-z][a-z]/*.mo
help/[a-z][a-z]_[A-Z][A-Z]/*.mo
help/POT
deja-dup/deja-dup
preferences/deja-dup-preferences
monitor/deja-dup-monitor
widgets/libwidgets.vapi
widgets/widgets.h
common/libcommon.vapi
common/common.h
deja-dup/help/[a-z][a-z]/*.page
deja-dup/help/[a-z][a-z]_[A-Z][A-Z]/*.page
deja-dup/help/[a-z][a-z]/*.mo
deja-dup/help/[a-z][a-z]_[A-Z][A-Z]/*.mo
deja-dup/help/POT
deja-dup/monitor/deja-dup-monitor
deja-dup/preferences/deja-dup-preferences
deja-dup/widgets/libwidgets.vapi
deja-dup/widgets/widgets.h
libdeja/libdeja.vapi
libdeja/deja.h
po/stamp-it
po/quot.sed
po/remove-potcdate.sin
......@@ -130,17 +127,17 @@ data/deja-dup-monitor.desktop.in
data/deja-dup.desktop
data/org.gnome.DejaDup.gschema.valid
data/org.gnome.DejaDup.gschema.xml
preferences/Preferences.c
preferences/preferences.h
common/AsyncCommand.c
common/BackendAuto.c
common/Checker.c
common/PythonChecker.c
deja-dup/preferences/Preferences.c
deja-dup/preferences/preferences.h
libdeja/AsyncCommand.c
libdeja/BackendAuto.c
libdeja/Checker.c
libdeja/PythonChecker.c
deja-dup/Prompt.c
data/deja-dup-preferences.desktop
data/deja-dup-preferences.desktop.in
data/gnome-deja-dup-panel.desktop
preferences/preferences-main.c
deja-dup/preferences/preferences-main.c
tests/**/*.log
.pc
debian
......@@ -16,17 +16,17 @@ Files: po/*.po
Copyright: 2008–2012 Rosetta Contributors and Canonical Ltd
License: GPL-3+
Files: common/uriutils.[ch]
Files: libdeja/uriutils.[ch]
Copyright: 2006–2007 Red Hat, Inc
License: GPL-3+
Files: nautilus/NautilusExtension.[ch]
Files: deja-dup/nautilus/NautilusExtension.[ch]
Copyright: 2004–2005 Free Software Foundation, Inc.
2009–2011 Michael Terry <mike@mterry.name>
2011 Canonical Ltd
License: GPL-3+
Files: preferences/PreferencesPanel.c
Files: deja-dup/preferences/PreferencesPanel.c
Copyright: 2010 Intel, Inc
2011 Michael Terry <mike@mterry.name>
License: GPL-3+
......@@ -35,12 +35,12 @@ Files: vapi/config.vapi
Copyright: 2007–2008 Jaap Haitsma <jaap@haitsma.org>
License: GPL-3+
Files: help/C/*.page
Files: deja-dup/help/C/*.page
Copyright: 2010–2011 Michael Terry <mike@mterry.name>
2011 Canonical Ltd
License: CC-BY-SA-3.0
Files: help/*/*.po
Files: deja-dup/help/*/*.po
Copyright: 2008–2012 Rosetta Contributors and Canonical Ltd
License: CC-BY-SA-3.0
......
When making a non-trivial change, remember to add yourself to AUTHORS and help/C/credits.page.
When testing a change, it is helpful to: "./tests/interactive".
When testing a change, it is helpful to: "./libdeja/tests/interactive".
Directories:
• common: shared code that does not require gtk
• widgets: shared code that does require gtk
• monitor: daemon that runs in user's session, kicks off deja-dup as needed
• preferences: control center panel
• nautilus: nautilus extension
• deja-dup: deja-dup helper app
• tools: backup tool backend, handles talking to duplicity
• libdeja: non-GUI library that wraps policy and hides complexity of duplicity
• deja-dup: GNOME UI for libdeja, including integration points with nautilus and control-center
• data: schemas, icons, desktop files, etc
• help: help documentation
• vapi: some helper APIs for vala
• tests: test scripts
TODO:
• use GResource
......
......@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = data po vapi common tools widgets monitor preferences deja-dup nautilus help man tests
SUBDIRS = data po vapi libdeja deja-dup man
# Distribute pot file
update-pot:
......
......@@ -84,7 +84,7 @@ PKG_CHECK_MODULES(PREF,
libsecret-1
libpeas-1.0)
PKG_CHECK_MODULES(COMMON,
PKG_CHECK_MODULES(LIBDEJA,
gio-2.0 >= $GIO_REQ_VER
gio-unix-2.0 >= $GIO_REQ_VER
libsecret-1
......@@ -173,20 +173,21 @@ AS_IF([test "x$with_unity" != xno],
# Sets up output files.
AC_CONFIG_FILES([Makefile
common/Makefile
data/Makefile
deja-dup/Makefile
help/Makefile
deja-dup/help/Makefile
deja-dup/monitor/Makefile
deja-dup/nautilus/Makefile
deja-dup/preferences/Makefile
deja-dup/tests/Makefile
deja-dup/tests/ldtp/Makefile
deja-dup/widgets/Makefile
libdeja/Makefile
libdeja/tests/Makefile
libdeja/tests/unit/Makefile
libdeja/tools/Makefile
libdeja/tools/duplicity/Makefile
man/Makefile
monitor/Makefile
nautilus/Makefile
po/Makefile.in
preferences/Makefile
tests/Makefile
tests/ldtp/Makefile
tests/unit/Makefile
tools/Makefile
tools/duplicity/Makefile
vapi/Makefile
widgets/Makefile])
vapi/Makefile])
AC_OUTPUT
......@@ -16,11 +16,13 @@
# You should have received a copy of the GNU General Public License
# along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = widgets monitor preferences nautilus help tests
bin_PROGRAMS = deja-dup
deja_dup_CFLAGS = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/libdeja \
-I$(srcdir)/widgets \
$(DUP_CFLAGS) \
$(UNITY_CFLAGS) \
-w \
......@@ -30,8 +32,8 @@ deja_dup_LDADD = \
$(DUP_LIBS) \
$(UNITY_LIBS) \
@INTLLIBS@ \
$(top_builddir)/common/libcommon.la \
$(top_builddir)/widgets/libwidgets.la
$(top_builddir)/libdeja/libdeja.la \
$(builddir)/widgets/libwidgets.la
deja_dup_VALASOURCES = \
Assistant.vala \
......@@ -48,16 +50,16 @@ deja_dup_SOURCES = \
$(deja_dup_VALASOURCES)
AM_VALAFLAGS = \
--vapidir $(top_srcdir)/common \
--vapidir $(top_srcdir)/widgets \
--vapidir $(top_srcdir)/libdeja \
--vapidir $(top_srcdir)/vapi \
--vapidir $(srcdir)/widgets \
$(UNITY_VALAFLAGS) \
--pkg @GTK_MODULE@ \
--pkg gio-2.0 \
--pkg gio-unix-2.0 \
--pkg libsecret-1 \
--pkg libnotify \
--pkg libcommon \
--pkg libdeja \
--pkg libwidgets \
--pkg config
......
......@@ -19,7 +19,7 @@
pkglibexec_PROGRAMS = deja-dup-monitor
deja_dup_monitor_CFLAGS = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/libdeja \
$(MONITOR_CFLAGS) \
-w \
-DPKG_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
......@@ -28,7 +28,7 @@ deja_dup_monitor_CFLAGS = \
deja_dup_monitor_LDADD = \
$(MONITOR_LIBS) \
@INTLLIBS@ \
$(top_builddir)/common/libcommon.la
$(top_builddir)/libdeja/libdeja.la
deja_dup_monitor_VALASOURCES = \
monitor.vala
......@@ -37,12 +37,12 @@ deja_dup_monitor_SOURCES = \
$(deja_dup_monitor_VALASOURCES)
AM_VALAFLAGS = \
--vapidir $(top_srcdir)/common \
--vapidir $(top_srcdir)/libdeja \
--vapidir $(top_srcdir)/vapi \
--pkg config \
--pkg gio-2.0 \
--pkg libpeas-1.0 \
--pkg libcommon \
--pkg libdeja \
--pkg libnotify
deja_dup_monitor_vala.stamp: $(top_srcdir)/config.h
......
......@@ -22,7 +22,7 @@ nautilusdir = $(NAUTILUS_EXTENSION_DIR)
nautilus_LTLIBRARIES = libdeja-dup.la
libdeja_dup_la_CFLAGS = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/libdeja \
$(NAUTILUS_CFLAGS) \
-DPKG_LIBEXEC_DIR=\"$(pkglibexecdir)\" \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
......
......@@ -24,8 +24,8 @@ endif
bin_PROGRAMS = deja-dup-preferences
SHARED_CFLAGS = \
-I$(top_srcdir)/common \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/libdeja \
-I$(top_srcdir)/deja-dup/widgets \
$(PREF_CFLAGS) \
-w \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
......@@ -38,8 +38,8 @@ deja_dup_preferences_CFLAGS = \
SHARED_LIBS = \
$(PREF_LIBS) \
@INTLLIBS@ \
$(top_builddir)/common/libcommon.la \
$(top_builddir)/widgets/libwidgets.la
$(top_builddir)/libdeja/libdeja.la \
$(top_builddir)/deja-dup/widgets/libwidgets.la
libdeja_dup_la_LDFLAGS = -module -avoid-version
libdeja_dup_la_LIBADD = \
$(SHARED_LIBS) \
......@@ -62,13 +62,13 @@ deja_dup_preferences_SOURCES = \
$(deja_dup_preferences_VALASOURCES)
AM_VALAFLAGS = \
--vapidir $(top_srcdir)/common \
--vapidir $(top_srcdir)/widgets \
--vapidir $(top_srcdir)/libdeja \
--vapidir $(top_srcdir)/vapi \
--vapidir $(top_srcdir)/deja-dup/widgets \
--pkg @GTK_MODULE@ \
--pkg gio-2.0 \
--pkg libpeas-1.0 \
--pkg libcommon \
--pkg libdeja \
--pkg libwidgets \
--pkg config
......
# -*- Mode: Makefile; indent-tabs-mode: t; tab-width: 2 -*-
#
# This file is part of Déjà Dup.
# For copyright information, see AUTHORS.
#
# Déjà Dup is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Déjà Dup is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Déjà Dup. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = ldtp
......@@ -73,7 +73,7 @@ def setup(root_prompt = False):
environ['LANG'] = 'C'
environ['DEJA_DUP_TESTING'] = '1'
environ['DEJA_DUP_TOOLS_PATH'] = '%s/../../tools/duplicity' % (builddir)
environ['DEJA_DUP_TOOLS_PATH'] = '%s/../../libdeja/tools/duplicity' % (builddir)
if 'DEJA_DUP_TEST_SYSTEM' in environ and environ['DEJA_DUP_TEST_SYSTEM'] == '1':
extra_paths = ''
......
This diff is collapsed.