Clean settings
MODIFY
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/class/settingsOn..st
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/class/settingsOn..st
@@ -6,22 +6,6 @@ settingsOn: aBuilder
label: 'Quit On Launch' translated;
parent: #pharoLauncher;
target: self;
- description: 'When enabled, Launcher quits when an image is launched. ' , String cr ,
- 'When disabled, Launcher stays alive when an image is launched.' translated.
-
- (aBuilder setting: #vmFullPath)
- label: 'VM Full Path' translated;
- type: #FilePathEncoder;
- parent: #pharoLauncher;
- target: self;
- description: 'When set, this is the full path (including executable name) to the VM used to launch an image. ' , String cr ,
- 'When empty, Launcher uses it''s internal VM.', String cr,
- 'NOTE: This path might need to escape some whitespace characters e.g. "/Pharo\ 3.0/Pharo".' translated.
-
- (aBuilder setting: #spurFullPath)
- label: 'Spur VM Full Path' translated;
- type: #FilePathEncoder;
- parent: #pharoLauncher;
- target: self;
- description: 'When set, this is the full path (including executable name) to the Spur VM used to launch an image in Spur format. ' , String cr ,
- 'NOTE: This path might need to escape some whitespace characters e.g. "/Pharo\ 3.0/Pharo".' translated.
\ No newline at end of file
+ description:
+ 'When enabled, Launcher quits when an image is launched. ' , String cr
+ , 'When disabled, Launcher stays alive when an image is launched.' translated
\ No newline at end of file

DELETE
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/class/spurFullPath..st
-accessing
-spurFullPath: anObject
- SpurFullPath := anObject
\ No newline at end of file

DELETE
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/class/spurFullPath.st
-accessing
-spurFullPath
- ^ SpurFullPath ifNil: [ '' ]
\ No newline at end of file

DELETE
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/class/vmFullPath..st
-accessing
-vmFullPath: anObject
- VmFullPath := anObject
\ No newline at end of file

DELETE
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/class/vmFullPath.st
-accessing
-vmFullPath
- ^ VmFullPath ifNil: [ '' ]
\ No newline at end of file

MODIFY
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/properties.json
src/PharoLauncher-Core.package/PhLLaunchImageCommand.class/properties.json
"classinstvars" : [ ],
"pools" : [ ],
"classvars" : [
- "QuitOnLaunch",
- "SpurFullPath",
- "VmFullPath"
+ "QuitOnLaunch"
],
"instvars" : [ ],
"name" : "PhLLaunchImageCommand",

ADD
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/class/settingsOn..st
+settings
+settingsOn: aBuilder
+ <systemsettings>
+ <pharoLauncherSettings>
+ (aBuilder setting: #vmStore)
+ label: 'VMs Directory' translated;
+ type: #Directory;
+ parent: #pharoLauncher;
+ target: self;
+ default: (PlatformResolver forCurrentPlatform launcherUserFilesLocation / 'vms') pathString;
+ description:
+ 'Path to the directory containing all the VMs to launcher your Pharo images.' , String cr
+ , 'You must have the read/write rights on this folder.' , String cr
+ , 'NOTE: This path might need to escape some whitespace characters e.g. "/Pharo\ 3.0/Pharo".' translated
\ No newline at end of file

ADD
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/class/vmStore..st
+accessing
+vmStore: anObject
+ VMStore := anObject asFileReference.
+ VMStore ensureCreateDirectory
\ No newline at end of file

ADD
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/class/vmStore.st
+accessing
+vmStore
+ ^ VMStore ifNil: [ VMStore := (PlatformResolver forCurrentPlatform launcherUserFilesLocation / 'vms') ensureCreateDirectory ]
\ No newline at end of file

MODIFY
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/instance/ensureIsExecutable..st
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/instance/ensureIsExecutable..st
@@ -3,4 +3,4 @@ ensureIsExecutable: aPath
"Unzipping with Pharo does not preserve unix rights and so, the pahro VM executable does not have the execution permission.
We have to set it explicitely on Unix and OS X."
Smalltalk os isWindows
- ifFalse: [ OSProcess thisOSProcess waitForCommand: 'chmod u+x ' , aPath ]
\ No newline at end of file
+ ifFalse: [ OSProcess waitForCommand: 'chmod u+x ' , aPath ]
\ No newline at end of file

MODIFY
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/instance/vmStore.st
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/instance/vmStore.st
accessing
vmStore
- ^ (PlatformResolver forCurrentPlatform launcherUserFilesLocation / 'vms') ensureCreateDirectory
\ No newline at end of file
+ ^ self class vmStore
\ No newline at end of file

MODIFY
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/properties.json
src/PharoLauncher-Core.package/PhLVirtualMachineManager.class/properties.json
"category" : "PharoLauncher-Core-Model",
"classinstvars" : [ ],
"pools" : [ ],
- "classvars" : [ ],
+ "classvars" : [
+ "VMStore"
+ ],
"instvars" : [
"imageFile",
"imageFormatNumber",

Clean settings