Merge a264070d5c
This commit is contained in:
commit
7979007091
@ -13,14 +13,16 @@ BaselineOfMiniDocs >> baseline: spec [
|
|||||||
"Dependencies"
|
"Dependencies"
|
||||||
self setUpTeapot: spec.
|
self setUpTeapot: spec.
|
||||||
self setUpPetitParser: spec.
|
self setUpPetitParser: spec.
|
||||||
self setUpLepiterBuildingBlocs: spec.
|
"LepiterBuildingBlocs commented while resolving the conflict with the internal gtoolkit renaming."
|
||||||
|
"self setUpLepiterBuildingBlocs: spec"
|
||||||
spec
|
spec
|
||||||
baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ];
|
baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ];
|
||||||
baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ];
|
baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ];
|
||||||
baseline: 'Tealight' with: [ spec repository: 'github://astares/Tealight:main/src' ].
|
baseline: 'Tealight' with: [ spec repository: 'github://astares/Tealight:main/src' ];
|
||||||
|
baseline: 'DataFrame' with: [ spec repository: 'github://PolyMathOrg/DataFrame/src' ].
|
||||||
|
|
||||||
"self fossil: spec."
|
"self fossil: spec."
|
||||||
"self xmlParserHTML: spec"
|
self xmlParserHTML: spec.
|
||||||
|
|
||||||
"Packages"
|
"Packages"
|
||||||
spec
|
spec
|
||||||
@ -91,7 +93,7 @@ BaselineOfMiniDocs >> xmlParserHTML: spec [
|
|||||||
spec
|
spec
|
||||||
baseline: 'XMLParserHTML'
|
baseline: 'XMLParserHTML'
|
||||||
with: [ spec
|
with: [ spec
|
||||||
repository: 'github://pharo-contributions/XML-XMLParserHTML/src';
|
repository: 'github://ruidajo/XML-XMLParserHTML/src';
|
||||||
loads: #('ALL')];
|
loads: #('ALL')];
|
||||||
import: 'XMLParserHTML'
|
import: 'XMLParserHTML'
|
||||||
]
|
]
|
||||||
|
@ -33,12 +33,16 @@ YQ class >> jsonToYaml: aDictionary [
|
|||||||
| jsonFile |
|
| jsonFile |
|
||||||
self binaryFile exists ifFalse: [ YQ install].
|
self binaryFile exists ifFalse: [ YQ install].
|
||||||
jsonFile := MarkupFile exportAsFileOn: FileLocator temp / 'data.json' containing: aDictionary.
|
jsonFile := MarkupFile exportAsFileOn: FileLocator temp / 'data.json' containing: aDictionary.
|
||||||
|
(Smalltalk os isUnix or: [ Smalltalk os isMacOS ])
|
||||||
|
ifTrue: [
|
||||||
OSSUnixSubprocess new
|
OSSUnixSubprocess new
|
||||||
shellCommand: 'cat ', jsonFile fullName,' | yq -y';
|
shellCommand: 'cat ', jsonFile fullName,' | yq -y';
|
||||||
redirectStdout;
|
redirectStdout;
|
||||||
runAndWaitOnExitDo: [ :command :outString |
|
runAndWaitOnExitDo: [ :command :outString |
|
||||||
^ outString
|
^ outString
|
||||||
].
|
]].
|
||||||
|
Smalltalk os isWindows
|
||||||
|
ifTrue: [ ^ LibC resultOfCommand: 'yq -p=json ', jsonFile fullName ].
|
||||||
]
|
]
|
||||||
|
|
||||||
{ #category : #accessing }
|
{ #category : #accessing }
|
||||||
|
Loading…
Reference in New Issue
Block a user