Merge pull request #9 from OpenSmock/5-Include-Linux-and-MacOS-library-file

Setup mac and linux library

Author: LabordePierre

.github/workflows/Pharo11CI.yml

@@ -14,14 +14,28 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ windows-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         smalltalk: [ Pharo64-11 ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with: 
           fetch-depth: 0
+
+      #For ubuntu only
+      - name: Install zmq library for Ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libzmq3-dev
+
+      #For macos only
+      - name: Install zmq library for MacOS
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew install zeromq
+
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}

.github/workflows/Pharo12CI.yml

@@ -14,14 +14,28 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ windows-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         smalltalk: [ Pharo64-12 ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
         with: 
           fetch-depth: 0
+
+      #For ubuntu only
+      - name: Install zmq library for Ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libzmq3-dev
+
+      #For macos only
+      - name: Install zmq library for MacOS
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew install zeromq
+          
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}

.github/workflows/Pharo13CI.yml

@@ -14,14 +14,28 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ windows-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         smalltalk: [ Pharo64-13 ]
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
         with: 
           fetch-depth: 0
+
+      #For ubuntu only
+      - name: Install zmq library for Ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libzmq3-dev
+
+      #For macos only
+      - name: Install zmq library for MacOS
+        if: matrix.os == 'macos-latest'
+        run: |
+          brew install zeromq
+
       - uses: hpi-swa/setup-smalltalkCI@v1
         with:
           smalltalk-image: ${{ matrix.smalltalk }}

src/ZMQ/LibZMQ.class.st

@@ -27,19 +27,21 @@ LibZMQ class >> repositoryDirectory [
 	^ myRepository location
 ]
 
-{ #category : #'accessing platform' }
+{ #category : #'accessing - platform' }
 LibZMQ >> macLibraryName [
 
-	^ (self class repositoryDirectory / 'include' / 'libzmq.dylib')  asFileReference pathString
+	"^ (self class repositoryDirectory / 'include' / 'libzmq.dylib')  asFileReference pathString"
+	^ FFIMacLibraryFinder findLibrary: 'libzmq.dylib'
 ]
 
-{ #category : #'accessing platform' }
+{ #category : #'accessing - platform' }
 LibZMQ >> unixLibraryName [
 
-	^ (self class repositoryDirectory / 'include' / 'libzmq.so')  asFileReference pathString
+	"^ (self class repositoryDirectory / 'include' / 'libzmq.so')  asFileReference pathString"
+	^ FFIUnix32LibraryFinder findLibrary: 'libzmq.so'
 ]
 
-{ #category : #'accessing platform' }
+{ #category : #'accessing - platform' }
 LibZMQ >> win32LibraryName [
 
 	^ (self class repositoryDirectory / 'include' / 'zmq.dll') asFileReference pathString