Merge remote-tracking branch 'upstream/development' into client-serve…

…r-hashing

Earthfile

@@ -214,10 +214,19 @@ run.n:
     COPY .git .git
     COPY src src
     COPY hx3compat hx3compat
-    COPY client.hxml haxelib.json .
+    COPY client.hxml each.hxml haxelib.json .
     RUN haxe client.hxml
     SAVE ARTIFACT run.n AS LOCAL run.n
 
+haxelib-binary:
+    FROM +devcontainer
+    COPY .git .git
+    COPY src src
+    COPY hx3compat hx3compat
+    COPY client_cpp.hxml each.hxml haxelib.json .
+    RUN haxe client_cpp.hxml
+    SAVE ARTIFACT haxelib AS LOCAL haxelib
+
 package-haxelib:
     FROM +devcontainer-base
     COPY src src
@@ -379,7 +388,7 @@ haxelib-server-builder:
 
 haxelib-server-legacy:
     FROM +haxelib-server-builder
-    COPY server_legacy.hxml server_each.hxml .
+    COPY server_legacy.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     COPY www/legacy www/legacy
@@ -388,7 +397,7 @@ haxelib-server-legacy:
 
 haxelib-server-website:
     FROM +haxelib-server-builder
-    COPY server_website.hxml server_each.hxml .
+    COPY server_website.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     RUN haxe server_website.hxml
@@ -402,15 +411,15 @@ haxelib-server-website-highlighter:
 
 haxelib-server-tasks:
     FROM +haxelib-server-builder
-    COPY server_tasks.hxml server_each.hxml .
+    COPY server_tasks.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     RUN haxe server_tasks.hxml
     SAVE ARTIFACT www/tasks.n
 
 haxelib-server-api:
     FROM +haxelib-server-builder
-    COPY server_api.hxml server_each.hxml .
+    COPY server_api.hxml server_each.hxml each.hxml .
     COPY src src
     COPY hx3compat hx3compat
     RUN haxe server_api.hxml
@@ -550,6 +559,7 @@ ci-tests:
     # for package.hxml
     COPY haxelib.json README.md .
     COPY +run.n/run.n .
+    COPY +haxelib-binary/haxelib .
 
     COPY +ci-runner/ci.n bin/ci.n
     ENV HAXELIB_SERVER=localhost

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2005-2024 Haxe Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

client.hxml

@@ -1,6 +1,3 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+each.hxml
 -neko run.n
 -main haxelib.client.Main

client_cpp.hxml

@@ -0,0 +1,6 @@
+each.hxml
+--cpp bin/cpp
+--main haxelib.client.Main
+-D destination=../../haxelib{EXESUFFIX}
+--dce full
+-D analyzer-optimize

client_legacy.hxml

@@ -1,6 +1,3 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+each.hxml
 -neko bin/legacyhaxelib.n
 -main legacyhaxelib.Main

client_tests.hxml

@@ -1,8 +1,5 @@
--p src
+each.hxml
 -p test
--p hx3compat/std
--p hx4compat/std
--p crypto/src
 --main HaxelibTests
 --debug
 --neko bin/test.n

each.hxml

@@ -0,0 +1,4 @@
+-cp src
+-cp hx3compat/std
+-cp hx4compat/std
+-cp crypto/src

integration_tests.hxml

@@ -1,8 +1,5 @@
--cp src
--cp test
--cp hx4compat/std
--cp crypto/src
--lib hx3compat
+each.hxml
+-p test
 -lib record-macros
 -lib argon2
 -main IntegrationTests

libs.hxml

@@ -29,5 +29,6 @@
 -cmd curl -sSLk https://lib.haxe.org/files/3.0/ufront-2,0,0.zip -o haxelib_global/ufront.zip && neko run.n install --always --skip-dependencies haxelib_global/ufront.zip
 -cmd curl -sSLk https://lib.haxe.org/files/3.0/utest-1,9,6.zip -o haxelib_global/utest.zip && neko run.n install --always --skip-dependencies haxelib_global/utest.zip
 -cmd curl -sSLk https://lib.haxe.org/files/3.0/hxnodejs-12,1,0.zip -o haxelib_global/hxnodejs.zip && neko run.n install --always --skip-dependencies haxelib_global/hxnodejs.zip
+-cmd curl -sSLk https://lib.haxe.org/files/3.0/hxcpp-4,3,2.zip -o haxelib_global/hxcpp.zip && neko run.n install --always --skip-dependencies haxelib_global/hxcpp.zip
 -cmd neko run.n dev record-macros lib/record-macros
 -cmd neko run.n dev argon2 lib/argon2

package.hxml

@@ -1,5 +1,2 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+-p src
 --run Package

server_each.hxml

@@ -1,7 +1,4 @@
--cp src
--cp hx3compat/std
--cp hx4compat/std
--cp crypto/src
+each.hxml
 -lib ufront
 -lib ufront-mail:1.0.0-rc.4
 -lib ufront-ufadmin

server_gitrepo.hxml

@@ -1,9 +1,6 @@
---class-path src
+each.hxml
 --class-path lib/dts2hx-generated
 --class-path lib/node-sys-db
---class-path hx3compat/std
---class-path hx4compat/std
---class-path crypto/src
 --library hxnodejs
 --library record-macros
 --js gitrepo.js

server_legacy.hxml

@@ -1,5 +1,4 @@
 server_each.hxml
--cp src
 -neko www/legacy/index.n
 -main legacyhaxelib.Site
 -lib hx2compat

src/Package.hx

@@ -5,7 +5,6 @@ import haxe.zip.Tools;
 
 import sys.io.File;
 import sys.FileSystem;
-import haxelib.client.Main.VERSION;
 import haxelib.Data.Infos;
 
 using StringTools;

src/haxelib/api/GlobalScope.hx

@@ -47,7 +47,7 @@ class GlobalScope extends Scope {
 			main: info.main
 		};
 
-		ScriptRunner.run(libraryRunData, resolveCompiler(), callData);
+		ScriptRunner.run(libraryRunData, callData, () -> haxeVersion);
 	}
 
 	public function getVersion(library:ProjectName):Version {

src/haxelib/api/Installer.hx

@@ -263,6 +263,8 @@ class Installer {
 		if (confirmHxmlInstall != null && !confirmHxmlInstall(libVersions))
 			return;
 
+		var hasFailures = false;
+
 		for (library in installData) {
 			if (library.versionData.match(Haxelib(_)) && repository.isVersionInstalled(library.name, library.version)) {
 				final version = SemVer.ofString(library.version);
@@ -281,6 +283,7 @@ class Installer {
 			try
 				installFromVersionData(library.name, library.versionData)
 			catch (e) {
+				hasFailures = true;
 				userInterface.log(e.toString());
 				continue;
 			}
@@ -296,6 +299,8 @@ class Installer {
 
 			handleDependenciesGeneral(libraryName, library.versionData);
 		}
+
+		if (hasFailures) throw "Some libraries could not be installed.";
 	}
 
 	/**
@@ -762,7 +767,7 @@ class Installer {
 			userInterface.log('Installing $library from $url' + (branch != null ? " branch: " + branch : ""));
 			final tag = vcsData.tag;
 			try {
-				vcs.clone(libPath, url, branch, tag, userInterface.log.bind(_, Debug));
+				vcs.clone(libPath, url, branch, tag, userInterface.log.bind(_, Debug), userInterface.log.bind(_, Optional));
 			} catch (error:VcsError) {
 				FsUtils.deleteRec(libPath);
 				switch (error) {
@@ -774,6 +779,8 @@ class Installer {
 						throw 'Could not checkout branch, tag or path "$branch": ' + stderr;
 					case CantCheckoutVersion(_, version, stderr):
 						throw 'Could not checkout tag "$version": ' + stderr;
+					case SubmoduleError(_, repo, stderr):
+						throw 'Could not clone submodule(s) from $repo: ' + stderr;
 					case CommandFailed(_, code, stdout, stderr):
 						throw new VcsCommandFailed(id, code, stdout, stderr);
 				};

src/haxelib/api/ScriptRunner.hx

@@ -79,13 +79,13 @@ class ScriptRunner {
 	/**
 		Run `library`, with `callData`.
 
-		`compilerData` is used if it is an interpreted script.
+		`getCompilerVersion` is used if it is an interpreted script.
 	 **/
-	public static function run(library:LibraryRunData, compilerData:LibraryData, callData:CallData):Void {
+	public static function run(library:LibraryRunData, callData:CallData, getCompilerVersion:()->SemVer):Void {
 		final type = getType(library);
 
 		final cmd = getCmd(type);
-		final args = generateArgs(type, callData, SemVer.ofString(compilerData.version));
+		final args = generateArgs(type, callData, getCompilerVersion);
 
 		final oldState = getState();
 
@@ -122,15 +122,15 @@ class ScriptRunner {
 		}
 	}
 
-	static function generateArgs(runType:RunType, callData:CallData, compilerVersion:SemVer):Array<String> {
+	static function generateArgs(runType:RunType, callData:CallData, getCompilerVersion:() -> SemVer):Array<String> {
 		switch runType {
 			case Neko(path):
 				final callArgs = callData.args.copy();
 				callArgs.unshift(path);
 				callArgs.push(callData.dir);
 				return callArgs;
 			case Script(main, name, version, dependencies):
-				final isHaxe4 = SemVer.compare(compilerVersion, SemVer.ofString('4.0.0')) >= 0;
+				final isHaxe4 = SemVer.compare(getCompilerVersion(), SemVer.ofString('4.0.0')) >= 0;
 				final useGlobalRepo = isHaxe4 && callData.useGlobalRepo;
 
 				final callArgs = generateScriptArgs(main, name, version, dependencies, useGlobalRepo);

src/haxelib/api/Vcs.hx

@@ -48,7 +48,7 @@ interface IVcs {
 
 		`debugLog` will be used to log executable output.
 	**/
-	function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void;
+	function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void;
 
 	/**
 		Updates repository in CWD or CWD/`Vcs.directory` to HEAD.
@@ -74,6 +74,7 @@ enum VcsError {
 	CantCheckoutBranch(vcs:Vcs, branch:String, stderr:String);
 	CantCheckoutVersion(vcs:Vcs, version:String, stderr:String);
 	CommandFailed(vcs:Vcs, code:Int, stdout:String, stderr:String);
+	SubmoduleError(vcs:Vcs, repo:String, stderr:String);
 }
 
 /** Exception thrown when a vcs update is cancelled. **/
@@ -230,7 +231,7 @@ abstract class Vcs implements IVcs {
 		return ret;
 	}
 
-	public abstract function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void;
+	public abstract function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void;
 
 	public abstract function update(?confirm:() -> Bool, ?debugLog:(msg:String) -> Void, ?summaryLog:(msg:String) -> Void):Bool;
 
@@ -320,33 +321,56 @@ class Git extends Vcs {
 		return true;
 	}
 
-	public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void {
+	public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void {
 		final oldCwd = Sys.getCwd();
 
-		final vcsArgs = ["clone", url, libPath];
+		var vcsArgs = ["clone", url, libPath];
 
-		if (!Vcs.flat)
-			vcsArgs.push('--recursive');
+		inline function printOptional(msg)
+			if (optionalLog != null && msg != "")
+				optionalLog(msg);
+
+		printOptional('Cloning ${name} from ${url}');
 
 		if (run(vcsArgs, debugLog).code != 0)
 			throw VcsError.CantCloneRepo(this, url/*, ret.out*/);
 
 		Sys.setCwd(libPath);
 
 		if (version != null && version != "") {
+			printOptional('Checking out tag/version ${version} of ${name}');
+
 			final ret = run(["checkout", "tags/" + version], debugLog);
 			if (ret.code != 0) {
 				Sys.setCwd(oldCwd);
 				throw VcsError.CantCheckoutVersion(this, version, ret.out);
 			}
 		} else if (branch != null) {
+			printOptional('Checking out branch/commit ${branch} of ${libPath}');
+
 			final ret = run(["checkout", branch], debugLog);
 			if (ret.code != 0){
 				Sys.setCwd(oldCwd);
 				throw VcsError.CantCheckoutBranch(this, branch, ret.out);
 			}
 		}
 
+		if (!Vcs.flat)
+		{
+			printOptional('Syncing submodules for ${name}');
+			run(["submodule", "sync", "--recursive"], debugLog);
+
+			var submoduleArgs = ["submodule", "update", "--init", "--recursive"];
+
+			printOptional('Downloading/updating submodules for ${name}');
+			final ret = run(submoduleArgs, debugLog);
+			if (ret.code != 0)
+			{
+				Sys.setCwd(oldCwd);
+				throw VcsError.SubmoduleError(this, url, ret.out);
+			}
+		}
+
 		// return prev. cwd:
 		Sys.setCwd(oldCwd);
 	}
@@ -421,7 +445,7 @@ class Mercurial extends Vcs {
 		return changed;
 	}
 
-	public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void {
+	public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void {
 		final vcsArgs = ["clone", url, libPath];
 
 		if (branch != null && version != null) {