Fix working directory for archiving from git.

[mahge]

Describe the pull request
Fix the working directory where git archive is issued in (for vcpkg_from_git)

• What does your PR fix?

  • The directory specified no longer matches the directory used for fetching.

  • This was overlooked by PR [tinyfiledialogs] Fix for good #19338.

• Which triplets are supported/not supported? Have you updated the CI baseline?

  Not applicable

• Does your PR follow the maintainer guide?

  Yes

• If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

  Not applicable

[JackBoosY]

Can you tell me which issue you solved here?

[mahge]

Of course. This issue is with head (--head) mode operation.

It starts here. The directory where the script wants to operate in, i.e git_working_directory, is set to ${DOWNLOADS}/git-tmp.

vcpkg/scripts/cmake/vcpkg_from_git.cmake

Line 82 in 40a0fb2

set(git_working_directory "${DOWNLOADS}/git-tmp")

However, if you have specified head mode (--head) then the code changes that directory to "${CURRENT_BUILDTREES_DIR}/src/git-tmp" here

vcpkg/scripts/cmake/vcpkg_from_git.cmake

Lines 83 to 88 in 40a0fb2

	if(VCPKG_USE_HEAD_VERSION)
	if(DEFINED arg_HEAD_REF)
	vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head")
	vcpkg_list(SET git_fetch_shallow_param --depth 1)
	set(ref_to_use "${arg_HEAD_REF}")
	set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp")

Which means the port will be fetched to that directory here

vcpkg/scripts/cmake/vcpkg_from_git.cmake

Lines 117 to 128 in 40a0fb2

	vcpkg_execute_required_process(
	ALLOW_IN_DOWNLOAD_MODE
	COMMAND "${GIT}" init "${git_working_directory}"
	WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
	LOGNAME "git-init-${TARGET_TRIPLET}"
	)
	vcpkg_execute_required_process(
	ALLOW_IN_DOWNLOAD_MODE
	COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_use}" ${git_fetch_shallow_param} -n
	WORKING_DIRECTORY "${git_working_directory}"
	LOGNAME "git-fetch-${TARGET_TRIPLET}"
	)

The script then tries to archive the fetched code (for caching). However, the archiving custom command was still assuming the fetch was always done in ${DOWNLOADS}/git-tmp.

vcpkg/scripts/cmake/vcpkg_from_git.cmake

Lines 163 to 169 in 40a0fb2

	file(MAKE_DIRECTORY "${DOWNLOADS}/temp")
	vcpkg_execute_required_process(
	ALLOW_IN_DOWNLOAD_MODE
	COMMAND "${GIT}" archive "${rev_parse_ref}" -o "${temp_archive}"
	WORKING_DIRECTORY "${DOWNLOADS}/git-tmp"
	LOGNAME git-archive
	)

This was failing because there is nothing in ${DOWNLOADS}/git-tmp. My guess is that it was just overlooked among the changes in #19338. I changed it to use the git_working_directory variable instead. This way it works for both modes.

I am not sure why the two operation modes (normal vs head) use two different temporary directories. Maybe that was overlooked. But I thought this fix covers both cases without big changes.

[BillyONeal]

I agree with @mahge -- this is once again a case the GitHub code review tool makes terrible. Consider existing uses on 126 and 149 that the terrible code review tool isn't showing as contest.

[JackBoosY]

@strega-nil-ms @vicroms can you please take a look?

Thanks.

[BillyONeal]

I agree with @mahge -- this is once again a case the GitHub code review tool makes terrible. Consider existing uses on 126 and 149 that the terrible code review tool isn't showing as contest.

[JackBoosY]

Depends on #21613.

[JackBoosY]

The qca regression was fixed by #21250.

[BillyONeal]

Thanks for the typo fix!

[mahge]

No problem. Thanks for accepting it.

I think it might be good to add at least one test that uses vcpkg_from_git in --head mode, when you have time of course.