diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index 048ce46..5ec783b 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -13,14 +13,16 @@ BaselineOfMiniDocs >> baseline: spec [ "Dependencies" self setUpTeapot: spec. self setUpPetitParser: spec. - self setUpLepiterBuildingBlocs: spec. + "LepiterBuildingBlocs commented while resolving the conflict with the internal gtoolkit renaming." + "self setUpLepiterBuildingBlocs: spec" spec baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; 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 xmlParserHTML: spec" + self xmlParserHTML: spec. "Packages" spec @@ -91,7 +93,7 @@ BaselineOfMiniDocs >> xmlParserHTML: spec [ spec baseline: 'XMLParserHTML' with: [ spec - repository: 'github://pharo-contributions/XML-XMLParserHTML/src'; + repository: 'github://ruidajo/XML-XMLParserHTML/src'; loads: #('ALL')]; import: 'XMLParserHTML' ] diff --git a/src/MiniDocs/YQ.class.st b/src/MiniDocs/YQ.class.st index 8b0eacf..7d64782 100644 --- a/src/MiniDocs/YQ.class.st +++ b/src/MiniDocs/YQ.class.st @@ -33,12 +33,16 @@ YQ class >> jsonToYaml: aDictionary [ | jsonFile | self binaryFile exists ifFalse: [ YQ install]. jsonFile := MarkupFile exportAsFileOn: FileLocator temp / 'data.json' containing: aDictionary. - OSSUnixSubprocess new - shellCommand: 'cat ', jsonFile fullName,' | yq -y'; - redirectStdout; - runAndWaitOnExitDo: [ :command :outString | - ^ outString - ]. + (Smalltalk os isUnix or: [ Smalltalk os isMacOS ]) + ifTrue: [ + OSSUnixSubprocess new + shellCommand: 'cat ', jsonFile fullName,' | yq -y'; + redirectStdout; + runAndWaitOnExitDo: [ :command :outString | + ^ outString + ]]. + Smalltalk os isWindows + ifTrue: [ ^ LibC resultOfCommand: 'yq -p=json ', jsonFile fullName ]. ] { #category : #accessing }