maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed building of .deb (docdir and description) 

- the new checkinstall --docdir=: syntax is used to avoid adding the name twice
- description-pak was not created and thus missing from package


git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@476 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
Patrick Ohly 2007-12-17 18:58:55 +00:00
parent 05e69f2569
commit d3ab8d6a9c
4 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -53,12 +53,12 @@ PKGS = $(addprefix syncevolution-evolution-, 2.0 2.2 2.4 2.6 2.8 2.10 2.12 2.14
# because any file created there will be excluded: that makes
# sense, because "make install" might create temporary files
# there. The current directory might be in /tmp, so use $HOME.
deb rpm : all doc-pak
deb rpm : all doc-pak description-pak
tmpdir=`mktemp -d $$HOME/syncevolution.XXXXXXXXXX` && \
trap "rm -rf $$tmpdir" EXIT && \
docdir="$(docdir)" && \
if [ ! "$$docdir" ]; then docdir="$(datadir)/doc/$(PACKAGE)"; fi && \
fakeroot checkinstall \
fakeroot checkinstall </dev/null \
$(TYPE_$@) \
$(REQUIRES_$@) \
--fstrans=yes \
@ -71,7 +71,7 @@ deb rpm : all doc-pak
--pkgsource='http://sourceforge.net/project/showfiles.php?group_id=146288' \
--pkgaltsource='http://www.estamos.de/projects/SyncML/' \
--pkggroup='gnome' \
--docdir=$$docdir $(MAKE) install
--docdir=":$$docdir" $(MAKE) install
doc-pak : README NEWS COPYING
mkdir $@

19
README
View File

@ -176,25 +176,6 @@ The <options> in front of the server name are:
Prints the SyncEvolution version.
Getting Started with ScheduleWorld
----------------------------------
- get a ScheduleWorld account
- create a configuration:
mkdir -p ~/.sync4j/evolution
cp -r <path to example configs>/scheduleworld ~/.sync4j/evolution/
- edit ~/.sync4j/evolution/scheduleworld/spds/syncml/config.txt,
set "username" and "password" (beware, avoid extra spaces at the line ends)
and choose a unique string for "deviceId";
optional: create a directory where SyncEvolution can store
backup files and a log during each synchronization, see
documentation of "logdir/maxlogdirs" for details
- edit ~/.sync4j/evolution/scheduleworld/spds/sources/*/config.txt,
set "evolutionsource" to the name or uri of your Evolution
database ("syncevolution" without parameter prints both for
each available database)
- synchronize with "syncevolution scheduleworld"
Configuration
-------------

3
etc/source-config.txt
View File

@ -28,10 +28,11 @@ syncModes = slow,two-way,refresh-from-client,refresh-from-server,one-way-from-cl
# first line acts as summary
# text/x-vcard = Evolution contact data in vCard 2.1 format
# (works with most servers)
# test/vcard = Evolution contact data in vCard 3.0 (RFC 2425) format
# text/vcard = Evolution contact data in vCard 3.0 (RFC 2425) format
# (internal format of Evolution, preferred with servers
# that support it and thus recommended for ScheduleWorld
# together with the "card3" uri)
# addressbook = Mac OS X or iPhone address book
#
# Sending and receiving items in the same format as used by the server for
# the uri selected below is essential. Errors while parsing and/or storing

18
test/runtests.py
View File

@ -309,7 +309,7 @@ class ClientCheckout(CVSCheckout):
# checkout/upgrade
CVSCheckout.execute(self)
#patch again
context.runCommand("patcher -A")
context.runCommand("echo $PATH; which patcher; patcher -A")
class AutotoolsBuild(Action):
@ -425,7 +425,11 @@ parser.add_option("", "--host",
help="platform identifier like x86_64-linux; if this and --openembedded is set, then cross-compilation is tested")
parser.add_option("", "--bin-suffix",
type="string", dest="binsuffix", default="",
help="string to append to binary distribution archive (default empty = no binary distribution built)")
help="string to append to name of binary .tar.gz distribution archive (default empty = no binary distribution built)")
parser.add_option("", "--package-suffix",
type="string", dest="packagesuffix", default="",
help="string to insert into package name (default empty = no binary distribution built)")
parser.add_option("", "--synthesis",
type="string", dest="synthesisdir", default="",
help="directory with Synthesis installation")
@ -498,22 +502,26 @@ if options.oedir and options.host:
context.add(cross)
class SyncEvolutionDist(AutotoolsBuild):
def __init__(self, name, binsuffix, binrunner, dependencies):
def __init__(self, name, binsuffix, packagesuffix, binrunner, dependencies):
"""Builds a normal and a binary distribution archive in a directory where
SyncEvolution was configured and compiled before.
"""
AutotoolsBuild.__init__(self, name, "", "", binrunner, dependencies)
self.binsuffix = binsuffix
self.packagesuffix = packagesuffix
def execute(self):
cd(self.builddir)
if self.packagesuffix:
context.runCommand("%s make BINSUFFIX=%s deb" % (self.runner, self.packagesuffix))
if self.binsuffix:
context.runCommand("%s make BINSUFFIX=%s distbin deb distcheck" % (self.runner, self.binsuffix))
context.runCommand("%s make BINSUFFIX=%s distbin distcheck" % (self.runner, self.binsuffix))
else:
context.runCommand("%s make distcheck" % (self.runner))
dist = SyncEvolutionDist("dist",
options.binsuffix,
options.packagesuffix,
options.shell,
[ compile.name ])
context.add(dist)
@ -553,7 +561,7 @@ class SynthesisTest(SyncEvolutionTest):
def __init__(self, name, build, synthesisdir, runner, testPrefix):
SyncEvolutionTest.__init__(self, name, build, "", # os.path.join(synthesisdir, "logs")
runner, [ "Client::Sync" ],
"CLIENT_TEST_SOURCES=vcard21 CLIENT_TEST_NUM_ITEMS=20 CLIENT_TEST_SERVER=synthesis CLIENT_TEST_DELAY=2",
"CLIENT_TEST_SOURCES=vcard21,text CLIENT_TEST_NUM_ITEMS=20 CLIENT_TEST_SERVER=synthesis CLIENT_TEST_DELAY=2",
testPrefix=testPrefix)
self.synthesisdir = synthesisdir
# self.dependencies.append(evolutiontest.name)