Merge pull request #1 from TechSmith/add-overlay-ports

Build Cairo without LZO

azure-pipelines.yml

@@ -11,12 +11,16 @@ jobs:
       cd vcpkg
       ./bootstrap-vcpkg.sh 
     displayName: Setup vcpkg
-    
+
   - bash: |
-      ./vcpkg install pango:x64-osx-dynamic-release --overlay-triplets=$(Build.SourcesDirectory)/triplets
-      ./vcpkg install pango:arm64-osx-dynamic-release --overlay-triplets=$(Build.SourcesDirectory)/triplets
+      ./vcpkg install pango:x64-osx-dynamic-release
     workingDirectory: vcpkg
-    displayName: Run vcpkg install
+    displayName: Run vcpkg install (x64-osx-dynamic-release)
+
+  - bash: |
+      ./vcpkg install pango:arm64-osx-dynamic-release
+    workingDirectory: vcpkg
+    displayName: Run vcpkg install (arm64-osx-dynamic-release)
 
   - bash: |
       ./vcpkg list > ../versions.txt
@@ -63,6 +67,7 @@ jobs:
 
 ###########################
 - job: CreateWinPangoLibsViaVcpkg
+  #condition: eq(true, false) # disable job for now
   pool:
     vmImage: 'windows-2022'
   steps:
@@ -73,8 +78,8 @@ jobs:
     displayName: Setup vcpkg
     
   - bash: |
-      ./vcpkg.exe install pango:x64-windows-release --overlay-triplets=$(Build.SourcesDirectory)/triplets
-    workingDirectory: vcpkg
+      ./vcpkg/vcpkg.exe install pango:x64-windows-dynamic-release
+    workingDirectory: $(Build.SourcesDirectory)
     displayName: Run vcpkg install
 
   - bash: |
@@ -84,26 +89,26 @@ jobs:
     displayName: Save library versions to a text and json file
 
   - bash: |
-      ls -l vcpkg/installed/x64-windows-release/include
-      ls -l vcpkg/installed/x64-windows-release/lib
+      ls -l vcpkg/installed/x64-windows-dynamic-release/include
+      ls -l vcpkg/installed/x64-windows-dynamic-release/lib
     displayName: DEBUGGING
 
   - bash: |
       ls -l
       rm -rf tools
       rm -rf share
       rm -rf debug # shouldn't need this
-    workingDirectory: vcpkg/installed/x64-windows-release
+    workingDirectory: vcpkg/installed/x64-windows-dynamic-release
     displayName: Remove stuff we don't want
 
   - bash: |
-      cp versions.txt vcpkg/installed/x64-windows-release
-      cp versions.json vcpkg/installed/x64-windows-release
+      cp versions.txt vcpkg/installed/x64-windows-dynamic-release
+      cp versions.json vcpkg/installed/x64-windows-dynamic-release
     displayName: Copy versions.txt/json to archive stage
 
   - task: ArchiveFiles@2
     inputs:
-      rootFolderOrFile: vcpkg/installed/x64-windows-release
+      rootFolderOrFile: vcpkg/installed/x64-windows-dynamic-release
       archiveType: 'tar'
       archiveFile: '$(Build.ArtifactStagingDirectory)/WinPango.tar.gz'
       verbose: true # boolean. Force verbose output. Default: false.
@@ -114,3 +119,4 @@ jobs:
     inputs:
       pathToPublish: $(Build.ArtifactStagingDirectory)/WinPango.tar.gz
       artifactName: WinPango  
+