1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
Wibble repositories
===================
There are two darcs repositories for wibble:
- http://people.debian.org/~enrico/wibble/standalone
- http://people.debian.org/~enrico/wibble/embeddable
Standalone contains the whole wibble package, including the toplevel cmake and
autotools configuration and debian and fedora packaging. It is used to build
the wibble development library.
Embeddable contains only the wibble/ directory and can be used to embed wibble
into other source directories: that way you can use wibble code without adding
a build dependency.
Using embedded wibble
=====================
With autotools
--------------
You can embed wibble in an autotools project, following these instructions:
1. add wibble to SUBDIRS in Makefile.am
2. add AM_CONFIG_HEADER(wibble/config.h) to configure.ac
3. you can use the gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE autoconf macro from
gnulib to define HAVE_STRUCT_DIRENT_D_TYPE: this will enable a faster
implementation of sys::fs::Directory::isdir on systems that support it
Without darcs
-------------
Create a new project of yours (assuming you do not want to use darcs):
mkdir my-project
cd my-project
git/bzr/hg/svn... init
mkdir src
vi src/main.c
git/bzr/hg/svn... commit changes
At some point you realise you need to embed wibble:
darcs init
darcs pull http://people.debian.org/~enrico/wibble/embeddable
Now you plug wibble/ into your build system, be it autotools or
cmake, and you're done.
Someone made changes to wibble that you would like to pull:
darcs pull http://people.debian.org/~enrico/wibble/embeddable
If you instead make changes to wibble, you can record them with darcs and
others can pull from you.
With darcs
----------
However, if your project is managed by darcs, the sequence is a
little different:
mkdir my-project
cd my-project
darcs init
mkdir src
vi src/main.c
darcs add -r src
darcs record
...
Now you want wibble, and under assumption, that your repository
never contained a directory called "wibble", you can do this:
darcs pull http://people.debian.org/~enrico/wibble/embeddable
At which point, the both repositories will be combined into a single
one, with patches from both. This is fine with darcs, since the
patches do not conflict. This way, people using your repository will
never need to worry about wibble, since you can integrate it on
buildsystem level as well, and it becomes natural part of both your
repository and source tree. When you need to update wibble in your
source tree, you again just issue
darcs pull http://people.debian.org/~enrico/wibble/embeddable
And the missing changes to wibble will be brought into your copy.
Note: If you have (or had at some point in the past) some sort of
wibble/ subdirectory already in your darcs repository, this will lead
to conflicts. I do not know how well things will turn out, it may be
that it will work, it may be it won't. But since you usually know
pretty soon that you want wibble, and using a directory name "wibble"
for your own stuff is unlikely anyway, i do not expect this to be a
problem.
Standalone wibble
=================
The standalone wibble is just like any other standalone project that embeds
wibble, pulling changes from embeddable.
|
