Merge pull request #27 from janvrany/pr/remove-dependency-on-osunixsu…

…bprocess Remove dependency on OSUnixSubprocess in favour of LibCompat
janvrany · Oct 8, 2023 · 345e569 · 345e569
2 parents 319d017 + d4a8d3f
commit 345e569
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pharo/GNUmakefile b/pharo/GNUmakefile
@@ -56,6 +56,7 @@ $(PROJECT).image: ../src/*/*.st
 	$(call pharo-load-local, $@, MachineArithmetic,$(MACHINEARITHMETIC_DIR))
 	$(call pharo-load-local, $@, ArchC,            $(ARCHC_DIR)/src)
 	$(call pharo-load-local, $@, SmallRSP,         $(SMALLRSP_DIR)/src)
+	$(call pharo-load-local, $@, LibUnix,          $(PHARO_HACKS_DIR)/src)
 	$(call pharo-load-local, $@, LibCompat,        $(PHARO_HACKS_DIR)/src)
 	$(call pharo-load-local, $@, Tinyrossa,        ../src)
 

diff --git a/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st b/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st
@@ -18,18 +18,18 @@ BaselineOfTinyrossa >> baseline: spec [
 				spec repository: 'github://shingarov/SmallRSP:microwatt'
 			].
 
-			spec baseline: 'OSSubprocess' with: [
-				spec repository: 'github://pharo-contributions/OSSubprocess:v1.3.0'
+			spec baseline: 'LibCompat' with: [
+				spec repository: 'github://janvrany/pharo-hacks'.
 			].
 
-			spec baseline: 'LibCompat' with: [
+			spec baseline: 'LibUnix' with: [
 				spec repository: 'github://janvrany/pharo-hacks'.
 			].
 
 			spec
 				package: #'Tinyrossa' with:[
-					"LibCompat requires OSSubprocess for its OSProcess implementation."
-					spec requires: 'OSSubprocess'.
+					"LibCompat's implementation of OSProcess requires LibUnix"
+					spec requires: 'LibUnix'.
 					spec requires: 'LibCompat'.
 					spec requires: 'ArchC'
 				];