Merge lp:~dobey/ubuntuone-client/py-only into lp:ubuntuone-client

[dobey]

Convert build system from autotools to DistUtilsExtra

[lp:~dobey/ubuntuone-client/py-only]

1399. By dobey on 2013-06-07

Add a space.

[Alejandro J. Cura (alecu)]

The linux part looks fine.
I have not checked the osx and win parts.

review: Approve

[lp:~dobey/ubuntuone-client/py-only]

1400. By dobey on 2013-06-07

Remove autogen.sh too

1401. By dobey on 2013-06-07

Update run-tests.bat for the changes.

1402. By dobey on 2013-06-07

Fix typo and allow use of $PYTHON when calling setup.py.

1403. By dobey on 2013-06-07

Default to python instead of empty string.

[Brian Curtin (brian.curtin)]

review: Approve

[Mike McCracken (mikemc)]

osx ok.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-02-09 19:54:46 +0000
+++ .bzrignore	2013-06-07 17:44:24 +0000
@@ -1,86 +1,15 @@
-Makefile
-Makefile.in
-Makefile.in.in
 POTFILES
-.deps
-.libs
-autom4te.cache
 build
 dist
-m4
-tmp
 _trial_temp
-aclocal.m4
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-intltool-*
-libtool
-ltmain.sh
-missing
-setup.py
-stamp-*
+*.egg-info
+
 *.desktop
 *.gmo
-*.icon
-*.la
-*.lo
-*.menu
 *_pb2.py
 *.pot
 *.pyc
-*.rendercache
 *.service
-.intltool-merge-cache
-gtk-doc.make
 
-ubuntuone-client-*.tar.*
-hicolor
-icons
-storageprotocol
 clientdefs.py
-docs/syncdaemon_dbus_api.txt
-docs/reference/html*
-docs/reference/libsyncdaemon-decl-list.txt
-docs/reference/libsyncdaemon-decl-list.txt.bak
-docs/reference/libsyncdaemon-decl.txt
-docs/reference/libsyncdaemon-decl.txt.bak
-docs/reference/libsyncdaemon-overrides.txt
-docs/reference/libsyncdaemon-sections.txt
-docs/reference/libsyncdaemon-undeclared.txt
-docs/reference/libsyncdaemon-undocumented.txt
-docs/reference/libsyncdaemon-unused.txt
-docs/reference/libsyncdaemon.args
-docs/reference/libsyncdaemon.hierarchy
-docs/reference/libsyncdaemon.interfaces
-docs/reference/libsyncdaemon.prerequisites
-docs/reference/libsyncdaemon.signals
-docs/reference/libsyncdaemon.types
-docs/reference/*.stamp
-docs/reference/tmpl
-docs/reference/xml*
 logging.conf
-ubuntuone-marshallers.[ch]
-
-nautilus/test-contacts-picker
-nautilus/test-highlight
-
-libsyncdaemon/syncdaemon-marshal.[ch]
-libsyncdaemon/test-libsyncdaemon
-libsyncdaemon/test-libsyncdaemon-vapi
-libsyncdaemon/test-libsyncdaemon-vapi.c
-libsyncdaemon/libsyncdaemon-1.0.pc
-libsyncdaemon/Syncdaemon-1.0.gir
-libsyncdaemon/Syncdaemon-1.0.typelib
-libsyncdaemon/libsyncdaemon-1.0.deps
-libsyncdaemon/libsyncdaemon-1.0.vapi
-*_vala.stamp
-
-ubuntuone.gnome-settings-plugin
-test-gsd-ubuntuone

=== removed file 'Makefile.am'
--- Makefile.am	2013-06-05 20:09:11 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-SUBDIRS = data po docs
-
-# Shut libtoolize up
-ACLOCAL_AMFLAGS = -I m4
-
-# PYTHONPATH for local Python scripts
-PYTHONPATH="$(SSO_PATH):$(USP_PATH):$(top_builddir):$(top_srcdir)"
-
-# Python packages we want to install
-pythonpkgdir = $(pythondir)/$(PACKAGE)
-pypackages =	\
-	ubuntuone	\
-	$(shell SRCDIR="ubuntuone"; for i in `find $$SRCDIR -type d`; do DIRNAME=`basename $$i`; if [ "x$$DIRNAME" != "xtest" ]; then printf "$$i "; fi; done)
-
-# Install our scripts and extra data here
-bin_SCRIPTS =				\
-	bin/ubuntuone-launch		\
-	bin/u1sdtool
-
-libexec_SCRIPTS =			\
-	bin/ubuntuone-syncdaemon	\
-	bin/ubuntuone-proxy-tunnel      \
-	bin/ubuntuone-login
-
-clientdefsdir = $(pythonpkgdir)/ubuntuone
-clientdefs_in_files = ubuntuone/clientdefs.py.in
-clientdefs_DATA = $(clientdefs_in_files:.py.in=.py)
-
-# Don't end up pulling in storage-protocol source as well
-pyfiles = $(shell SRCDIR="$(top_srcdir)/ubuntuone"; for i in `find $$SRCDIR -type f -name "*.py"`; do if [ ! -f $$i.in ]; then printf "$$i "; fi; done)
-
-$(clientdefs_DATA): $(clientdefs_in_files) ubuntuone
-	sed -e 's|\@localedir\@|$(localedir)|g' \
-	-e 's|\@libexecdir\@|$(libexecdir)|g' \
-	-e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|g' \
-	-e 's|\@SSO_APP_NAME\@|$(SSO_APP_NAME)|g' \
-	-e 's|\@SSO_TC_URL\@|$(SSO_TC_URL)|g' \
-	-e 's|\@SSO_PING_URL\@|$(SSO_PING_URL)|g' \
-	-e 's|\@VERSION\@|$(VERSION)|g' < $< > $@
-
-logging.conf: data/logging.conf.in Makefile
-	$(MAKE) -C data logging.conf
-
-lint: $(clientdefs_DATA) Makefile
-	PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" USE_PYFLAKES="true" u1lint -i ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py
-
-test: logging.conf $(clientdefs_DATA) Makefile
-	echo "$(PYTHONPATH)"
-	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i "test_windows.py,test_darwin.py,test_fsevents_daemon.py" tests || exit 1; \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests/proxy || exit 1; \
-		PYTHONPATH="$(PYTHONPATH)" $(PYTHON) tests/platform/check_reactor_import.py || exit 1; \
-	fi
-	rm -rf _trial_temp
-
-test-proxy: logging.conf $(clientdefs_DATA) Makefile
-	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests/proxy || exit 1; \
-	fi
-	rm -rf _trial_temp
-
-test-coverage: logging.conf $(clientdefs_DATA) Makefile
-	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests; \
-	fi
-	rm -rf _trial_temp
-
-check: lint test Makefile
-
-docs: $(clientdefs_DATA) Makefile
-	$(mkdir_p) docs
-	if test "x$(builddir)" != "x$(srcdir)" -a -f "$(srcdir)/docs/syncdaemon_dbus_api.txt"; then \
-		$(LN_S) "$(top_srcdir)/docs/syncdaemon_dbus_api.txt" "docs/syncdaemon_dbus_api.txt"; \
-	else \
-		PYTHONPATH="$(PYTHONPATH)" SRCDIR="$(srcdir)" $(PYTHON) $(srcdir)/contrib/dbus-docs; \
-	fi
-
-ubuntuone: Makefile
-	if test "x$(builddir)" != "x$(srcdir)"; then \
-		$(mkdir_p) ubuntuone; \
-		$(mkdir_p) tests; \
-		(cd ubuntuone && $(LNDIR) $(srcdir)/../ubuntuone > /dev/null); \
-		(cd tests && $(LNDIR) $(srcdir)/../tests > /dev/null); \
-	fi
-
-all-local: logging.conf $(clientdefs_DATA)
-
-sd_path = ubuntuone/syncdaemon
-
-u1fsfsm: $(srcdir)/ubuntuone/syncdaemon/u1fsfsm.ods
-	PYTHONPATH=$(PYTHONPATH) \
-	HAS_OOFFICE="true" \
-	XDG_CACHE_HOME="$(builddir)/_trial_temp/xdg_cache" \
-	$(PYTHON) -t $(srcdir)/$(sd_path)/fsm/fsm_parser.py \
-		-o $(builddir)/$(sd_path)/u1fsfsm.py $<
-	PYTHONPATH=$(PYTHONPATH) \
-	HAS_OOFFICE="true" \
-	XDG_CACHE_HOME="$(builddir)/_trial_temp/xdg_cache" \
-	$(PYTHON) -t $(srcdir)/$(sd_path)/fsm/fsm.py \
-		$(srcdir)/$(sd_path)/u1fsfsm.py
-
-install-data-local: $(clientdefs_DATA)
-	for package in $(pypackages); do \
-		$(mkdir_p) $(DESTDIR)$(pythonpkgdir)/$$package; \
-		for module in $(top_srcdir)/$$package/*.py; do \
-			$(install_sh_DATA) $$module $(DESTDIR)$(pythonpkgdir)/$$package; \
-		done; \
-	done
-	echo "$(PACKAGE)" > $(DESTDIR)$(pythondir)/$(PACKAGE).pth
-
-uninstall-local:
-	for package in $(pypackages); do \
-		for module in $(top_srcdir)/$$package/*.py; do \
-			modname=`basename $$module`; \
-			rm -f $(DESTDIR)$(pythonpkgdir)/$$package/$$modname; \
-		done; \
-		rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(pythonpkgdir)/$$package; \
-	done
-	rm -f $(DESTDIR)$(pythondir)/$(PACKAGE).pth
-
-clean-local:
-	for i in `find $(builddir) -name "*.pyc"`; do \
-		rm -f $$i; \
-	done
-	rm -rf build dist _trial_temp
-
-EXTRA_DIST =		\
-	$(srcdir)/ubuntuone/syncdaemon/u1fsfsm.ods	\
-	$(pyfiles)	\
-	$(clientdefs_in_files) \
-	LICENSE		\
-	LICENSE.OpenSSL	\
-	HACKING		\
-	VERSION	\
-	bin		\
-	contrib		\
-	tests
-
-CLEANFILES =	\
-	$(clientdefs_DATA)
-
-MAINTAINERCLEANFILES =	\
-	Makefile.in	\
-	aclocal.m4	\
-	config.guess	\
-	config.h.in	\
-	config.sub	\
-	configure	\
-	depcomp		\
-	install-sh	\
-	libtool		\
-	ltmain.sh	\
-	missing		\
-	mkinstalldirs

=== removed file 'VERSION'
--- VERSION	2013-05-28 21:50:41 +0000
+++ VERSION	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-99.12

=== removed file 'autogen.sh'
--- autogen.sh	2013-06-05 20:09:11 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="ubuntuone-client"
-REQUIRED_AUTOMAKE_VERSION="1.10"
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level $PKG_NAME directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-	echo "You need to install gnome-common from the GNOME source repository"
-	exit 1
-}
-mkdir -p "$srcdir/m4"
-USE_GNOME2_MACROS=1 . gnome-autogen.sh

=== removed file 'configure.ac'
--- configure.ac	2013-06-05 20:09:11 +0000
+++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.53)
-
-# We need to omit the trailing newline when catting the VERSION file
-AC_INIT([ubuntuone-client], m4_esyscmd([cat VERSION | tr -d '\012']))
-AC_CONFIG_SRCDIR([VERSION])
-
-AM_INIT_AUTOMAKE([1.10 foreign tar-ustar])
-
-m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
-# Workaround to make aclocal get the right flags
-AC_CONFIG_MACRO_DIR([m4])
-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS} -I m4")
-
-IT_PROG_INTLTOOL([0.40.0])
-
-GETTEXT_PACKAGE="${PACKAGE}"
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-	[translation domain of this package])
-AC_SUBST(GETTEXT_PACKAGE)
-localedir='$(prefix)/$(DATADIRNAME)/locale'
-AC_SUBST(localedir)
-
-# Need lndir for builddir != srcdir builds, because Python is not sane
-AC_PATH_PROG([LNDIR], [lndir], [])
-if test "x$LNDIR" = "x"; then
-   AC_MSG_ERROR([lndir is required to build ubuntuone-client])
-fi
-
-# Alter default logging if we're development vs. stable
-AC_MSG_CHECKING([development series build])
-DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
-if expr $DEVVERSION % 2 > /dev/null != "0"; then
-   debugging=yes
-   AC_MSG_RESULT([yes])
-else
-   debugging=no
-   AC_MSG_RESULT([no])
-fi
-
-AC_ARG_ENABLE([debug],
-   AC_HELP_STRING([--enable-debug],
-       [Enable debug logging by default [default=auto]]),
-   enable_debug=$enableval,
-   enable_debug=$debugging)
-if test "x$enable_debug" != "xno"; then
-   LOG_LEVEL="DEBUG"
-   LOG_FILE_SIZE="10485760"
-   CFLAGS="${CFLAGS} -Wall -Werror"
-   AC_SUBST(CFLAGS)
-else
-   LOG_LEVEL="INFO"
-   LOG_FILE_SIZE="1048576"
-fi
-AC_SUBST(LOG_LEVEL)
-AC_SUBST(LOG_FILE_SIZE)
-
-# Check for python 2.6
-AM_PATH_PYTHON([2.6])
-
-# Specify the path for ubuntu-sso-client source
-AC_MSG_CHECKING([for ubuntu-sso-client])
-AC_ARG_WITH([sso],
-	AC_HELP_STRING([--with-sso],
-			[Specify path to ubuntu-sso-client [default=auto]]),
-	[with_sso=$withval],
-	[with_sso=auto])
-SSO_PATH=""
-if test "x$with_sso" = "xauto"; then
-    SSO_PATH=""
-    AC_MSG_RESULT([using system path])
-else
-    SSO_PATH="$with_sso"
-	AC_MSG_RESULT([$SSO_PATH])
-fi
-AC_SUBST(SSO_PATH)
-
-# Specify the path for ubuntuone-storage-protocol source
-AC_MSG_CHECKING([for ubuntuone-storage-protocol])
-AC_ARG_WITH([protocol],
-	AC_HELP_STRING([--with-protocol],
-			[Specify path to storage protocol [default=auto]]),
-	[with_protocol=$withval],
-	[with_protocol=auto])
-USP_PATH=""
-if test "x$with_protocol" = "xauto"; then
-   USP_PATH=""
-   AC_MSG_RESULT([using system path])
-else
-   USP_PATH="$with_protocol"
-   AC_MSG_RESULT([$USP_PATH])
-fi
-AC_SUBST(USP_PATH)
-
-PKG_CHECK_MODULES(DBUS, [dbus-glib-1 >= 0.70])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
-dnl ---------------------------------------------------------------------------
-dnl - Are we specifying a different dbus root ?
-dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(dbus-services,
-              [AC_HELP_STRING([--with-dbus-services=<dir>],
-              [where D-BUS services directory is])])
-if ! test -z "$with_dbus_services" ; then
-	DBUS_SERVICES_DIR="$with_dbus_services"
-else
-	# D-BUS 0.23 and higher use $prefix/share/dbus-1/services
-	DBUS_SERVICES_DIR="\${datadir}/dbus-1/services"
-fi
-AC_SUBST(DBUS_SERVICES_DIR)
-
-dnl Strings to pass to SSO data
-SSO_APP_NAME="Ubuntu One"
-SSO_TC_URL="https://one.ubuntu.com/terms/"
-SSO_PING_URL="https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
-AC_SUBST(SSO_APP_NAME)
-AC_SUBST(SSO_TC_URL)
-AC_SUBST(SSO_PING_URL)
-AC_DEFINE_UNQUOTED([SSO_APP_NAME], ["$SSO_APP_NAME"], ["The Ubuntu One app name."])
-AC_DEFINE_UNQUOTED([SSO_TC_URL], ["$SSO_TC_URL"], ["The Ubuntu One terms and conditions URL."])
-AC_DEFINE_UNQUOTED([SSO_PING_URL], ["$SSO_PING_URL"], ["The Ubuntu One url to ping to when new tokens are stored."])
-
-AC_CONFIG_FILES([
-Makefile
-data/Makefile
-po/Makefile.in
-docs/Makefile
-])
-
-if [[ -n "$(lsb_release -r | grep -v '1[2-9].[0-9][0-9]')" ]]; then 
-    REACTOR="glib"; 
-else
-    REACTOR="gi"
-fi
-AC_SUBST(REACTOR)
-
-AC_OUTPUT

=== renamed file 'ubuntuone/syncdaemon/fsm/fsm_draw.py' => 'contrib/draw-fsm' (properties changed: -x to +x)
--- ubuntuone/syncdaemon/fsm/fsm_draw.py	2012-04-09 20:07:05 +0000
+++ contrib/draw-fsm	2013-06-07 17:44:24 +0000
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # ubuntuone.syncdaemon.fsm.fsm_draw - draw a fsm
 #
 # Author: Lucio Torre <[e-mail]>
@@ -35,7 +36,7 @@
 import sys
 
 # pylint: disable-msg=F0401
-import gtk
+from gi.repository import Gtk as gtk
 
 import xdot
 from ubuntuone.syncdaemon.fsm import fsm

=== removed file 'data/Makefile.am'
--- data/Makefile.am	2013-02-13 20:57:13 +0000
+++ data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-
-apportdir = $(datadir)/apport/package-hooks
-apport_DATA = source_ubuntuone-client.py
-
-crashdbdir = $(sysconfdir)/apport/crashdb.conf.d
-crashdb_DATA = ubuntuone-client-crashdb.conf
-
-configdir = $(sysconfdir)/xdg/ubuntuone
-config_in_files = logging.conf.in
-config_out_files = $(config_in_files:.conf.in=.conf)
-config_files = syncdaemon.conf
-config_DATA = $(config_files) $(config_out_files)
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = ubuntuone-launch.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-%.conf: %.conf.in
-	@sed -e "s|\@LOG_LEVEL\@|$(LOG_LEVEL)|" \
-		-e "s|\@LOG_FILE_SIZE\@|$(LOG_FILE_SIZE)|" $< > $@
-
-servicedir = $(DBUS_SERVICES_DIR)
-service_in_files = \
-	com.ubuntuone.SyncDaemon.service.in	\
-	com.ubuntuone.Credentials.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-%.service: %.service.in
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" \
-		-e "s|\@bindir\@|$(bindir)|" $< > $@
-
-EXTRA_DIST =			\
-	$(config_in_files)	\
-	$(config_files)		\
-	$(autostart_in_files)     \
-	$(service_in_files)	\
-	$(apport_DATA)		\
-	$(crashdb_DATA)
-
-CLEANFILES =		\
-	$(config_out_files)	\
-	$(autostart_DATA) \
-	$(service_DATA)
-
-MAINTAINERCLEANFILES =	\
-	Makefile.in

=== removed file 'docs/Makefile.am'
--- docs/Makefile.am	2013-06-05 20:09:11 +0000
+++ docs/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-
-manfilesdir = $(mandir)/man1
-manfiles_DATA =				\
-	man/u1sdtool.1
-
-EXTRA_DIST=$(manfiles_DATA)

=== renamed file 'run-mac-tests' => 'run-tests'
--- run-mac-tests	2012-08-16 06:36:31 +0000
+++ run-tests	2013-06-07 17:44:24 +0000
@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Copyright 2012 Canonical Ltd.
+# Copyright 2012-2013 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -27,7 +27,12 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 
-PYTHONPATH=../ubuntu-sso-client/:../ubuntuone-storage-protocol:../ubuntuone-dev-tools:../ubuntuone-fsevents-daemon/python:$PYTHONPATH
+PROXY_TESTS_PATH="tests/proxy"
+LINT_IGNORES="ubuntuone/platform/filesystem_notifications/pyinotify_agnostic.py"
+
+# Allow alternative python executable via environment variable.  This is
+# useful for virtualenv testing.
+PYTHON=${PYTHON:-'python'}
 
 set -e
 if [ $# -ne 0 ]; then
@@ -38,14 +43,34 @@
     MODULE="tests"
 fi
 
-echo "Executing the tests..."
-cp windows/clientdefs.py ubuntuone/clientdefs.py
-cp windows/logging.conf data/logging.conf
-# execute the tests with a number of ignored linux only modules
-u1trial --reactor=twisted -i "test_linux.py,test_windows.py" -p tests/platform/linux "$MODULE"
+style_check() {
+    u1lint -i "$LINT_IGNORES"
+    # Don't run pep8 yet, as there are a LOT of warnings to fix
+    # pep8 --exclude '.bzr,.pc,build' . bin/*
+}
+
+SYSNAME=`uname -s`
+
+if [ "$SYSNAME" == "Darwin" ]; then
+    IGNORE_FILES="test_linux.py,test_windows.py"
+    IGNORE_PATHS="tests/platform/linux"
+    REACTOR=qt4
+else
+    # Linux
+    IGNORE_FILES="test_darwin.py,test_fsevents_daemon.py,test_windows.py"
+    IGNORE_PATHS="tests/platform/windows"
+    REACTOR=gi
+fi
+
+echo "*** Running test suite for ""$MODULE"" ***"
+$PYTHON ./setup.py build
+u1trial --reactor=$REACTOR -i "$IGNORE_FILES" -p "$IGNORE_PATHS,$PROXY_TESTS_PATH" "$MODULE"
+echo "*** Running tests for ubuntuone-client-proxy ***"
+u1trial --reactor=qt4 -i "$IGNORE_FILES" -p "$IGNORE_PATHS" "$PROXY_TESTS_PATH"
+$PYTHON ./setup.py clean
 rm -rf _trial_temp
 rm -rf build
 
-python tests/platform/check_reactor_import.py
+$PYTHON tests/platform/check_reactor_import.py
 
-USE_PYFLAKES="true" u1lint
+style_check

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-10-08 20:02:06 +0000
+++ run-tests.bat	2013-06-07 17:44:24 +0000
@@ -70,11 +70,16 @@
 GOTO GETREST
 :CONTINUEBATCH
 
-ECHO Python found, executing the tests...
-COPY windows\clientdefs.py ubuntuone\clientdefs.py
-COPY windows\logging.conf data\logging.conf
+ECHO Python found at %PYTHONEXEPATH%, building auto-generated modules...
+:: call setup.py build so that necessary generated files are built
+::START "Build code" /D%CD% /WAIT "%PYTHONEXEPATH%\python.exe" setup.py build
+"%PYTHONEXEPATH%" setup.py build
+ECHO Running tests
 :: execute the tests with a number of ignored linux and mac os only modules
 "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux -i "test_linux.py,test_darwin.py,test_fsevents_daemon.py" %PARAMS% tests
+:: Clean the build from the setupt.py
+ECHO Cleaning the generated code before running the style checks...
+"%PYTHONEXEPATH%" setup.py clean
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2013-06-07 17:44:24 +0000
@@ -0,0 +1,2 @@
+[build_i18n]
+desktop_files=[("etc/xdg/autostart", ("data/ubuntuone-launch.desktop.in",))]

=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2013-06-07 17:44:24 +0000
@@ -0,0 +1,252 @@
+#!/usr/bin/python
+#
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Setup.py: build, distribute, clean."""
+
+import os
+import sys
+
+try:
+    import DistUtilsExtra.auto
+    from DistUtilsExtra.command import build_extra, build_i18n
+except ImportError:
+    print >> sys.stderr, 'To build this program you need '\
+                         'https://launchpad.net/python-distutils-extra'
+    sys.exit(1)
+assert DistUtilsExtra.auto.__version__ >= '2.18', \
+    'needs DistUtilsExtra.auto >= 2.18'
+
+try:
+    from setuptools import find_packages
+except ImportError:
+    from distutils.core import find_packages
+
+
+PROJECT_NAME = 'ubuntuone-client'
+VERSION = '13.05'
+
+POT_FILE = 'po/%s.pot' % PROJECT_NAME
+SERVICE_FILES = ['data/com.ubuntuone.Credentials.service',
+                 'data/com.ubuntuone.SyncDaemon.service']
+CONFIG_FILES = ['data/logging.conf']
+CLIENTDEFS = 'ubuntuone/clientdefs.py'
+
+BUILD_FILES = [CLIENTDEFS] + CONFIG_FILES
+CLEANFILES = [POT_FILE, 'MANIFEST'] + BUILD_FILES + SERVICE_FILES
+
+if int(VERSION.split('.')[1]) % 2 != 0:
+    LOG_LEVEL = 'DEBUG'
+    LOG_FILE_SIZE = '10485760'
+else:
+    LOG_LEVEL = 'INFO'
+    LOG_FILE_SIZE = '1048576'
+
+
+def replace_variables(files_to_replace, prefix=None, *args, **kwargs):
+    """Replace the @VERSION@ in the constants file with the actual version."""
+    for fname in files_to_replace:
+        with open(fname + '.in') as in_file:
+            content = in_file.read()
+            with open(fname, 'w') as out_file:
+                content = content.replace('@VERSION@', VERSION)
+                content = content.replace('@PROJECT_NAME@', PROJECT_NAME)
+                content = content.replace('@GETTEXT_PACKAGE@', PROJECT_NAME)
+                content = content.replace('@LOG_LEVEL@', LOG_LEVEL)
+                content = content.replace('@LOG_FILE_SIZE@', LOG_FILE_SIZE)
+                if prefix is not None:
+                    content = content.replace(
+                        '@localedir@', os.path.join(prefix,
+                                                    'share', 'locale'))
+                    content = content.replace(
+                        '@libexecdir@', os.path.join(prefix,
+                                                     'lib', PROJECT_NAME))
+                out_file.write(content)
+
+
+class Install(DistUtilsExtra.auto.install_auto):
+    """Class to install proper files."""
+
+    def run(self):
+        """Do the install.
+
+        Read from *.service.in and generate .service files by replacing
+        @prefix@ by self.prefix.
+
+        """
+        # Get just the prefix value, without the root
+        prefix = self.install_data.replace(
+            self.root if self.root is not None else '', '')
+        replace_variables(SERVICE_FILES, prefix)
+        DistUtilsExtra.auto.install_auto.run(self)
+        # Replace the CLIENTDEFS paths here, so that we can do it directly in
+        # the installed copy, rather than the lcoal copy. This allows us to
+        # have a semi-generated version for use in tests, and a full version
+        # for use in installed systems.
+        with open(CLIENTDEFS) as in_file:
+            content = in_file.read()
+            with open(os.path.join(self.install_purelib,
+                                   PROJECT_NAME,
+                                   CLIENTDEFS), 'w') as out_file:
+                content = content.replace(
+                    '@localedir@', os.path.join(prefix, 'share', 'locale'))
+                content = content.replace(
+                    '@libexecdir@', os.path.join(prefix, 'lib', PROJECT_NAME))
+                out_file.write(content)
+
+
+class Build(build_extra.build_extra):
+    """Build PyQt (.ui) files and resources."""
+
+    description = "build PyQt GUIs (.ui) and resources (.qrc)"
+
+    def run(self):
+        """Execute the command."""
+        replace_variables(BUILD_FILES)
+        build_extra.build_extra.run(self)
+
+
+class Clean(DistUtilsExtra.auto.clean_build_tree):
+    """Class to clean up after the build."""
+
+    def run(self):
+        """Clean up the built files."""
+        for built_file in CLEANFILES:
+            if os.path.exists(built_file):
+                os.unlink(built_file)
+
+        DistUtilsExtra.auto.clean_build_tree.run(self)
+
+
+class BuildLocale(build_i18n.build_i18n):
+    """Workaround a bug in DistUtilsExtra."""
+
+    def run(self):
+        """Magic."""
+        build_i18n.build_i18n.run(self)
+        i = 0
+        for df in self.distribution.data_files:
+            if df[0].startswith('etc/xdg/'):
+                if sys.platform not in ('darwin', 'win32'):
+                    new_df = (df[0].replace('etc/xdg/', '/etc/xdg/'), df[1])
+                    self.distribution.data_files[i] = new_df
+                else:
+                    self.distribution.data_files.pop(i)
+            i += 1
+
+
+def set_py2exe_paths():
+    """Set the path so that py2exe finds the required modules."""
+    # Pylint does not understand same spaced imports
+    # pylint: disable=F0401
+    import win32com
+    # pylint: enable=F0401
+    try:
+        # pylint: disable=F0401
+        import py2exe.mf as modulefinder
+        # pylint: enable=F0401
+    except ImportError:
+        import modulefinder
+
+    # py2exe 0.6.4 introduced a replacement modulefinder.
+    # This means we have to add package paths there,
+    # not to the built-in one.  If this new modulefinder gets
+    # integrated into Python, then we might be able to revert
+    # this some day. If this doesn't work, try import modulefinder
+    for package_path in win32com.__path__[1:]:
+        modulefinder.AddPackagePath("win32com", package_path)
+    for extra_mod in ["win32com.server", "win32com.client"]:
+        __import__(extra_mod)
+        module = sys.modules[extra_mod]
+        for module_path in module.__path__[1:]:
+            modulefinder.AddPackagePath(extra_mod, module_path)
+
+
+# pylint: disable=C0103
+
+cmdclass = {
+    'install': Install,
+    'build': Build,
+    'clean': Clean,
+    'build_i18n': BuildLocale,
+}
+
+bin_scripts = [
+    'bin/u1sdtool',
+    'bin/ubuntuone-launch',
+]
+
+libexec_scripts = [
+    'bin/ubuntuone-login',
+    'bin/ubuntuone-proxy-tunnel',
+    'bin/ubuntuone-syncdaemon',
+]
+
+data_files = []
+scripts = []
+
+if sys.platform == 'win32':
+    set_py2exe_paths()
+    extra = {
+        'options': {
+            'py2exe': {
+                'bundle_files': 1,
+                'skip_archive': 0,
+                'optimize': 1,
+                'dll_excludes': ["mswsock.dll", "powrprof.dll"],
+            },
+        },
+        # add the console script so that py2exe compiles it
+        'console': bin_scripts + libexec_scripts,
+        'zipfile': None,
+    }
+else:
+    data_files.extend([
+        ('lib/%s' % PROJECT_NAME, libexec_scripts),
+        ('share/dbus-1/services', SERVICE_FILES),
+        ('/etc/xdg/ubuntuone', CONFIG_FILES + ['data/syncdaemon.conf']),
+        ('/etc/apport/crashdb.conf.d', ['data/ubuntuone-client-crashdb.conf']),
+        ('share/apport/package-hooks', ['data/source_ubuntuone-client.py']),
+        ('share/man1', ['docs/man/u1sdtool.1']),
+    ])
+    scripts.extend(bin_scripts)
+    extra = {}
+
+DistUtilsExtra.auto.setup(
+    name=PROJECT_NAME,
+    version=VERSION,
+    license='GPL v3',
+    author='Ubuntu One Developers',
+    author_email='[e-mail]',
+    description='Ubuntu One file synchronization client',
+    url='https://launchpad.net/%s' % PROJECT_NAME,
+    extra_path=PROJECT_NAME,
+    scripts=scripts,
+    data_files=data_files,
+    packages=find_packages(),
+    cmdclass=cmdclass,
+    **extra)

=== modified file 'ubuntuone/clientdefs.py.in'
--- ubuntuone/clientdefs.py.in	2012-04-09 20:07:05 +0000
+++ ubuntuone/clientdefs.py.in	2013-06-07 17:44:24 +0000
@@ -36,17 +36,9 @@
 
 import gettext
 
-
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
-# pylint: disable-msg=C0301
 VERSION = "@VERSION@"
 LOCALEDIR = "@localedir@"
 LIBEXECDIR = "@libexecdir@"
 GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"
-
-# these variables are Deprecated, use those defined in ubuntuone.credentials
-APP_NAME = "@SSO_APP_NAME@"
-TC_URL = "@SSO_TC_URL@"
-PING_URL = "@SSO_PING_URL@"
-DESCRIPTION = Q_("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one.")

=== removed directory 'windows'
=== removed file 'windows/clientdefs.py'
--- windows/clientdefs.py	2012-04-09 20:07:05 +0000
+++ windows/clientdefs.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# ubuntuone.clientdefs - Configure-time definitions
-#
-# Author: David Planella <[e-mail]>
-#
-# Copyright 2009-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""
-Ubuntu One client definitions.
-
-This is a package containing configure-time definitions for the Ubuntu One
-client.
-"""
-
-import gettext
-
-
-Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
-
-# pylint: disable-msg=C0301
-VERSION = '0.1'
-LOCALEDIR = ''
-LIBEXECDIR = ''
-GETTEXT_PACKAGE = ''
-
-# these variables are Deprecated, use those defined in ubuntuone.credentials
-APP_NAME="Ubuntu One"
-TC_URL="https://one.ubuntu.com/terms/"
-PING_URL="https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
-DESCRIPTION = Q_("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one.")

=== removed file 'windows/logging.conf'
--- windows/logging.conf	2011-08-24 16:24:01 +0000
+++ windows/logging.conf	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[logging]
-level.default = DEBUG
-level.parser = log_level
-level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE 
-    CRITICAL, FATAL)
-
-file_size.default = 1000000
-file_size.parser = int
-file_size.help = max file size (the file will be rotated)
-
-backup_count.default = 5
-backup_count.parser = int
-backup_count.help = number of rotated log files to keep around.