From e8d4eb52e6d35445116a63a6fb1e77ff16225146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phaneDucasse?= Date: Sat, 24 Feb 2024 17:36:31 +0100 Subject: [PATCH] script will use Pharo 12 + update preLoading --- preLoading.st | 15 +++++++-------- scripts/build.sh | 2 +- scripts/unload_md.st | 23 ++++++++--------------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/preLoading.st b/preLoading.st index 20678da5..96f1d9a0 100644 --- a/preLoading.st +++ b/preLoading.st @@ -1,8 +1,7 @@ -"This is temporal until we fix the Pharo10 build" -IceRepository registry - detect: [ :each | each name = 'Microdown' ] - ifFound: [ :aRepository | aRepository forget ]. -"This, however, needs to stay :)" -#( 'BaselineOfMicrodownDev' 'BaselineOfMicrodown' 'Microdown' 'Microdown-Tests' 'Microdown-ResolvePath' 'Microdown-ResolvePath-Tests' ) do: [ :each | - (RPackageOrganizer default packageNamed: each ifAbsent: [ nil ]) - ifNotNil: [ :aPackage | aPackage removeFromSystem ] ] +#( 'Microdown' 'BeautifulComments' 'DocumentBrowser' ) do: [ :name | + (IceRepository repositoryNamed: name) + ifNil: [ self inform: 'Project not found: ' , name ] + ifNotNil: [ :found | + found + unload; + forget ] ] diff --git a/scripts/build.sh b/scripts/build.sh index a6725210..7769605e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -29,7 +29,7 @@ function get_platform_identifier() { # Set magic variables for current file & dir __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" __builddir="$(pwd)/build" -PHARO_VERSION="${PHARO_VERSION:-110}" +PHARO_VERSION="${PHARO_VERSION:-120}" PHARO="./pharo Pharo.image --no-default-preferences" rm -rf "${__builddir}" && mkdir -p "${__builddir}" && cd "${__builddir}" diff --git a/scripts/unload_md.st b/scripts/unload_md.st index d024a47b..728d7e77 100644 --- a/scripts/unload_md.st +++ b/scripts/unload_md.st @@ -7,18 +7,11 @@ IceRepository registry ifFound: [ :aRepository | aRepository forget ]. "This, however, needs to stay :)" -#( - 'BaselineOfMicrodown' - 'Microdown' - 'Microdown-Calypso' - 'Microdown-Pillar' - 'Microdown-Pillar-Tests' - 'Microdown-RichTextComposer' - 'Microdown-Tests' - - 'BaselineOfPillar' - 'Pillar-Core' - 'Pillar-ExporterRichText' - ) do: [ :each | - (RPackageOrganizer default packageNamed: each ifAbsent: [ nil ]) - ifNotNil: [ :aPackage | aPackage removeFromSystem ] ] \ No newline at end of file + +#( 'Microdown' 'BeautifulComments' 'DocumentBrowser' ) do: [ :name | + (IceRepository repositoryNamed: name) + ifNil: [ self inform: 'Project not found: ' , name ] + ifNotNil: [ :found | + found + unload; + forget ] ] \ No newline at end of file