Changeset 37772 for other-projects

Timestamp:

2023-06-15T20:28:30+12:00 (12 months ago)

Author:

anupama

Message:

1. Mac Monterey binary is now to be uploaded nightly, replacing (Snow) Leopard and (Mountain) Lion Mac binaries which we don't generate any more. 2. Some cumulative changes since last time, mainly to do with testing variables are set in php, and MacMojave IsisGdl binary, which works for Monterey iff it's pulled in and used for Monterey, as I've now tested the CDS-ISIS tutorial on the Mac Monterey with both regular GLI and WebSwing GLI.

File:

• other-projects/nightly-tasks/crons-and-scripts/caveat-emptor/index.php (modified) (14 diffs)

other-projects/nightly-tasks/crons-and-scripts/caveat-emptor/index.php

@@ -31 +31 @@
 
       //chdir("/greenstone/greenstone.org/base/caveat-emptor");
-if ( $_GET['latest'] ) {
+if ( isset($_GET['latest']) ) {
   chdir("/greenstone/greenstone.org/base/caveat-emptor/latest");
  } else {
@@ -40 +40 @@
 $todayFiles = array();
 
-if ( $_GET['offset']) {
+if ( isset($_GET['offset'])) {
     $todayStart = strtotime(date("Y-m-d",strtotime($_GET['offset'] . " days")));
 } else {
@@ -49 +49 @@
 $today = date("Y.m.d", $todayStart);
 $todayWithHyphens = date("Y-m-d", $todayStart);
-
 $nextRelease2 = trim(file_get_contents("/greenstone/greenstone.org/base/next-release.txt"));
 $nextRelease3 = trim(file_get_contents("/greenstone/greenstone.org/base/next-release-greenstone3.txt"));
@@ -56 +55 @@
     if ( substr($file,0,1) == "." ) continue;
     if ( $file === "index.php" ) continue;
-    if ( $_GET['latest'] ) {      
+    if ( $file === "latest" ) continue;
+    if ( isset($_GET['latest']) ) {   
       $todayFiles[$file] = true;
       continue;
@@ -105 +105 @@
 }
 
-function show( $file, $forceShow, $extra_info, $rename ) {
+function show( $file, $forceShow = false, $extra_info = NULL, $rename = NULL ) {
     global $todayFiles;
 
-    if ( $_GET['latest'] ) {
+    if ( isset($_GET['latest']) ) {
       //echo "XXX $file";
 
@@ -130 +130 @@
 
     if ( file_exists($file) || $forceShow ) {
-      if ( $_GET['latest'] ) {
+      if ( isset($_GET['latest']) ) {
 
         $filepath="latest/".$file;
@@ -139 +139 @@
 <tr>
         <td><a href="<?php echo $filepath; ?>"><?php if($rename) { echo $rename; } else { echo $file; } ?></a><?php if($extra_info) { echo " - ".$extra_info; } ?></td>
-    <td><?php echo date("h:ia",filemtime($file)); ?></td>
-    <td><?php echo formatBytes(filesize($file)); ?></td>
+    <td><?php if (file_exists($file)) {echo date("h:ia",filemtime($file));}  ?></td>
+    <td><?php if (file_exists($file)) {echo formatBytes(filesize($file));} ?></td>
 </tr>
 <?php
@@ -171 +171 @@
     // in the latest folder, display the bin/src link for any available date 
     // (there should only be one)
-    if($_GET['latest']) {
+    if(isset($_GET['latest'])) {
       $regex = preg_replace( "/\d{4}.\d{2}\.\d{2}/", "\d{4}.\d{2}.\d{2}", $regex );
     }
@@ -186 +186 @@
 
 //show time machine
-if ($_GET['latest'] ) {
+if (isset($_GET['latest']) ) {
   echo "latest ";
 } else {
@@ -193 +193 @@
 for ( $i=4; $i>=0; $i-- ) {
         $d = date("Y-m-d",strtotime("-$i days"));
-        if ( $d == $todayWithHyphens && ! $_GET['latest']) {
+        if ( $d == $todayWithHyphens && ! isset($_GET['latest'])) {
                 echo $d;
         } else {
@@ -210 +210 @@
 show("Greenstone-$nextRelease3-candidate-$today-windows.exe");
 showAllMatching("Greenstone-$nextRelease3-candidate-$today-MacOS-intel.dmg", 0, "for (Snow) Leopards (v10.5-10.6)", "Greenstone-$nextRelease3-candidate-$today-Leopard-MacOS-intel.dmg");
-show("Greenstone-$nextRelease3-candidate-$today-Lion-MacOS-intel.dmg", 0, "for (Mountain) Lions (v10.7-10.8)");
+//show("Greenstone-$nextRelease3-candidate-$today-Lion-MacOS-intel.dmg", 0, "for (Mountain) Lions (v10.7-10.8)");
+show("Greenstone-$nextRelease3-candidate-$today-Monterey-MacOS-intel.dmg", 0, "for Monterey (MacOS v12)");
 //this picks up similar releases of other version numbers lying around
 showAllMatching("Greenstone-3\..*-candidate-$today-linux$");
 showAllMatching("Greenstone-3\..*-candidate-$today-windows.exe$");
-showAllMatching("Greenstone-3\..*-candidate-$today-MacOS-intel.dmg$", 0, "for (Snow) Leopards (v10.5-10.6)");
-showAllMatching("Greenstone-3\..*-candidate-$today-Lion-MacOS-intel.dmg$", 0, "for (Mountain) Lions (v10.7-10.8)");
+//showAllMatching("Greenstone-3\..*-candidate-$today-MacOS-intel.dmg$", 0, "for (Snow) Leopards (v10.5-10.6)");
+//showAllMatching("Greenstone-3\..*-candidate-$today-Lion-MacOS-intel.dmg$", 0, "for (Mountain) Lions (v10.7-10.8)");
+showAllMatching("Greenstone-3\..*-candidate-$today-Monterey-MacOS-intel.dmg$", 0, "for Monterey (MacOS v12)");
 gap();
 
@@ -230 +232 @@
 show("Greenstone-$nextRelease2-candidate-$today-windows.exe");
 showAllMatching("Greenstone-$nextRelease2-candidate-$today-MacOS-intel.dmg", 0, "for (Snow) Leopards (v10.5-10.6)","Greenstone-$nextRelease2-candidate-$today-Leopard-MacOS-intel.dmg");
-show("Greenstone-$nextRelease2-candidate-$today-Lion-MacOS-intel.dmg", 0, "for (Mountain) Lions (v10.7-10.8)");
+//show("Greenstone-$nextRelease2-candidate-$today-Lion-MacOS-intel.dmg", 0, "for (Mountain) Lions (v10.7-10.8)");
+show("Greenstone-$nextRelease2-candidate-$today-Monterey-MacOS-intel.dmg", 0, "for Monterey (MacOS v12)");
 
 showAllMatching("Greenstone-2\..*-candidate-$today-linux$");
 showAllMatching("Greenstone-2\..*-candidate-$today-linux-x64$");
 showAllMatching("Greenstone-2\..*-candidate-$today-windows.exe$");
-showAllMatching("Greenstone-2\..*-candidate-$today-MacOS-intel.dmg$", 0, "for Snow Leopards (v10.5-10.6)");
-showAllMatching("Greenstone-2\..*-candidate-$today-Lion-MacOS-intel.dmg$", 0, "for (Mountain) Lions (v10.7-10.8)");
+//showAllMatching("Greenstone-2\..*-candidate-$today-MacOS-intel.dmg$", 0, "for Snow Leopards (v10.5-10.6)");
+//showAllMatching("Greenstone-2\..*-candidate-$today-Lion-MacOS-intel.dmg$", 0, "for (Mountain) Lions (v10.7-10.8)");
+showAllMatching("Greenstone-2\..*-candidate-$today-Monterey-MacOS-intel.dmg$", 0, "for Monterey (MacOS v12)");
 gap();
 
@@ -247 +251 @@
 
 heading("Documented Examples" );
-show("Greenstone-documented-examples-$today.tar.gz");
-show("Greenstone-documented-examples-$today.zip");
-gap();
-
-if ( ! $_GET['latest'] ) {
+show("Greenstone3-documented-examples-$today.tar.gz");
+show("Greenstone3-documented-examples-$today.zip");
+gap();
+
+if ( !isset( $_GET['latest']) ) {
   heading("Nightly Build Logs");
   showAllMatching("\.txt$");
@@ -266 +270 @@
 show("IsisGdl.bin32", 1,"","IsisGdl.linux32"); // temporary
 show("IsisGdl.macleopard", 1); // temporary
+show("IsisGdl.mac64mojave", 1); // temporary
 gap();