diff --git a/repository/Grafoscopio/GrafoscopioBrowser.class.st b/repository/Grafoscopio/GrafoscopioBrowser.class.st index dd5671f..b798fdd 100644 --- a/repository/Grafoscopio/GrafoscopioBrowser.class.st +++ b/repository/Grafoscopio/GrafoscopioBrowser.class.st @@ -66,7 +66,8 @@ GrafoscopioBrowser class >> configurePandoc [ { #category : #'as yet unclassified' } GrafoscopioBrowser class >> configureSettings [ - "Stablish several 'global' settings according to to image location and the operative system" + "Stablish several 'global' settings according to to image location and the operative system. For the moment we're gonna use hardcoded paths, + but in the future this will be a smarter method finding the proper external tool and setting up it." draftsLocation := FileSystem disk workingDirectory / 'Grafoscopio' / 'Drafts'. draftsLocation ensureCreateDirectory. @@ -79,6 +80,11 @@ GrafoscopioBrowser class >> configureSettings [ ifTrue: [ fossil := (FileSystem disk workingDirectory / 'Platform' / 'Windows' / 'Programs' / 'Fossil' / 'fossil.exe') fullName. pandoc := (FileSystem disk workingDirectory / 'Platform' / 'Windows' / 'Programs' / 'Pandoc' / 'pandoc.exe') fullName]. + Smalltalk platform name = 'Mac OS' + ifTrue: [ + fossil := ((FileLocator desktop) asFileReference / 'fossil') fullName. + pandoc := (FileSystem disk / 'usr' / 'local' / 'bin' / 'pandoc') fullName. + ] ] { #category : #'as yet unclassified' } @@ -312,47 +318,58 @@ GrafoscopioBrowser class >> updateGrafoscopio [ GrafoscopioBrowser class >> updatePrerrequisites [ "Updates the system prerequisites with new versions of itself take from the source code repository" -"Visualization library (which also makes main menu loadable)" -Gofer it - smalltalkhubUser: 'ObjectProfile' project: 'Roassal2'; - configurationOf: 'Roassal2'; - loadDevelopment. + "Visualization library (which also makes main menu loadable)" + Gofer it + smalltalkhubUser: 'ObjectProfile' project: 'Roassal2'; + configurationOf: 'Roassal2'; + loadDevelopment. -"Open/save files on STON format" -Gofer new - smalltalkhubUser: 'SvenVanCaekenberghe' project: 'STON'; - configurationOf: 'Ston'; - loadBleedingEdge. + "Support for the STON format used in file persistance for grafoscopio notebooks" + Gofer new + smalltalkhubUser: 'SvenVanCaekenberghe' project: 'STON'; + configurationOf: 'Ston'; + loadBleedingEdge. -"Moose and Roassal integration" -Gofer new - smalltalkhubUser: 'Moose' project: 'Glamour'; - package: 'Glamour-Tools'; - package: 'Glamour-Roassal2-Presentations'; - load. + "Moose and Roassal integration" + Gofer new + smalltalkhubUser: 'Moose' project: 'Glamour'; + package: 'Glamour-Tools'; + package: 'Glamour-Roassal2-Presentations'; + load. -Gofer new - smalltalkhubUser: 'Moose' project: 'GToolkit'; - package: 'GT-InspectorExtensions-CoreRoassal'; - load. + Gofer new + smalltalkhubUser: 'Moose' project: 'GToolkit'; + package: 'GT-InspectorExtensions-CoreRoassal'; + load. -"Integration with external tools" -Gofer new - smalltalkhubUser: 'Offray' project: 'Grafoscopio'; - package: 'Grafoscopio-ExternalTools'; - load. + "Integration with external tools" + Gofer new + smalltalkhubUser: 'Offray' project: 'Grafoscopio'; + package: 'Grafoscopio-ExternalTools'; + load. -"HTML scrapping" -Gofer new - smalltalkhubUser: 'PharoExtras' project: 'Soup'; - configurationOf: 'Soup'; - loadStable. + "HTML scrapping" + Gofer new + smalltalkhubUser: 'PharoExtras' project: 'Soup'; + configurationOf: 'Soup'; + loadStable. -"Data visualization" -Gofer new - smalltalkhubUser: 'Offray' project: 'Dataviz'; - package: 'Dataviz'; - load. + "Data visualization" + Gofer new + smalltalkhubUser: 'Offray' project: 'Dataviz'; + package: 'Dataviz'; + load. + + "Support for Operative System integration" + Gofer new + squeaksource: 'OSProcess'; + package: 'OSProcess'; + load. + + Gofer new + squeaksource: 'CommandShell'; + package: 'CommandShell-Piping'; + load. self inform: 'La actualizaciĆ³n de los prerrequisitos ha terminado' ] @@ -781,7 +798,7 @@ GrafoscopioBrowser >> exportAsHtml [ self inform: pandoc]. Smalltalk platform name = 'Win32' ifTrue: [ OSProcess command: pandoc, ' ', markdownFileLocation , ' --standalone -o ' , htmlFileLocation ]] - ifFalse: [GrafoscopioBrowser configurePandoc ]. + ifFalse: [GrafoscopioBrowser configureSettings]. self customKeys.