Fetch libraries in distributions from their respective packages instead of from bundle-complete

Cloogle @ 3ba4b669

-Subproject commit ca9400768dbd5fa30991f9eb50fb2ea4952915f0
+Subproject commit 3ba4b6698a71e66aabbc8a2a065f5de8f8d57378

libs.json

@@ -3,40 +3,40 @@
 	[
 		{
 			"name": "Dynamics",
-			"fetch_url": ["CleanDistribution", "Dynamics"],
+			"fetch_url": ["CleanDistribution", "Dynamics", ["linux-x64","lib-dynamics"]],
 			"info_url": "https://cloogle.org/doc/#CleanRep.2.2_10.htm;jump=_Toc311798075"
 		},
 		{
 			"name": "Gast",
-			"fetch_url": ["CleanDistribution", "Gast"],
+			"fetch_url": ["CleanDistribution", "Gast", ["linux-x64","lib-gast"]],
 			"info_url": "https://gitlab.science.ru.nl/clean-and-itasks/gast"
 		},
 		{
 			"name": "GraphCopy",
-			"fetch_url": ["CleanDistribution", "GraphCopy"],
+			"fetch_url": ["CleanDistribution", "GraphCopy", ["linux-x64","lib-graphcopy"]],
 			"info_url": "https://gitlab.science.ru.nl/clean-and-itasks/clean-graph-copy"
 		},
 		{
 			"name": "iTasks",
-			"fetch_url": ["CleanDistribution", "iTasks"],
+			"fetch_url": ["CleanDistribution", "iTasks", ["linux-x64","lib-itasks"]],
 			"info_url": "https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK"
 		},
 		{
 			"name": "ObjectIO",
-			"fetch_url": ["SVN", "https://svn.cs.ru.nl/repos/clean-libraries"],
+			"fetch_url": ["CleanDistribution", "ObjectIO", ["windows-x64","lib-objectio"]],
 			"info_url": "https://clean.cs.ru.nl/Object_I/O",
-			"path": "trunk/Libraries/ObjectIO/ObjectIO",
+			"pattern_exclude": [["PStartsWith","OS Linux"], ["PStartsWith","OS Mac Carbon"]],
 			"pattern_core": [["PNot",["PStartsWith","Std"]]]
 		},
 		{
 			"name": "Platform",
-			"fetch_url": ["CleanDistribution", "Platform"],
+			"fetch_url": ["CleanDistribution", "Platform", ["linux-x64","lib-platform"]],
 			"info_url": "https://gitlab.science.ru.nl/clean-and-itasks/clean-platform",
 			"pattern_exclude": [["PStartsWith","Deprecated"]]
 		},
 		{
 			"name": "Sapl",
-			"fetch_url": ["CleanDistribution", "Sapl"],
+			"fetch_url": ["CleanDistribution", "Sapl", ["linux-x64","lib-sapl"]],
 			"info_url": "https://gitlab.science.ru.nl/clean-and-itasks/clean-sapl"
 		},
 		{
@@ -47,7 +47,7 @@
 		},
 		{
 			"name": "TCPIP",
-			"fetch_url": ["CleanDistribution", "TCPIP"],
+			"fetch_url": ["CleanDistribution", "TCPIP", ["linux-x64","lib-tcpip"]],
 			"info_url": "https://clean.cs.ru.nl/TCP"
 		}
 	],
@@ -55,7 +55,7 @@
 	[
 		{
 			"name": "ArgEnv",
-			"fetch_url": ["CleanDistribution", "ArgEnv"],
+			"fetch_url": ["CleanDistribution", "ArgEnv", ["linux-x64","lib-argenv"]],
 			"info_url": "https://svn.cs.ru.nl/repos/clean-libraries/trunk/Libraries/ArgEnvUnix/"
 		},
 		{
@@ -86,7 +86,7 @@
 		},
 		{
 			"name": "Directory",
-			"fetch_url": ["CleanDistribution", "Directory"],
+			"fetch_url": ["CleanDistribution", "Directory", ["linux-x64","lib-directory"]],
 			"info_url": "https://svn.cs.ru.nl/repos/clean-libraries/trunk/Libraries/Directory/"
 		},
 		{
@@ -102,7 +102,7 @@
 		},
 		{
 			"name": "StdLib",
-			"fetch_url": ["CleanDistribution", "StdLib"],
+			"fetch_url": ["CleanDistribution", "StdLib", ["linux-x64","lib-stdlib"]],
 			"info_url": "http://clean.cs.ru.nl/StdLib"
 		}
 	],

util/fetch_libs.sh

@@ -10,21 +10,21 @@ DEST="$1"
 
 rm -rf "$DEST"
 mkdir -p "$DEST"
-# Fetch Clean distribution
-curl -sSL https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz |\
-	tar -xz --exclude=exe -C "$DEST" --strip-components=2 clean-bundle-complete/lib
 
-exec 5< <(jq '.[]' < libs.json | jq '.[]' | jq -cMr '.name,.fetch_url[0,1],.path')
+exec 5< <(jq '.[]' < libs.json | jq '.[]' | jq -cMr '.name,.fetch_url[0,1],.fetch_url[2][0,1],.path')
 
 while read lib <&5
 do
 	read fetch_method <&5
 	read fetch_url <&5
+	read platform <&5
+	read distribution <&5
 	read path <&5
 
+	rm -rf "$DEST/$lib"
+
 	case "$fetch_method" in
 		"SVN")
-			rm -rf "$DEST/$lib"
 			if [[ "$path" == "null" ]]; then
 				echo "Fetching $fetch_url..."
 				svn checkout -q "$fetch_url" "$DEST/$lib"
@@ -34,7 +34,6 @@ do
 			fi
 			;;
 		"Git")
-			rm -rf "$DEST/$lib"
 			if [[ "$path" == "null" ]]; then
 				echo "Fetching $fetch_url..."
 				git clone -q "$fetch_url" "$DEST/$lib"
@@ -46,6 +45,19 @@ do
 			fi
 			;;
 		"CleanDistribution")
+			if [[ "$platform" == windows* ]]; then
+				URL="https://ftp.cs.ru.nl/Clean/builds/$platform/clean-$distribution-$platform-latest.zip"
+				curl -sSL "$URL" -o temp.zip
+				unzip -q -d "$DEST" temp.zip "clean-$distribution/Libraries/*"
+				rm temp.zip
+				mv "$DEST/clean-$distribution/Libraries"/* "$DEST"
+				rmdir "$DEST/clean-$distribution/Libraries"
+				rmdir "$DEST/clean-$distribution"
+			else
+				URL="https://ftp.cs.ru.nl/Clean/builds/$platform/clean-$distribution-$platform-latest.tgz"
+				echo "Fetching $URL..."
+				curl -sSL "$URL" | tar xz --exclude=exe -C "$DEST" --strip-components=2 "clean-$distribution/lib"
+			fi
 			;;
 		*)
 			echo "Unknown fetch method '$fetch_method'"