Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update bootstrap to pharo7 #4558

Merged
merged 11 commits into from
Nov 15, 2019
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions bootstrap/scripts/2-download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"

mkdir -p "${BOOTSTRAP_CACHE}" #required to generate hermes files

${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/getPharoVM.sh 61
wget --progress=dot:mega https://github.com/guillep/PharoBootstrap/releases/download/v1.5.0/bootstrapImage.zip
${BOOTSTRAP_REPOSITORY}/bootstrap/scripts/getPharoVM.sh 70
wget --progress=dot:mega https://github.com/carolahp/PharoBootstrap/releases/download/v1.7.0/bootstrapImage.zip
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caro, it would be good if you make a PR to the original repository. We can move it under pharo-project/PharoBootstrap too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@guillep I did a PR to your repo
By "moving it to pharo-project/PharoBootstrap", you mean to create a new repo?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I meant that we can transfer the repository from my user to pharo's user

unzip bootstrapImage.zip

cd "${BOOTSTRAP_CACHE}"
Expand Down
26 changes: 1 addition & 25 deletions bootstrap/scripts/prepare_image.st
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,6 @@
repositoryPathString := ((Smalltalk os environment at: 'BOOTSTRAP_REPOSITORY' ifAbsent: ['.']) asFileReference / 'bootstrap' / 'src') fullName.
Metacello new
baseline: 'PharoBootstrapProcess';
repository: 'filetree://', repositoryPathString;
repository: 'tonel://', repositoryPathString;
load.
] on: Warning do: #resume.

! !TonelRepository methodsFor: 'converting' stamp: 'PabloTesone 01/11/2017 12:00'!
asRing2EnvironmentWith: packageNames

| aRG2Environment |
aRG2Environment := RG2Environment new.
aRG2Environment announcer suspendAllWhile: [
(packageNames) do: [ :pn |
| snap defs package version |
package := aRG2Environment ensurePackageNamed: pn asSymbol.
version := self versionWithInfo: (self versionInfoFromVersionNamed: pn).
snap := version snapshot.

defs := snap definitions.
defs do: [ :each |
each ensureRing2DefinitionIn: aRG2Environment package: package ]
displayingProgress: 'snap'.]
displayingProgress: 'version'.
].

aRG2Environment clean.
aRG2Environment behaviorsDo: [ :beh |
beh superclass == beh ifTrue: [ beh superclass: nil. ] ].
^ aRG2Environment!
2 changes: 0 additions & 2 deletions bootstrap/src/.filetree

This file was deleted.

3 changes: 3 additions & 0 deletions bootstrap/src/.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
#format : #tonel
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
"
I'm the configuration used to load everything needed to perform the bootstrap proces:
- ConfigurationOfPharoBootstrap: the definition of the Pharo packages to bootstrap
- Espell : is basic to run the bootstrap
- Ficus: is the meta model we use to load the code to bootstrap
- Cargo: the package manager that will give us Monticello definitions for Ficus
"
Class {
#name : #BaselineOfPharoBootstrapProcess,
#superclass : #BaselineOf,
#category : 'BaselineOfPharoBootstrapProcess'
}

{ #category : #baselines }
BaselineOfPharoBootstrapProcess >> baseline: spec [
<baseline>

spec for: #common do: [
spec blessing: #baseline.
spec baseline: 'Tonel' with: [ spec
repository: 'github://pharo-vcs/tonel:v1.0.13' ].
spec baseline: 'Hermes' with: [ spec
repository: 'github://tesonep/hermes:v2.5.1';
loads: 'core' ].
spec
package: 'Pharo30Bootstrap'.
spec baseline: 'Ring2' with: [ spec
repository: 'github://carolahp/Ring2:master/src';
loads: 'bootstrap' ].
]
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Extension { #name : #NonInteractiveTranscript }

{ #category : #'*BaselineOfPharoBootstrapProcess' }
NonInteractiveTranscript >> ensureCr [
self stream cr
]
1 change: 1 addition & 0 deletions bootstrap/src/BaselineOfPharoBootstrapProcess/package.st
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Package { #name : #BaselineOfPharoBootstrapProcess }
5 changes: 0 additions & 5 deletions bootstrap/src/Pharo30Bootstrap.package/.filetree

This file was deleted.

This file was deleted.

Empty file.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading