Use LibCompat from "pharo-hacks"

...instead of `Tinyrossa-Compat-Pharo`. All the code from there has been moved to `LibCompat`.
janvrany · Aug 17, 2023 · c0bee7b · c0bee7b
1 parent 432ab33
commit c0bee7b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 103 deletions.
diff --git a/pharo/GNUmakefile b/pharo/GNUmakefile
@@ -37,6 +37,13 @@ SMALLRSP_BRANCH ?= master
 $(eval $(call git-clone-local,SMALLRSP_DIR,$(SMALLRSP_URL),$(SMALLRSP_BRANCH)))
 endif
 
+ifndef PHARO_HACKS_DIR
+PHARO_HACKS_DIR    := ../3rdparty/pharo-hacks
+PHARO_HACKS_URL    ?= https://github.com/janvrany/pharo-hacks
+PHARO_HACKS_BRANCH ?= master
+$(eval $(call git-clone-local,PHARO_HACKS_DIR,$(PHARO_HACKS_URL),$(PHARO_HACKS_BRANCH)))
+endif
+
 build: prereq $(PROJECT).image shells
 	@echo ""
 	@echo "To open Pharo $(PROJECT) image run:"
@@ -49,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, $@, LibCompat,        $(PHARO_HACKS_DIR)/src)
 	$(call pharo-load-local, $@, Tinyrossa,        ../src)
 
 run: build

diff --git a/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st b/src/BaselineOfTinyrossa/BaselineOfTinyrossa.class.st
@@ -22,13 +22,16 @@ BaselineOfTinyrossa >> baseline: spec [
 				spec repository: 'github://pharo-contributions/OSSubprocess:v1.3.0'
 			].
 
+			spec baseline: 'LibCompat' with: [
+				spec repository: 'github://janvrany/pharo-hacks'.
+			].
+
 			spec
-				package: #'Tinyrossa-Compat-Pharo' with:[
-					spec requires: 'OSSubprocess'.
-				];
 				package: #'Tinyrossa' with:[
-					spec requires: 'Tinyrossa-Compat-Pharo';
-						 requires: 'ArchC'
+					"LibCompat requires OSSubprocess for its OSProcess implementation."
+					spec requires: 'OSSubprocess'.
+					spec requires: 'LibCompat'.
+					spec requires: 'ArchC'
 				];
 				package: #'Tinyrossa-Tests' with: [
 					spec requires: 'SmallRSP'.

diff --git a/src/Tinyrossa-Compat-Pharo/Collection.extension.st b/src/Tinyrossa-Compat-Pharo/Collection.extension.st
diff --git a/src/Tinyrossa-Compat-Pharo/Integer.extension.st b/src/Tinyrossa-Compat-Pharo/Integer.extension.st
diff --git a/src/Tinyrossa-Compat-Pharo/OSPlatform.extension.st b/src/Tinyrossa-Compat-Pharo/OSPlatform.extension.st
diff --git a/src/Tinyrossa-Compat-Pharo/OSProcess.class.st b/src/Tinyrossa-Compat-Pharo/OSProcess.class.st
diff --git a/src/Tinyrossa-Compat-Pharo/Object.extension.st b/src/Tinyrossa-Compat-Pharo/Object.extension.st
diff --git a/src/Tinyrossa-Compat-Pharo/UndefinedObject.extension.st b/src/Tinyrossa-Compat-Pharo/UndefinedObject.extension.st
diff --git a/src/Tinyrossa-Compat-Pharo/package.st b/src/Tinyrossa-Compat-Pharo/package.st