From b416e2beb40beecc05de33e300203843f62b3263 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 12 Aug 2024 12:53:36 -0500
Subject: [PATCH] Add back `VERSION` file to release tarballs (#473)

* Add back `VERSION` file to release tarballs

Make sure it makes its way into the sysroot tarball and then copy it
from the sysroot location to the top of the sdk tarball as well.

Closes #471

* Fix how `VERSION` is installed
---
 ci/merge-artifacts.sh        | 1 +
 cmake/wasi-sdk-sysroot.cmake | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ci/merge-artifacts.sh b/ci/merge-artifacts.sh
index e55db2d92..4a69e240f 100755
--- a/ci/merge-artifacts.sh
+++ b/ci/merge-artifacts.sh
@@ -60,6 +60,7 @@ for build in dist-*; do
   tar xf $toolchain -C dist/$sdk_dir --strip-components 1
   mkdir -p dist/$sdk_dir/share/wasi-sysroot
   tar xf $sysroot -C dist/$sdk_dir/share/wasi-sysroot --strip-components 1
+  mv dist/$sdk_dir/share/wasi-sysroot/VERSION dist/$sdk_dir
 
   # Setup the compiler-rt library for wasi,wasip1,wasip2
   rtlibdir=$(dirname $(find dist/$sdk_dir/lib -name include))/lib
diff --git a/cmake/wasi-sdk-sysroot.cmake b/cmake/wasi-sdk-sysroot.cmake
index f51a84574..d0c4287b9 100644
--- a/cmake/wasi-sdk-sysroot.cmake
+++ b/cmake/wasi-sdk-sysroot.cmake
@@ -329,12 +329,10 @@ execute_process(
   COMMAND ${PYTHON} ${version_script} dump
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   OUTPUT_VARIABLE version_dump)
-set(version_file_tmp ${CMAKE_CURRENT_BINARY_DIR}/VERSION)
+set(version_file_tmp ${wasi_sysroot}/VERSION)
 file(GENERATE OUTPUT ${version_file_tmp} CONTENT ${version_dump})
 add_custom_target(version-file DEPENDS ${version_file_tmp})
 add_dependencies(build version-file)
-install(FILES ${version_file_tmp}
-        DESTINATION ${CMAKE_INSTALL_PREFIX})
 
 if(WASI_SDK_INCLUDE_TESTS)
   add_subdirectory(tests)
@@ -353,7 +351,7 @@ add_dependencies(dist-compiler-rt compiler-rt)
 # Tarball with the whole sysroot
 wasi_sdk_add_tarball(dist-sysroot
   ${dist_dir}/wasi-sysroot-${wasi_sdk_version}.tar.gz
-  ${wasi_tmp_install}/share/wasi-sysroot)
+  ${wasi_sysroot})
 add_dependencies(dist-sysroot build)
 
 add_custom_target(dist DEPENDS dist-compiler-rt dist-sysroot)