Skip to content
This repository was archived by the owner on Jan 30, 2026. It is now read-only.

CMake using only one image #13

Open
hogoww wants to merge 15 commits into
base: testCompilationObservable
Choose a base branch
from
Open

CMake using only one image #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
97d0dd9
add a dependency for VM generation
hogoww Feb 15, 2022
0c5c7ce
syntax error fix
hogoww Feb 15, 2022
6c9603b
define dependency differently
hogoww Feb 15, 2022
a6f006f
express dependency with set
hogoww Feb 15, 2022
cc971c5
debugg messages
hogoww Feb 16, 2022
55f98a0
remove printing, try always build
hogoww Feb 16, 2022
58d1512
always instead of build-always
hogoww Feb 16, 2022
d2f5aed
random modification
hogoww Feb 16, 2022
647182f
try byproducts
hogoww Feb 16, 2022
9e35b53
change random modification
hogoww Feb 16, 2022
3be2b59
random modification on instance side.
hogoww Feb 16, 2022
9675bfd
add a dependency
hogoww Feb 16, 2022
80dfcad
revert change
hogoww Feb 16, 2022
fb02323
add failure
hogoww Feb 16, 2022
3631d71
fix introduced mistake
hogoww Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cmake/vmmaker.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

set(CMAKE_VERBOSE_MAKEFILE TRUE)


#Setting vmmaker directory and image
set( VMMAKER_DIR "${CMAKE_CURRENT_BINARY_DIR_TO_OUT}/build/vmmaker")
set( VMMAKER_IMAGE "${VMMAKER_DIR}/image/VMMaker.image")
Expand Down Expand Up @@ -115,10 +116,12 @@ if(GENERATE_SOURCES)
BUILD_COMMAND echo "preparing VMMaker image "
COMMAND ${CMAKE_CURRENT_SOURCE_DIR_TO_OUT}/scripts/copyImageIfDoesNotExists.sh ${VMMAKER_IMAGE} ${VMMAKER_DIR}/image/Pharo9.0-SNAPSHOT-64bit-ac4bf08.image
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}"
BUILD_BYPRODUCTS ${VMMAKER_IMAGE}

UPDATE_COMMAND echo
CONFIGURE_COMMAND echo
INSTALL_COMMAND echo

PREFIX "${VMMAKER_DIR}"
SOURCE_DIR "${VMMAKER_DIR}/image"
BUILD_IN_SOURCE True
Expand All @@ -131,9 +134,9 @@ if(GENERATE_SOURCES)
add_custom_command(
OUTPUT ${VMSOURCEFILES} ${PLUGIN_GENERATED_FILES}
COMMAND ${VMMAKER_VM} --headless ${VMMAKER_IMAGE} --no-default-preferences eval \"PharoVMMaker generate: \#\'${FLAVOUR}\' outputDirectory: \'${CMAKE_CURRENT_BINARY_DIR_TO_OUT}\'\"
DEPENDS build_vmmaker_get_image
DEPENDS build_vmmaker_get_image ${VMMAKER_IMAGE}
COMMENT "Generating VM files for flavour: ${FLAVOUR}")

add_custom_target(vmmaker DEPENDS build_vmmaker_get_image)
add_custom_target(generate-sources DEPENDS ${VMSOURCEFILES} ${PLUGIN_GENERATED_FILES})

Expand Down
4 changes: 2 additions & 2 deletions smalltalksrc/VMMaker/SpurMemoryManager.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ SpurMemoryManager class >> declareCVarsIn: aCCodeGenerator [

{ #category : #'api characterization' }
SpurMemoryManager class >> hasSpurMemoryManagerAPI [
^true
^ true
]

{ #category : #analysis }
Expand Down Expand Up @@ -5921,7 +5921,7 @@ SpurMemoryManager >> hasSixtyFourBitImmediates [

{ #category : #'api characterization' }
SpurMemoryManager >> hasSpurMemoryManagerAPI [
^true
^ true
]

{ #category : #'object testing' }
Expand Down