autoproj 1.4.3 → 1.4.4
Sign up to get free protection for your applications and to get access to all the features.
- data/History.txt +3 -0
- data/doc/guide/config.yaml +1 -2
- data/doc/guide/src/customization.page +8 -15
- data/doc/guide/src/default.css +4 -0
- data/doc/guide/src/error_messages.page +1 -1
- data/doc/guide/src/package_sets/autobuild.page +1 -1
- data/doc/guide/src/package_sets/osdeps.page +24 -24
- data/lib/autoproj/manifest.rb +1 -1
- data/lib/autoproj/version.rb +1 -1
- metadata +1 -1
data/History.txt
CHANGED
data/doc/guide/config.yaml
CHANGED
@@ -15,8 +15,6 @@
|
|
15
15
|
# The available configuration options can be listed using the `webgen config`
|
16
16
|
# command, for example: `webgen config sourcehandler` will list all options starting
|
17
17
|
# with sourcehandler.
|
18
|
-
default_processing_pipeline:
|
19
|
-
Page: tags,maruku,blocks
|
20
18
|
|
21
19
|
default_meta_info:
|
22
20
|
Webgen::SourceHandler::Page:
|
@@ -28,3 +26,4 @@ tag.breadcrumbtrail.omit_index_path: true
|
|
28
26
|
|
29
27
|
tag.coderay.line_numbers: false
|
30
28
|
tag.coderay.lang: ruby
|
29
|
+
|
@@ -11,8 +11,7 @@ The <tt>layout</tt> section of <tt>autoproj/manifest</tt> offers two things:
|
|
11
11
|
* build packages in specific subdirectories
|
12
12
|
|
13
13
|
This section lists packages or package sets that ought to be built by autoproj.
|
14
|
-
For instance, in the following example, only the <tt>orocos/rtt</tt> and
|
15
|
-
<tt>orocos/ocl</tt>
|
14
|
+
For instance, in the following example, only the <tt>orocos/rtt</tt> and <tt>orocos/ocl</tt>
|
16
15
|
packages of the rubim.orocos source will be built. The other will be excluded
|
17
16
|
from the build.
|
18
17
|
|
@@ -46,7 +45,7 @@ layout:
|
|
46
45
|
Configuration files like <tt>autoproj/manifest</tt> are YAML file. As such, they
|
47
46
|
aresensible to indentation. The snippet above should be read as: in the layout, there is first a "lib" part and second the packages whose names start with "orocos/" _(first level of indentation)_. In the "lib" part, the packages are "typelib", "utilmm"
|
48
47
|
and "utilrb" _(second level of indentation)_.
|
49
|
-
{.warning}
|
48
|
+
{: .warning}
|
50
49
|
|
51
50
|
Alternatively, the example above could be written:
|
52
51
|
{coderay:: yaml}
|
@@ -59,7 +58,7 @@ Finally, names of sublayouts can be used as arguments in the autoproj command
|
|
59
58
|
line, instead of package names:
|
60
59
|
|
61
60
|
autoproj build lib
|
62
|
-
{.commandline}
|
61
|
+
{: .commandline}
|
63
62
|
|
64
63
|
Removing packages from the build
|
65
64
|
--------------------------------
|
@@ -121,7 +120,7 @@ Building local packages
|
|
121
120
|
|
122
121
|
You can list local packages that are not in an imported package set by placing
|
123
122
|
the definitions in autoproj/, in a file ending with <tt>.autobuild</tt>. See [this
|
124
|
-
page](
|
123
|
+
page](package_sets/autobuild.html) for information on how to write autobuild files.
|
125
124
|
|
126
125
|
Setting up the path to specific commands (make, parallel builds)
|
127
126
|
----------------------------------------------------------------
|
@@ -178,18 +177,12 @@ layout:
|
|
178
177
|
If the command line is
|
179
178
|
|
180
179
|
autoproj build modules/logger
|
181
|
-
{.cmdline}
|
180
|
+
{: .cmdline}
|
182
181
|
|
183
|
-
then
|
184
|
-
modules/logger depends on modules/base -- but typelib will be left alone
|
185
|
-
_regardless of its state_. It may speed up the build process tremendously, but
|
186
|
-
also may generate errors if other packages needed to be updated.
|
187
|
-
|
188
|
-
Idem, if the command line is:
|
182
|
+
then modules/logger and its dependencies will be built. Idem, if the command line is:
|
189
183
|
|
190
184
|
autoproj build asguard
|
191
|
-
{.cmdline}
|
185
|
+
{: .cmdline}
|
192
186
|
|
193
|
-
then all packages or asguard/ are built
|
194
|
-
defined in other places in the layout_.
|
187
|
+
then all packages or asguard/ are built, including their dependencies
|
195
188
|
|
data/doc/guide/src/default.css
CHANGED
@@ -13,5 +13,5 @@ the packages that you requested to build. Two solutions: (i) the package should
|
|
13
13
|
*not* depend on it, and you should modify the [package's
|
14
14
|
manifest.xml](package_sets/manifest-xml.html) file. (ii)
|
15
15
|
the package should depend on it and you should list the OS package in [the
|
16
|
-
relevant osdeps file](osdeps.html)
|
16
|
+
relevant osdeps file](package_sets/osdeps.html)
|
17
17
|
|
@@ -120,7 +120,7 @@ pkg.depends_on "package_name"
|
|
120
120
|
{coderay}
|
121
121
|
|
122
122
|
In the same way, if the source package depends on an OS package (see
|
123
|
-
[Prepackaged dependencies](
|
123
|
+
[Prepackaged dependencies](osdeps.html) for details), you can use
|
124
124
|
|
125
125
|
{coderay:: ruby}
|
126
126
|
pkg.depends_on_os_package "package_name"
|
@@ -11,9 +11,9 @@ Defining dependencies between source packages and OS packages
|
|
11
11
|
|
12
12
|
These dependencies can be defined in two ways:
|
13
13
|
|
14
|
-
* by adding a
|
14
|
+
* by adding a `<osdep name="depname" />` tag in the package's
|
15
15
|
[manifest.xml](manifest-xml.html)
|
16
|
-
* by calling
|
16
|
+
* by calling `pkg.depends_on_os_package("depname")` [in the autobuild
|
17
17
|
file](autobuild.html).
|
18
18
|
|
19
19
|
In both cases, depname is used as a key to find the OS package definition in the
|
@@ -24,46 +24,46 @@ OS packages
|
|
24
24
|
|
25
25
|
The general format of the an OS package definition:
|
26
26
|
|
27
|
-
|
27
|
+
~~~~~~~~~~~~~~~~~~
|
28
28
|
name:
|
29
29
|
distribution1,distribution2:
|
30
30
|
version1,version2: [package_name1, package_name2]
|
31
|
-
|
31
|
+
~~~~~~~~~~~~~~~~~~
|
32
32
|
|
33
|
-
Where 'name' is the name used to declare the dependency (see above),
|
34
|
-
|
35
|
-
distribution's version, and <tt>package_name
|
33
|
+
Where 'name' is the name used to declare the dependency (see above), `distribution`
|
34
|
+
the name of the distribution and <tt>version</tt> the
|
35
|
+
distribution's version, and <tt>package_name</tt> the name of the package in
|
36
36
|
the underlying OS.
|
37
37
|
|
38
|
-
Since the osdeps file is a YAML file,
|
38
|
+
Since the osdeps file is a YAML file, it could also be written
|
39
39
|
|
40
|
-
|
40
|
+
~~~~~~~~~~~~~~~~~~
|
41
41
|
name:
|
42
42
|
distribution1,distribution2:
|
43
43
|
version1,version2:
|
44
44
|
- package_name1
|
45
45
|
- package_name2
|
46
|
-
|
46
|
+
~~~~~~~~~~~~~~~~~~
|
47
47
|
|
48
48
|
If only one package needs to be installed, one can use the shortcut
|
49
49
|
|
50
|
-
|
50
|
+
~~~~~~~~~~~~~~~~~~
|
51
51
|
name:
|
52
52
|
distribution1,distribution2:
|
53
53
|
version1,version2: package_name
|
54
|
-
|
54
|
+
~~~~~~~~~~~~~~~~~~
|
55
55
|
|
56
56
|
Finally, if the package name is version-independent, the version can be omitted:
|
57
57
|
|
58
58
|
|
59
|
-
|
59
|
+
~~~~~~~~~~~~~~~~~~
|
60
60
|
name:
|
61
61
|
distribution1,distribution2: package_name
|
62
|
-
|
62
|
+
~~~~~~~~~~~~~~~~~~
|
63
63
|
|
64
64
|
Examples:
|
65
65
|
|
66
|
-
|
66
|
+
~~~~~~~~~~~~~~~~~~
|
67
67
|
ruby:
|
68
68
|
debian,ubuntu:
|
69
69
|
9.04,10.04,sid: libruby-dev
|
@@ -73,7 +73,7 @@ boost:
|
|
73
73
|
- libboost-program1.38-dev
|
74
74
|
ubuntu:
|
75
75
|
9.04,10.04: libboost-dev
|
76
|
-
|
76
|
+
~~~~~~~~~~~~~~~~~~
|
77
77
|
|
78
78
|
At the time of this writing, autoproj is able to install packages on
|
79
79
|
Ubuntu/Debian and Gentoo. Support for other operating systems can be easily
|
@@ -87,37 +87,37 @@ to by replacing the OS distribution name by 'gem'.
|
|
87
87
|
|
88
88
|
Example:
|
89
89
|
|
90
|
-
|
90
|
+
~~~~~~~~~~~~~~~~~~
|
91
91
|
hoe:
|
92
92
|
gem:
|
93
93
|
hoe
|
94
|
-
|
94
|
+
~~~~~~~~~~~~~~~~~~
|
95
95
|
|
96
96
|
If the OS dep name and the RubyGems name are the same, one can use the shortcut
|
97
97
|
|
98
|
-
|
98
|
+
~~~~~~~~~~~~~~~~~~
|
99
99
|
hoe: gem
|
100
|
-
|
100
|
+
~~~~~~~~~~~~~~~~~~
|
101
101
|
|
102
102
|
Note that it is possible to use a mixture of RubyGems and OS packages. For
|
103
103
|
instance, the following snippet will both install the gnuplot package and the
|
104
104
|
gnuplot RubyGems whenever an osdep on 'gnuplot' is declared.
|
105
105
|
|
106
|
-
|
106
|
+
~~~~~~~~~~~~~~~~~~
|
107
107
|
gnuplot:
|
108
108
|
gem: gnuplot
|
109
109
|
debian: gnuplot
|
110
|
-
|
110
|
+
~~~~~~~~~~~~~~~~~~
|
111
111
|
|
112
112
|
Ignoring some dependencies
|
113
113
|
--------------------------
|
114
114
|
It is possible that, on some operating systems, a given package should simply be
|
115
115
|
ignored. To do so, simply use the 'ignore' keyword. Example:
|
116
116
|
|
117
|
-
|
117
|
+
~~~~~~~~~~~~~~~~~~
|
118
118
|
gnuplot:
|
119
119
|
gem: gnuplot
|
120
120
|
debian: ignore
|
121
121
|
ubuntu: gnuplot
|
122
|
-
|
122
|
+
~~~~~~~~~~~~~~~~~~
|
123
123
|
|
data/lib/autoproj/manifest.rb
CHANGED
@@ -897,7 +897,7 @@ module Autoproj
|
|
897
897
|
else
|
898
898
|
# No layout, all packages are selected
|
899
899
|
packages.values.
|
900
|
-
map { |pkg|
|
900
|
+
map { |pkg| pkg.autobuild.name }
|
901
901
|
end
|
902
902
|
names = names.delete_if { |pkg_name| excluded?(pkg_name) }
|
903
903
|
names.to_set
|
data/lib/autoproj/version.rb
CHANGED