Using a custom VM

pharo-project · Feb 4, 2020 · 94f982c · 94f982c
1 parent 2a35f7e
commit 94f982c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -178,7 +178,10 @@ add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/test"
     DEPENDS ${TEST_LIBRARY} ${PLUGIN_NAME}
 
-    COMMAND wget -O - "get.pharo.org/64/80+vmHeadlessLatest" | bash
+    COMMAND wget -O - "get.pharo.org/64/90+vmHeadlessLatest" | bash
+	COMMAND rm -rf "${CMAKE_CURRENT_BINARY_DIR}/build/test/pharo-vm/*"
+	COMMAND wget "${VM_URL}"
+	COMMAND unzip "PharoVM-*-bin.zip" -d "${CMAKE_CURRENT_BINARY_DIR}/build/test/pharo-vm/"
     COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/build/bin/${DYLIB_EXT}" ${PHARO_PLUGIN_DIR}
     COMMAND cp "${CMAKE_CURRENT_BINARY_DIR}/build/bin/${TEST_LIBRARY_DLL}" .
     COMMAND ./pharo Pharo.image metacello install "tonel://${CMAKE_CURRENT_SOURCE_DIR_TO_OUT}/src" BaselineOfThreadedFFI

diff --git a/linux.cmake b/linux.cmake
@@ -1,4 +1,5 @@
-set(HEADER_URL "https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa85-linux64-include.zip") 
+set(VM_URL 		"https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa85-linux64-bin.zip")
+set(HEADER_URL 	"https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa85-linux64-include.zip") 
 set(LIBFFI_TARGET "x86_64-pc-linux-gnu")
 
 set(LIBFFI_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/bin/libffi.so" "${CMAKE_CURRENT_BINARY_DIR}/build/bin/libffi.7.so")

diff --git a/osx.cmake b/osx.cmake
@@ -1,4 +1,5 @@
-set(HEADER_URL "https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa85-mac64-include.zip") 
+set(VM_URL 		"https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa85-mac64-bin.zip")
+set(HEADER_URL 	"https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa85-mac64-include.zip") 
 set(LIBFFI_TARGET "x86_64-apple-darwin")
 
 set(LIBFFI_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/bin/libffi.dylib" "${CMAKE_CURRENT_BINARY_DIR}/build/bin/libffi.7.dylib")

diff --git a/win.cmake b/win.cmake
@@ -1,4 +1,5 @@
-set(HEADER_URL "https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa857-win64-include.zip") 
+set(VM_URL 		"https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa857-win64-bin.zip")
+set(HEADER_URL 	"https://ci.inria.fr/pharo-ci-jenkins2/job/pharo-vm/job/idle/17/artifact/build/build/packages/PharoVM-8.3.0-63efa857-win64-include.zip") 
 set(LIBFFI_TARGET "x86_64-unknown-cygwin")
 
 set(LIBFFI_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install/bin/ffi-7.dll")