Merge branch 'pharo-9' into docker-arm64

pharo-project · Jul 29, 2021 · bf33fd2 · bf33fd2
2 parents 6b361e3 + a1b0263
commit bf33fd2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 27 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,7 +16,15 @@ def shell(params){
 }
 
 def isMainBranch(){
-	return env.BRANCH_NAME == 'headless'
+	return env.BRANCH_NAME.startsWith('pharo-')
+}
+
+/**
+  Returns pharo version for the current branch.
+  Only valid if isMainBranch() is true.
+**/
+def mainBranchVersion(){
+	return env.BRANCH_NAME.substring('pharo-'.length())
 }
 
 def runInCygwin(command){
@@ -63,7 +71,7 @@ def buildGTKBundle(){
 
 						sh "scp -o StrictHostKeyChecking=no \
 						${gtkBundleName} \
-						pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur64-headless/win/latest-win64-GTK.zip"
+						pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur64-headless/win/latest${mainBranchVersion()}-win64-GTK.zip"
 					}
 				}
 			}
@@ -237,21 +245,21 @@ def upload(platform, configuration, archiveName) {
 		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}"
 		sh "scp -o StrictHostKeyChecking=no \
 		${expandedBinaryFileName} \
-		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/latest.zip"
+		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/latest${mainBranchVersion()}.zip"
 
 		sh "scp -o StrictHostKeyChecking=no \
 		${expandedHeadersFileName} \
 		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/include"
 		sh "scp -o StrictHostKeyChecking=no \
 		${expandedHeadersFileName} \
-		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/include/latest.zip"
+		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/include/latest${mainBranchVersion()}.zip"
 
 		sh "scp -o StrictHostKeyChecking=no \
 		${expandedCSourceFileName} \
 		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/source"
 		sh "scp -o StrictHostKeyChecking=no \
 		${expandedCSourceFileName} \
-		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/source/latest.zip"
+		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}-headless/${platform}/source/latest${mainBranchVersion()}.zip"
 	}
 }
 
@@ -270,7 +278,7 @@ def uploadStockReplacement(platform, configuration, archiveName) {
 		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}/${platform}"
 		sh "scp -o StrictHostKeyChecking=no \
 		${expandedBinaryFileName} \
-		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}/${platform}/latestReplacement.zip"
+		pharoorgde@ssh.cluster023.hosting.ovh.net:/home/pharoorgde/files/vm/pharo-spur${wordSize}/${platform}/latestReplacement${mainBranchVersion()}.zip"
 	}
 }
 
@@ -289,7 +297,7 @@ def uploadPackages(platformNames){
 			}
 
 			if(!isMainBranch()){
-				echo "[DO NO UPLOAD] In branch different that 'headless': ${env.BRANCH_NAME}";
+				echo "[DO NO UPLOAD] The branch is not a main Pharo version branch (starts with 'pharo-'): ${env.BRANCH_NAME}";
 				return;
 			}
 

diff --git a/smalltalksrc/VMMaker-Tools/VMMachineCodeDebugger.class.st b/smalltalksrc/VMMaker-Tools/VMMachineCodeDebugger.class.st
@@ -19,19 +19,18 @@ Class {
 { #category : #specs }
 VMMachineCodeDebugger class >> defaultSpec [
 
-	^ SpPanedLayout newHorizontal
-		add: #instructions;		
-		add: (SpPanedLayout newHorizontal
+	^  SpBoxLayout newVertical 
+		add:(SpBoxLayout newHorizontal
+			add: #instructions expand: true fill: true padding: 5;		
+			add: #machineState expand: true fill: true padding: 5;	
+			add: #stack expand: true fill: true padding: 5; 
+			yourself) expand: true fill: true padding: 5;
+		add: (SpBoxLayout newHorizontal 
 			add: (SpBoxLayout newVertical
-					add: #machineState;
-					add: (SpBoxLayout newHorizontal
-						add: #ipInput;
-						add: #jumpToButton);
-					add: #stepButton;
-					add: #disassembleAtPCButton;
-					yourself);
-			add: #stack; 
-			yourself)
+				add: #ipInput;
+				add: #jumpToButton) expand: true fill: true padding: 5;
+			add: #stepButton expand: true fill: true padding: 5;
+			add: #disassembleAtPCButton expand: true fill: true padding: 5) width: 200;
 		yourself
 ]
 
@@ -99,12 +98,12 @@ VMMachineCodeDebugger >> connectPresenters [
 	instructionsContextMenu addItem: [ :item |
 		item 
 			name: 'Set Intruction Pointer Here'; 
-			action: [ self setInstructionPointerToSelectedInstruction ] ].
+			action: [ self setInstructionPointerToSelectedInstruction. self refreshAll ] ].
 
 	instructionsContextMenu addItem: [ :item |
 		item 
 			name: 'Run to Here'; 
-			action: [ self runToSelectedInstruction ] ].
+			action: [ self runToSelectedInstruction. self refreshAll ] ].
 
 	instructionsContextMenu addItem: [ :item |
 		item 
@@ -153,7 +152,7 @@ VMMachineCodeDebugger >> initialDisassembly [
 { #category : #showing }
 VMMachineCodeDebugger >> initialExtent [ 
 
-	^ 1000@1000
+	^ 1000@600
 ]
 
 { #category : #showing }
@@ -249,11 +248,16 @@ VMMachineCodeDebugger >> machineSimulator: anObject [
 { #category : #showing }
 VMMachineCodeDebugger >> openWithSpec [
 
-	self refreshRegisters.
+	self refreshAll.
+	super openWithSpec.
+]
+
+{ #category : #showing }
+VMMachineCodeDebugger >> refreshAll [ 
+
 	self refreshInstructions.
 	self refreshStack.
-
-	super openWithSpec.
+	self refreshRegisters.
 ]
 
 { #category : #showing }
@@ -305,6 +309,11 @@ VMMachineCodeDebugger >> setInstructionPointerToSelectedInstruction [
 VMMachineCodeDebugger >> step [
 
 	machineSimulator step.
-	self refreshStack.
-	self refreshRegisters
+	self refreshAll
+]
+
+{ #category : #showing }
+VMMachineCodeDebugger >> title [ 
+
+	^ 'VM Debugger'
 ]