Simplified 0install tool dependencies

0install · Mar 27, 2021 · b23dc95 · b23dc95
1 parent 85e11c6
commit b23dc95
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 278 deletions.
diff --git a/0install/0publish.xml b/0install/0publish.xml
diff --git a/0install/0release.xml b/0install/0release.xml
@@ -231,40 +231,36 @@ can help you to create new releases easily.</description>
       <archive extract="0release-0.16" href="0release-0.16.tar.bz2" size="47898"/>
     </implementation>
   </group>
-  <group main="0release">
-    <requires interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
-    <requires interface="https://apps.0install.net/0install/0repo.xml">
+
+  <group license="OSI Approved :: GNU Lesser General Public License (LGPL)">
+    <command name="run" path="0release">
+      <runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
+    </command>
+    <command name="test" path="tests/testall.py">
+      <runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
+      <executable-in-path name="0release"/>
+      <requires interface="https://apps.0install.net/devel/make.xml">
+        <executable-in-path name="make"/>
+      </requires>
+    </command>
+    <requires interface="https://apps.0install.net/0install/0repo.xml" version="0.2..">
       <environment insert="." mode="replace" name="RELEASE_0REPO"/>
-      <version not-before="0.2"/>
     </requires>
-    <requires interface="https://apps.0install.net/0install/0publish.xml">
-      <version not-before="0.17"/>
+    <requires interface="https://apps.0install.net/0install/0publish.xml" version="0.17..">
       <environment if-0install-version="..!1.13" insert="0publish" mode="replace" name="ZI_PUBLISH"/>
       <executable-in-var name="ZI_PUBLISH"/>
     </requires>
     <requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.3.7..">
       <environment insert="" mode="replace" name="ZI_RELEASE_ZEROINSTALL"/>
     </requires>
-    <requires interface="https://apps.0install.net/0install/0test.xml">
-      <version not-before="0.4-post"/>
+    <requires interface="https://apps.0install.net/0install/0test.xml" version="0.4-post..">
       <environment if-0install-version="..!1.13" insert="0test" mode="replace" name="ZI_TEST"/>
       <executable-in-var name="ZI_TEST"/>
     </requires>
-    <requires interface="https://apps.0install.net/0install/0compile.xml">
-      <version not-before="1.2"/>
+    <requires interface="https://apps.0install.net/0install/0compile.xml" version="1.2..">
       <executable-in-var name="ZI_COMPILE"/>
     </requires>
-    <command name="run" path="0release">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
-    </command>
-    <command name="test" path="tests/testall.py">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
-      <executable-in-path name="0release"/>
-      <requires interface="https://apps.0install.net/devel/make.xml">
-        <executable-in-path name="make"/>
-      </requires>
-    </command>
-    <implementation id="sha1new=cb5ed3155aca6b73173cc767c74e7221213aec90" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2020-01-17" stability="stable" version="0.17">
+    <implementation id="sha1new=cb5ed3155aca6b73173cc767c74e7221213aec90" released="2020-01-17" stability="stable" version="0.17">
       <manifest-digest sha256new="VX4GQZTM3MPMEAICR7OC5ZUKKJY4E4I7H5LSIKFN7E6NB2DLRW6Q"/>
       <archive extract="0release-0.17" href="0release-0.17.tar.bz2" size="48081"/>
     </implementation>

diff --git a/0install/0repo.xml b/0install/0repo.xml
@@ -136,8 +136,15 @@
       </group>
     </group>
   </group>
-  <group>
-    <requires interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
+
+  <group license="OSI Approved :: GNU Lesser General Public License (LGPL)">
+    <command name="run" path="0repo.py">
+      <runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
+    </command>
+    <command name="test" path="tests/runall.py">
+      <runner interface="https://apps.0install.net/python/python.xml" version="3.6.."/>
+      <executable-in-path name="0repo"/>
+    </command>
     <requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.3.8..">
       <environment insert="" mode="prepend" name="PYTHONPATH"/>
     </requires>
@@ -148,18 +155,11 @@
       <executable-in-path name="gpg"/>
       <executable-in-var name="GNUPG_PATH"/>
     </requires>
-    <command name="run" path="0repo.py">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
-    </command>
-    <command name="test" path="tests/runall.py">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
-      <executable-in-path name="0repo"/>
-    </command>
-    <implementation id="sha1new=a6cddf09966e1a58fe3956f868c1eb31f725d30a" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2020-01-15" stability="stable" version="0.11">
+    <implementation id="sha1new=a6cddf09966e1a58fe3956f868c1eb31f725d30a" released="2020-01-15" stability="stable" version="0.11">
       <manifest-digest sha256new="ZIVRKJSQLU3WN6XS32DEOS6MST7PNM5QP6XS6WGIL7H37C4WXCPA"/>
       <archive extract="0repo-0.11" href="0repo-0.11.tar.bz2" size="60513"/>
     </implementation>
-    <implementation id="sha1new=a1f086db322e1667028299c0785d7118d276b689" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2021-01-08" stability="stable" version="0.12">
+    <implementation id="sha1new=a1f086db322e1667028299c0785d7118d276b689" released="2021-01-08" stability="stable" version="0.12">
       <manifest-digest sha256new="UEJWVNB6OVQ7QKQO3O4KL642GZRGGFTL2IJAJCETJENOBQMTDHAA"/>
       <archive extract="0repo-0.12" href="0repo-0.12.tar.bz2" size="60556"/>
     </implementation>

diff --git a/0install/0template.xml b/0install/0template.xml
@@ -18,62 +18,50 @@
     <command name="run" path="0template.py">
       <runner interface="https://apps.0install.net/python/python.xml"/>
     </command>
-
     <command name="test" path="tests/test0template.py">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
+      <runner interface="https://apps.0install.net/python/python.xml" version="2.7.."/>
       <executable-in-path name="0template"/>
     </command>
-
-    <requires interface="https://apps.0install.net/python/python.xml">
-      <version not-before="2.7"/>
-    </requires>
-
-    <requires interface="https://apps.0install.net/0install/0install-python.xml">
+    <requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.0..">
       <environment insert="" mode="prepend" name="PYTHONPATH"/>
-      <version not-before="2.0"/>
     </requires>
-
     <implementation id="sha1new=dec3cbacde62afc57cca4c111b4a85ba3f030df3" released="2013-03-09" stability="stable" version="0.1">
       <manifest-digest sha256new="TPC5QVL4RVSCQ43OPTG6NMMFFNY6CW4FXCIMTAPWSYSNB2HC6DKQ"/>
       <archive extract="0template-0.1" href="http://downloads.sourceforge.net/project/zero-install/0template/0.1/0template-0.1.tar.bz2" size="14210"/>
     </implementation>
   </group>
 
-  <group>
-    <requires interface="https://apps.0install.net/python/python.xml">
-      <version not-before="2.7"/>
-    </requires>
-    <requires interface="https://apps.0install.net/0install/0install-python.xml">
+  <group license="OSI Approved :: GNU Lesser General Public License (LGPL)">
+    <command name="run" path="0template.py">
+      <runner interface="https://apps.0install.net/python/python.xml"/>
+    </command>
+    <command name="test" path="tests/test0template.py">
+      <runner interface="https://apps.0install.net/python/python.xml" version="2.7.." />
+      <executable-in-path name="0template"/>
+    </command>
+    <requires interface="https://apps.0install.net/0install/0install-python.xml" version="2.2-post..">
       <environment insert="" mode="prepend" name="PYTHONPATH"/>
-      <version not-before="2.2-post"/>
     </requires>
     <requires interface="https://apps.0install.net/0install/0publish-win.xml" os="Windows">
       <executable-in-var command="0publish" name="0TEMPLATE_EXTERNAL_TOOL"/>
     </requires>
-    <command name="test" path="tests/test0template.py">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
-      <executable-in-path name="0template"/>
-    </command>
-    <command name="run" path="0template.py">
-      <runner interface="https://apps.0install.net/python/python.xml"/>
-    </command>
-    <implementation id="sha1new=f88e42082640316608fc28be303521fc0692573e" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2014-09-02" stability="stable" version="0.2">
+    <implementation id="sha1new=f88e42082640316608fc28be303521fc0692573e" released="2014-09-02" stability="stable" version="0.2">
       <manifest-digest sha256new="ERLRSPYBXSOGULSDGW56DUSFZ2DELXOG7JSTAZP6W2UX3NYRQOXQ"/>
       <archive extract="0template-0.2" href="0template-0.2.tar.bz2" size="15294"/>
     </implementation>
-    <implementation id="sha1new=3c1cf27d0c25a878cda5a47faed64c8fe5b07dc8" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2015-08-13" stability="stable" version="0.3">
+    <implementation id="sha1new=3c1cf27d0c25a878cda5a47faed64c8fe5b07dc8" released="2015-08-13" stability="stable" version="0.3">
       <manifest-digest sha256new="YMMDCPWXMW3XTYDX6BIFXSBMZ5WTQV6CIKEZ3QVQ4EDV6NJ4N36A"/>
       <archive extract="0template-0.3" href="0template-0.3.tar.bz2" size="15513"/>
     </implementation>
-    <implementation id="sha1new=077fb1eb8f805d72a7c8e49dde422ab4fe0a4001" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2017-05-14" stability="stable" version="0.4">
+    <implementation id="sha1new=077fb1eb8f805d72a7c8e49dde422ab4fe0a4001" released="2017-05-14" stability="stable" version="0.4">
       <manifest-digest sha256new="XPGVWCMI33FL44HCWMQUXVX3ZSWL427RHIVY3KLCGNV3ERDYENNA"/>
       <archive extract="0template-0.4" href="0template-0.4.tar.bz2" size="17107"/>
     </implementation>
-    <implementation id="sha1new=01c9dfc0fc41c920b4213ff11e8a376a3236909c" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2017-07-30" stability="stable" version="0.5">
+    <implementation id="sha1new=01c9dfc0fc41c920b4213ff11e8a376a3236909c" released="2017-07-30" stability="stable" version="0.5">
       <manifest-digest sha256new="PN4O6HVQQ4YV7SBXFOKGJ6T3BSCJ33VTWYZAXZKDO7LD36TCTUNQ"/>
       <archive extract="0template-0.5" href="0template-0.5.tar.bz2" size="17556"/>
     </implementation>
-    <implementation id="sha1new=03a80899236770b139c3c4be1d2255e4644a1a32" license="OSI Approved :: GNU Lesser General Public License (LGPL)" released="2018-11-17" stability="stable" version="0.6">
+    <implementation id="sha1new=03a80899236770b139c3c4be1d2255e4644a1a32" released="2018-11-17" stability="stable" version="0.6">
       <manifest-digest sha256new="GHJMUQA4THAAAG62R4R55U2CLFGHNVIRH2TTBLKYH4SKBMZF7JPQ"/>
       <archive extract="0template-0.6" href="0template-0.6.tar.bz2" size="17585"/>
     </implementation>

diff --git a/0watch-windows.xml.selections b/0watch-windows.xml.selections
diff --git a/watch.ps1 b/watch.ps1
@@ -8,8 +8,7 @@ foreach ($file in (ls -Recurse -Filter *.watch.py).FullName) {
     $header = Get-Content $file -TotalCount 1
     if (($header -eq "#os=Windows") -or (-not $header.StartsWith("#os="))) {
         echo $file
-        #.\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
-        .\0install.ps1 run --batch 0watch-windows.xml.selections --output ..\incoming $file
+        .\0install.ps1 run --batch https://apps.0install.net/0install/0watch.xml --output ..\incoming $file
         if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
     }
 }