Use the latest tk patch for a Mac issue (NO_JIRA) (#19)

* Use the latest tk patch for a Mac issue (NO_JIRA)

* update mac agents to macos 13 (NO_JIRA)

* Update zlib source url (NO_JIRA)

* Hopeful fix tk source url (NO_JIRA)

* Update build_conquest_python.py (NO_JIRA)

align TK and TCL version - remove a spurious $ from the tk path

* Update build_conquest_python.py (NO_JIRA)

Fix removal of extraneous packages

* Update build_conquest_python.py

fix obviously wrong thing

* Update build_conquest_python.py (NO_JIRA)

fix fussy review dog thing

* Update jpeg package to the one now available (NO_JIRA)

* Disable the collect issues task that requires sorting (CQ-1485)

Our new artifactory no longer support sorting.

Also CQ-1449

* PMW experiment (NO_JIRA)

See if using newer PMW works ...

* Try tcltk 8.6.13 (NO_JIRA)

Try version that is closest to the version Pmw was released for yet fixes the bugs we need to fix

* back to 8.6.16 as downgrading made no difference (NO_JIRA)

* Remove whitespace in blank line (NO_JIRA)

---------

Co-authored-by: Jason Christopher Cole <[email protected]>

Author: siong-chin

azure-pipelines.yml

@@ -65,7 +65,7 @@ jobs:
 
   - job: macOS
     pool:
-      vmImage: "macOS-11"
+      vmImage: "macOS-13"
     variables:
       artifactory.platformName: "darwin"
     steps:

build_conquest_python.py

@@ -26,7 +26,9 @@ class ZlibPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixi
     @property
     def source_archives(self):
         return {
-            f'zlib-{self.version}.tar.xz': f'https://www.zlib.net/zlib-{self.version}.tar.xz'
+            # older version of zlib no longer available on zlib.net,
+            # so get it directly from Mark Adler's github repo
+            f'zlib-{self.version}.tar.xz': f'https://github.com/madler/zlib/releases/download/v{self.version}/zlib-{self.version}.tar.xz'
         }
 
 
@@ -166,7 +168,7 @@ def verify(self):
 
 class TclPackage(AutoconfMixin, NoArchiveMixin, Package):
     name = 'tcl'
-    version = '8.6.11'
+    version = '8.6.16'
     tclversion = '8.6'
 
     @property
@@ -179,17 +181,15 @@ def source_archives(self):
     def extract_source_archives(self):
         super().extract_source_archives()
         # Remove packages we don't want to build
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'sqlite3.34.0')
-        shutil.rmtree(self.main_source_directory_path / 'pkgs' / 'tdbc1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcmysql1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcodbc1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcpostgres1.1.2')
-        shutil.rmtree(self.main_source_directory_path /
-                      'pkgs' / 'tdbcsqlite3-1.1.2')
+        sp = Path(self.main_source_directory_path / 'pkgs')
+
+        sqlite_path = sp.glob('sqlite*')
+        for file in sqlite_path:
+            shutil.rmtree(file)
+
+        tbc_path = sp.glob('tdbc*')
+        for file in tbc_path:
+            shutil.rmtree(file)
 
     @property
     def main_source_directory_path(self):
@@ -297,14 +297,15 @@ def verify(self):
 
 class TkPackage(AutoconfMixin, NoArchiveMixin, Package):
     name = 'tk'
-    version = '8.6.11'
+    version = '8.6.16'
 
     @property
     def source_archives(self):
         return {
             # Canonical would be https://prdownloads.sourceforge.net/tcl/ but it's fetching garbage
             # How lovely to have a different tcl and tk version....
-            f'tk{self.version}-src.tar.gz': f'https://freefr.dl.sourceforge.net/project/tcl/Tcl/{self.version}/tk{self.version}.1-src.tar.gz'
+            # The url is a bit of a mess, but it's the only one that works?
+            f'tk{self.version}-src.tar.gz': f'https://sourceforge.net/projects/tcl/files/Tcl/{self.version}/tk{self.version}-src.tar.gz/download'
         }
 
     @property
@@ -506,12 +507,12 @@ def arguments_to_configuration_script(self):
 
 class JpegPackage(InstallInConquestPythonBaseMixin, AutoconfMixin, NoArchiveMixin, Package):
     name = 'jpeg'
-    version = '9e'
+    version = '9f'
 
     @property
     def source_archives(self):
         return {
-            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v9e.tar.gz'
+            f'jpegsrc.v{self.version}.tar.gz': f'https://fossies.org/linux/misc/jpegsrc.v{self.version}.tar.gz'
         }
 
 
@@ -720,7 +721,7 @@ def main():
     ConquestPythonPackage().build()
     ConquestPythonPackage().ensure_pip()
     ConquestPythonPackage().pip_install(
-        'Pmw==2.0.1',
+        'Pmw==2.1.1',
         'numpy==1.16.6',
         'PyInstaller==3.5',
         'PyOpenGL==3.1.0',

common-tasks.yml

@@ -6,24 +6,25 @@ steps:
     scriptPath: build_conquest_python.py
   displayName: 'install conquest_python'
 
-# Upload artifactory build info
-- task: ArtifactoryCollectIssues@1
-  inputs:
-    artifactoryService: 'devops-ccdc-3rd-party'
-    configSource: 'taskConfiguration'
-    taskConfig: |
-      version: 1
-      issues:
-        trackerName: JIRA
-        regexp: '(.*?)\b\(?(Jira|JIRA|jira)?\s+([A-Za-z]{2,5}\d*-\d+)\)?'
-        keyGroupIndex: 3
-        summaryGroupIndex: 1
-        trackerUrl: https://jira.ccdc.cam.ac.uk/issues
-        aggregate: true
-        aggregationStatus: RELEASED
-    buildName: '$(Build.DefinitionName)'
-    buildNumber: '$(Build.BuildNumber)-$(artifactory.platformName)'
-  displayName: 'Collect issues'
+#### The new artifactory doesn't support sorting, so we can't do this task for now
+## Upload artifactory build info
+#- task: ArtifactoryCollectIssues@1
+#  inputs:
+#    artifactoryService: 'devops-ccdc-3rd-party'
+#    configSource: 'taskConfiguration'
+#    taskConfig: |
+#      version: 1
+#      issues:
+#        trackerName: JIRA
+#        regexp: '(.*?)\b\(?(Jira|JIRA|jira)?\s+([A-Za-z]{2,5}\d*-\d+)\)?'
+#        keyGroupIndex: 3
+#        summaryGroupIndex: 1
+#        trackerUrl: https://jira.ccdc.cam.ac.uk/issues
+#        aggregate: true
+#        aggregationStatus: RELEASED
+#    buildName: '$(Build.DefinitionName)'
+#    buildNumber: '$(Build.BuildNumber)-$(artifactory.platformName)'
+#  displayName: 'Collect issues'
 
 - powershell: |
     $filename = Get-ChildItem -Path $(Build.ArtifactStagingDirectory) -Filter *.tar.gz | Select-Object -ExpandProperty Name