From e591e79ffa3736bfb6d1835f3940af1a4dce47c2 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Fri, 7 Apr 2023 22:46:36 +0200 Subject: [PATCH] Update to VM 10.0.5 --- cmake/vmmaker.cmake | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/cmake/vmmaker.cmake b/cmake/vmmaker.cmake index df149bc419..a7fbbe20ce 100644 --- a/cmake/vmmaker.cmake +++ b/cmake/vmmaker.cmake @@ -67,28 +67,33 @@ if(GENERATE_SOURCES) if(CMAKE_SYSTEM_NAME STREQUAL "Windows") message("Defining Windows VM to download for code generation") set(VMMAKER_VM ${VMMAKER_DIR}/vm/PharoConsole.exe) - set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Windows-x86_64/PharoVM-9.0.17-9e4879f5-Windows-x86_64-bin.zip) - set(VM_URL_HASH SHA256=fb5aa8c7adcc12830500933bf8fd1ab6ffb1ccfc534b4e0b0c9d23eecbe639e9) + set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Windows-x86_64/PharoVM-10.0.5-2757766f-Windows-x86_64-bin.zip) + set(VM_URL_HASH SHA256=e7430f753ae51fbec8b6a6105f9721cd503d13d0e4ad8069f74da0f6a32c8055) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")) message("Defining Linux AARCH64 VM to download for code generation") set(VMMAKER_VM ${VMMAKER_DIR}/vm/pharo) - set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Linux-aarch64/PharoVM-9.0.17-9e4879f-Linux-aarch64-bin.zip) + set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Linux-aarch64/PharoVM-10.0.5-2757766-Linux-aarch64-bin.zip) set(VM_URL_HASH SHA256=2fe44aab3715f26378796bef835fc1bd51da0baa02aad3fee03610926e80a59f) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")) message("Defining Linux ARM 32 VM to download for code generation") set(VMMAKER_VM ${VMMAKER_DIR}/vm/pharo) - set(VM_URL https://files.pharo.org/vm/pharo-spur32-headless/Linux-armv7l/PharoVM-9.0.17-9e4879f-Linux-armv7l-bin.zip) + set(VM_URL https://files.pharo.org/vm/pharo-spur32-headless/Linux-armv7l/PharoVM-10.0.5-2757766-Linux-armv7l-bin.zip) set(VM_URL_HASH SHA256=b08fdf80c21fa81d61cf8ee71abd741fc192e4a7210f20185a48ed108dfa402f) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") message("Defining Linux VM x86_64 to download for code generation") set(VMMAKER_VM ${VMMAKER_DIR}/vm/pharo) - set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/PharoVM-9.0.17-9e4879f-Linux-x86_64-bin.zip) - set(VM_URL_HASH SHA256=be97eff9525a70aca457f2bc77ddd775756c17b7a799adb3b12db7810763403c) + set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/PharoVM-10.0.5-2757766-Linux-x86_64-bin.zip) + set(VM_URL_HASH SHA256=dde65589966e4f547eb0b1b08053504f9663bdb94d520109d053dfcce7921eab) + elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")) + message("Defining arm64 OSX VM to download for code generation") + set(VMMAKER_VM ${VMMAKER_DIR}/vm/Contents/MacOS/Pharo) + set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Darwin-arm64/PharoVM-10.0.5-2757766f-Darwin-arm64-bin.zip) + set(VM_URL_HASH SHA256=414ecf82b71a4ed94a95af0fb6e04c0ab09cc7ab3011fcc207af6c1322d0b47b) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") message("Defining OSX VM to download for code generation") set(VMMAKER_VM ${VMMAKER_DIR}/vm/Contents/MacOS/Pharo) - set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Darwin-x86_64/PharoVM-9.0.17-9e4879f5-Darwin-x86_64-bin.zip) - set(VM_URL_HASH SHA256=920c2dd54a99f54a08d1c02980668188725572cdae6e736588559f23a0523ae3) + set(VM_URL https://files.pharo.org/vm/pharo-spur64-headless/Darwin-x86_64/PharoVM-10.0.5-2757766f-Darwin-x86_64-bin.zip) + set(VM_URL_HASH SHA256=f0f34c9411e899005749095dbdffdbeaa405ae8864aea81e4bff56331c3959e0) else() message(FATAL_ERROR "VM DOWNLOAD NOT HANDLED FOR CMAKE SYSTEM: ${CMAKE_SYSTEM_NAME}") endif() @@ -115,9 +120,9 @@ if(GENERATE_SOURCES) ExternalProject_Add( vmmaker - URL https://files.pharo.org/image/110/Pharo11-SNAPSHOT.build.684.sha.79e0bd3.arch.64bit.zip - URL_HASH SHA256=eb7b9e06e834d7d1b16f4e297a88fc7be3a1b0400f335d10408916ac6b8a9788 - BUILD_COMMAND ${VMMAKER_VM} --headless ${VMMAKER_DIR}/image/Pharo11-SNAPSHOT-64bit-79e0bd3.image --no-default-preferences save VMMaker + URL https://files.pharo.org/image/110/Pharo11-SNAPSHOT.build.688.sha.cf3d3fd.arch.64bit.zip + URL_HASH SHA256=c050ddcedce70ec92c22a3244aa5ebbc655dcaffcb42ac80fbf1f6e795c7010d + BUILD_COMMAND ${VMMAKER_VM} --headless ${VMMAKER_DIR}/image/Pharo11-SNAPSHOT-64bit-cf3d3fd.image --no-default-preferences save VMMaker COMMAND ${VMMAKER_VM} --headless ${VMMAKER_IMAGE} --no-default-preferences --save --quit "${CMAKE_CURRENT_SOURCE_DIR_TO_OUT}/scripts/installVMMaker.st" "${CMAKE_CURRENT_SOURCE_DIR_TO_OUT}" "${ICEBERG_DEFAULT_REMOTE}" UPDATE_COMMAND "" CONFIGURE_COMMAND ""