Skip to content

Commit b23dc95

Browse files
bastianeicherapps.0install.net
bastianeicher
authored and
apps.0install.net
committed
Simplified 0install tool dependencies
1 parent 85e11c6 commit b23dc95

6 files changed

Lines changed: 177 additions & 278 deletions

File tree

‎0install/0publish.xml‎

Lines changed: 132 additions & 145 deletions
Large diffs are not rendered by default.

‎0install/0release.xml‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -231,40 +231,36 @@ can help you to create new releases easily.</description>
231231
<archive extract="0release-0.16" href="0release-0.16.tar.bz2" size="47898"/>
232232
</implementation>
233233
</group>
234-
<group main="0release">
235-
<requires interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
236-
<requires interface="https://apps.0install.net/0install/0repo.xml">
234+
235+
<group license="OSI Approved :: GNU Lesser General Public License (LGPL)">
236+
<command name="run" path="0release">
237+
<runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
238+
</command>
239+
<command name="test" path="tests/testall.py">
240+
<runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
241+
<executable-in-path name="0release"/>
242+
<requires interface="https://apps.0install.net/devel/make.xml">
243+
<executable-in-path name="make"/>
244+
</requires>
245+
</command>
246+
<requires interface="https://apps.0install.net/0install/0repo.xml" version="0.2..">
237247
<environment insert="." mode="replace" name="RELEASE_0REPO"/>
238-
<version not-before="0.2"/>
239248
</requires>
240-
<requires interface="https://apps.0install.net/0install/0publish.xml">
241-
<version not-before="0.17"/>
249+
<requires interface="https://apps.0install.net/0install/0publish.xml" version="0.17..">
242250
<environment if-0install-version="..!1.13" insert="0publish" mode="replace" name="ZI_PUBLISH"/>
243251
<executable-in-var name="ZI_PUBLISH"/>
244252
</requires>
245253
<requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.3.7..">
246254
<environment insert="" mode="replace" name="ZI_RELEASE_ZEROINSTALL"/>
247255
</requires>
248-
<requires interface="https://apps.0install.net/0install/0test.xml">
249-
<version not-before="0.4-post"/>
256+
<requires interface="https://apps.0install.net/0install/0test.xml" version="0.4-post..">
250257
<environment if-0install-version="..!1.13" insert="0test" mode="replace" name="ZI_TEST"/>
251258
<executable-in-var name="ZI_TEST"/>
252259
</requires>
253-
<requires interface="https://apps.0install.net/0install/0compile.xml">
254-
<version not-before="1.2"/>
260+
<requires interface="https://apps.0install.net/0install/0compile.xml" version="1.2..">
255261
<executable-in-var name="ZI_COMPILE"/>
256262
</requires>
257-
<command name="run" path="0release">
258-
<runner interface="https://apps.0install.net/python/python.xml"/>
259-
</command>
260-
<command name="test" path="tests/testall.py">
261-
<runner interface="https://apps.0install.net/python/python.xml"/>
262-
<executable-in-path name="0release"/>
263-
<requires interface="https://apps.0install.net/devel/make.xml">
264-
<executable-in-path name="make"/>
265-
</requires>
266-
</command>
267-
<implementation id="sha1new=cb5ed3155aca6b73173cc767c74e7221213aec90" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2020-01-17" stability="stable" version="0.17">
263+
<implementation id="sha1new=cb5ed3155aca6b73173cc767c74e7221213aec90" released="2020-01-17" stability="stable" version="0.17">
268264
<manifest-digest sha256new="VX4GQZTM3MPMEAICR7OC5ZUKKJY4E4I7H5LSIKFN7E6NB2DLRW6Q"/>
269265
<archive extract="0release-0.17" href="0release-0.17.tar.bz2" size="48081"/>
270266
</implementation>

‎0install/0repo.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,15 @@
136136
</group>
137137
</group>
138138
</group>
139-
<group>
140-
<requires interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
139+
140+
<group license="OSI Approved :: GNU Lesser General Public License (LGPL)">
141+
<command name="run" path="0repo.py">
142+
<runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
143+
</command>
144+
<command name="test" path="tests/runall.py">
145+
<runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
146+
<executable-in-path name="0repo"/>
147+
</command>
141148
<requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.3.8..">
142149
<environment insert="" mode="prepend" name="PYTHONPATH"/>
143150
</requires>
@@ -148,18 +155,11 @@
148155
<executable-in-path name="gpg"/>
149156
<executable-in-var name="GNUPG_PATH"/>
150157
</requires>
151-
<command name="run" path="0repo.py">
152-
<runner interface="https://apps.0install.net/python/python.xml"/>
153-
</command>
154-
<command name="test" path="tests/runall.py">
155-
<runner interface="https://apps.0install.net/python/python.xml"/>
156-
<executable-in-path name="0repo"/>
157-
</command>
158-
<implementation id="sha1new=a6cddf09966e1a58fe3956f868c1eb31f725d30a" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2020-01-15" stability="stable" version="0.11">
158+
<implementation id="sha1new=a6cddf09966e1a58fe3956f868c1eb31f725d30a" released="2020-01-15" stability="stable" version="0.11">
159159
<manifest-digest sha256new="ZIVRKJSQLU3WN6XS32DEOS6MST7PNM5QP6XS6WGIL7H37C4WXCPA"/>
160160
<archive extract="0repo-0.11" href="0repo-0.11.tar.bz2" size="60513"/>
161161
</implementation>
162-
<implementation id="sha1new=a1f086db322e1667028299c0785d7118d276b689" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2021-01-08" stability="stable" version="0.12">
162+
<implementation id="sha1new=a1f086db322e1667028299c0785d7118d276b689" released="2021-01-08" stability="stable" version="0.12">
163163
<manifest-digest sha256new="UEJWVNB6OVQ7QKQO3O4KL642GZRGGFTL2IJAJCETJENOBQMTDHAA"/>
164164
<archive extract="0repo-0.12" href="0repo-0.12.tar.bz2" size="60556"/>
165165
</implementation>

‎0install/0template.xml‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,62 +18,50 @@
1818
<command name="run" path="0template.py">
1919
<runner interface="https://apps.0install.net/python/python.xml"/>
2020
</command>
21-
2221
<command name="test" path="tests/test0template.py">
23-
<runner interface="https://apps.0install.net/python/python.xml"/>
22+
<runner interface="https://apps.0install.net/python/python.xml" version="2.7.."/>
2423
<executable-in-path name="0template"/>
2524
</command>
26-
27-
<requires interface="https://apps.0install.net/python/python.xml">
28-
<version not-before="2.7"/>
29-
</requires>
30-
31-
<requires interface="https://apps.0install.net/0install/0install-python.xml">
25+
<requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.0..">
3226
<environment insert="" mode="prepend" name="PYTHONPATH"/>
33-
<version not-before="2.0"/>
3427
</requires>
35-
3628
<implementation id="sha1new=dec3cbacde62afc57cca4c111b4a85ba3f030df3" released="2013-03-09" stability="stable" version="0.1">
3729
<manifest-digest sha256new="TPC5QVL4RVSCQ43OPTG6NMMFFNY6CW4FXCIMTAPWSYSNB2HC6DKQ"/>
3830
<archive extract="0template-0.1" href="http://downloads.sourceforge.net/project/zero-install/0template/0.1/0template-0.1.tar.bz2" size="14210"/>
3931
</implementation>
4032
</group>
4133

42-
<group>
43-
<requires interface="https://apps.0install.net/python/python.xml">
44-
<version not-before="2.7"/>
45-
</requires>
46-
<requires interface="https://apps.0install.net/0install/0install-python.xml">
34+
<group license="OSI Approved :: GNU Lesser General Public License (LGPL)">
35+
<command name="run" path="0template.py">
36+
<runner interface="https://apps.0install.net/python/python.xml"/>
37+
</command>
38+
<command name="test" path="tests/test0template.py">
39+
<runner interface="https://apps.0install.net/python/python.xml" version="2.7.." />
40+
<executable-in-path name="0template"/>
41+
</command>
42+
<requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.2-post..">
4743
<environment insert="" mode="prepend" name="PYTHONPATH"/>
48-
<version not-before="2.2-post"/>
4944
</requires>
5045
<requires interface="https://apps.0install.net/0install/0publish-win.xml" os="Windows">
5146
<executable-in-var command="0publish" name="0TEMPLATE_EXTERNAL_TOOL"/>
5247
</requires>
53-
<command name="test" path="tests/test0template.py">
54-
<runner interface="https://apps.0install.net/python/python.xml"/>
55-
<executable-in-path name="0template"/>
56-
</command>
57-
<command name="run" path="0template.py">
58-
<runner interface="https://apps.0install.net/python/python.xml"/>
59-
</command>
60-
<implementation id="sha1new=f88e42082640316608fc28be303521fc0692573e" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2014-09-02" stability="stable" version="0.2">
48+
<implementation id="sha1new=f88e42082640316608fc28be303521fc0692573e" released="2014-09-02" stability="stable" version="0.2">
6149
<manifest-digest sha256new="ERLRSPYBXSOGULSDGW56DUSFZ2DELXOG7JSTAZP6W2UX3NYRQOXQ"/>
6250
<archive extract="0template-0.2" href="0template-0.2.tar.bz2" size="15294"/>
6351
</implementation>
64-
<implementation id="sha1new=3c1cf27d0c25a878cda5a47faed64c8fe5b07dc8" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2015-08-13" stability="stable" version="0.3">
52+
<implementation id="sha1new=3c1cf27d0c25a878cda5a47faed64c8fe5b07dc8" released="2015-08-13" stability="stable" version="0.3">
6553
<manifest-digest sha256new="YMMDCPWXMW3XTYDX6BIFXSBMZ5WTQV6CIKEZ3QVQ4EDV6NJ4N36A"/>
6654
<archive extract="0template-0.3" href="0template-0.3.tar.bz2" size="15513"/>
6755
</implementation>
68-
<implementation id="sha1new=077fb1eb8f805d72a7c8e49dde422ab4fe0a4001" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2017-05-14" stability="stable" version="0.4">
56+
<implementation id="sha1new=077fb1eb8f805d72a7c8e49dde422ab4fe0a4001" released="2017-05-14" stability="stable" version="0.4">
6957
<manifest-digest sha256new="XPGVWCMI33FL44HCWMQUXVX3ZSWL427RHIVY3KLCGNV3ERDYENNA"/>
7058
<archive extract="0template-0.4" href="0template-0.4.tar.bz2" size="17107"/>
7159
</implementation>
72-
<implementation id="sha1new=01c9dfc0fc41c920b4213ff11e8a376a3236909c" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2017-07-30" stability="stable" version="0.5">
60+
<implementation id="sha1new=01c9dfc0fc41c920b4213ff11e8a376a3236909c" released="2017-07-30" stability="stable" version="0.5">
7361
<manifest-digest sha256new="PN4O6HVQQ4YV7SBXFOKGJ6T3BSCJ33VTWYZAXZKDO7LD36TCTUNQ"/>
7462
<archive extract="0template-0.5" href="0template-0.5.tar.bz2" size="17556"/>
7563
</implementation>
76-
<implementation id="sha1new=03a80899236770b139c3c4be1d2255e4644a1a32" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2018-11-17" stability="stable" version="0.6">
64+
<implementation id="sha1new=03a80899236770b139c3c4be1d2255e4644a1a32" released="2018-11-17" stability="stable" version="0.6">
7765
<manifest-digest sha256new="GHJMUQA4THAAAG62R4R55U2CLFGHNVIRH2TTBLKYH4SKBMZF7JPQ"/>
7866
<archive extract="0template-0.6" href="0template-0.6.tar.bz2" size="17585"/>
7967
</implementation>

‎0watch-windows.xml.selections‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎watch.ps1‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ foreach ($file in (ls -Recurse -Filter *.watch.py).FullName) {
88
$header = Get-Content $file -TotalCount 1
99
if (($header -eq "#os=Windows") -or (-not $header.StartsWith("#os="))) {
1010
echo $file
11-
#.\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
12-
.\0install.ps1 run --batch 0watch-windows.xml.selections --output ..\incoming $file
11+
.\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
1312
if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
1413
}
1514
}

0 commit comments

Comments
 (0)