From 51f3bf6f78dfea5f6e272f1bfb18cc9fef686485 Mon Sep 17 00:00:00 2001 From: wmaddisn Date: Wed, 20 Sep 2017 09:21:56 -0700 Subject: [PATCH 1/3] Resetting to prerelease for 3.31+ --- Source/mesquite/Mesquite.java | 4 ++-- Source/mesquite/lib/MesquiteModule.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/mesquite/Mesquite.java b/Source/mesquite/Mesquite.java index 71c3379de..9a27cde61 100644 --- a/Source/mesquite/Mesquite.java +++ b/Source/mesquite/Mesquite.java @@ -42,7 +42,7 @@ public String getCitation() { } /*.................................................................................................................*/ public String getVersion() { - return "3.31"; + return "3.31+"; } /*.................................................................................................................*/ @@ -70,7 +70,7 @@ public String getHomePhoneNumber(){ //See Installer for updates.xml URLs /*.................................................................................................................*/ public boolean isPrerelease(){ - return false; + return true; } /*.................................................................................................................*/ public void getEmployeeNeeds(){ //This gets called on startup to harvest information; override this and inside, call registerEmployeeNeed diff --git a/Source/mesquite/lib/MesquiteModule.java b/Source/mesquite/lib/MesquiteModule.java index cf72b0641..ba29dd43c 100644 --- a/Source/mesquite/lib/MesquiteModule.java +++ b/Source/mesquite/lib/MesquiteModule.java @@ -73,7 +73,7 @@ public final static String getBuildDate() { /*.................................................................................................................*/ /** returns version of the Mesquite system */ public final static String getMesquiteVersion() { - return "3.31"; + return "3.31+"; } /*.................................................................................................................*/ /** returns letter in the build number of the Mesquite system (e.g., "e" of "e58") */ @@ -86,7 +86,7 @@ public final static String getBuildLetter() { public final static int getBuildNumber() { //as of 26 Dec 08, build naming changed from letter + number to just number. Accordingly j105 became 473, based on // highest build numbers of d51+e81+g97+h66+i69+j105 + 3 for a, b, c - return 858; + return 859; } //0.95.80 14 Mar 01 - first beta release //0.96 2 April 01 beta - second beta release From 96ba8e090819034d75fc0908149d694045446436 Mon Sep 17 00:00:00 2001 From: wmaddisn Date: Wed, 20 Sep 2017 14:16:46 -0700 Subject: [PATCH 2/3] Build 859: Fix bug in install package --- Source/mesquite/Mesquite.java | 6 +++--- Source/mesquite/lib/MesquiteModule.java | 2 +- Source/mesquite/lib/PhoneHomeUtil.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/mesquite/Mesquite.java b/Source/mesquite/Mesquite.java index 9a27cde61..14c8cb3fc 100644 --- a/Source/mesquite/Mesquite.java +++ b/Source/mesquite/Mesquite.java @@ -42,7 +42,7 @@ public String getCitation() { } /*.................................................................................................................*/ public String getVersion() { - return "3.31+"; + return "3.31"; } /*.................................................................................................................*/ @@ -70,7 +70,7 @@ public String getHomePhoneNumber(){ //See Installer for updates.xml URLs /*.................................................................................................................*/ public boolean isPrerelease(){ - return true; + return false; } /*.................................................................................................................*/ public void getEmployeeNeeds(){ //This gets called on startup to harvest information; override this and inside, call registerEmployeeNeed @@ -1774,7 +1774,7 @@ else if (checker.compare(this.getClass(), "Crashes with a NullPointerException", logln("This will crash: " +mi.getValue()); } else if (checker.compare(this.getClass(), "Checks for notices or installs at the location specified", null, commandName, "checkNotices")) { - noticeLocation = MesquiteString.queryString(containerOfModule(), "Notices Location", "Indicate URL to notices file to be checked. (For instance, for Mesquite the default notices file is at " + getHomePhoneNumber() + ")", noticeLocation); + noticeLocation = MesquiteString.queryString(containerOfModule(), "Notices Location", "Indicate URL to notices file to be checked. (For instance, for Mesquite the default notices file is at " + getHomePhoneNumber() + ")\n\nNote: There may be a delay as Mesquite waits for the response from the server.", noticeLocation); PhoneHomeUtil.checkForNotices(noticeLocation); PhoneHomeUtil.adHocRecord = null; resetAllMenuBars(); diff --git a/Source/mesquite/lib/MesquiteModule.java b/Source/mesquite/lib/MesquiteModule.java index ba29dd43c..12baa2a87 100644 --- a/Source/mesquite/lib/MesquiteModule.java +++ b/Source/mesquite/lib/MesquiteModule.java @@ -73,7 +73,7 @@ public final static String getBuildDate() { /*.................................................................................................................*/ /** returns version of the Mesquite system */ public final static String getMesquiteVersion() { - return "3.31+"; + return "3.31"; } /*.................................................................................................................*/ /** returns letter in the build number of the Mesquite system (e.g., "e" of "e58") */ diff --git a/Source/mesquite/lib/PhoneHomeUtil.java b/Source/mesquite/lib/PhoneHomeUtil.java index 7978a7881..f7906e110 100644 --- a/Source/mesquite/lib/PhoneHomeUtil.java +++ b/Source/mesquite/lib/PhoneHomeUtil.java @@ -499,7 +499,7 @@ private static String handleMessages(boolean adHoc, String noticesFromHome, Mesq int lastNotice = phoneHomeRecord.getLastNotice(); int lastVersionNoticed = phoneHomeRecord.getLastVersionNoticed(); - String name = mmi.getName(); + //String name = mmi.getName(); Element root = XMLUtil.getRootXMLElementFromString("mesquite",noticesFromHome); if (root==null) From 4aef83d70c5ffdd60ebc2d539f54ddc8a6e0182b Mon Sep 17 00:00:00 2001 From: wmaddisn Date: Wed, 20 Sep 2017 14:21:42 -0700 Subject: [PATCH 3/3] Build 859 - updating notices file --- noticesAndUpdates/notices.xml | 38 +++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/noticesAndUpdates/notices.xml b/noticesAndUpdates/notices.xml index d70d68a93..d9ada2594 100644 --- a/noticesAndUpdates/notices.xml +++ b/noticesAndUpdates/notices.xml @@ -1,101 +1,109 @@ - 19 + 20 1 3.31 - 858 + 859 331 http://mesquiteproject.wikispaces.com/Installation + + 331 + 858 + 21 + alert + here]]> + 330 - 20 + 21 alert here]]> 320 - 20 + 21 alert here]]> 311 - 20 + 21 alert here]]> 310 - 20 + 21 alert here]]> 304 - 20 + 21 alert here]]> 303 - 20 + 21 alert here]]> 302 - 20 + 21 alert here]]> 301 - 20 + 21 alert here]]> 300 - 20 + 21 alert OLD version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from here]]> 273 - 20 + 21 alert VERY OLD version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from here]]> 274 - 20 + 21 alert VERY OLD version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from here]]> 275 - 20 + 21 alert VERY VERY OLD version of Mesquite. The current version is 3.31. We strongly urge that you update to a new version by downloading it from here]]> 201 - 20 + 21 alert This notice is to inform you that Mesquite now checks its web site for notices to users (such as this one) when it starts up. This should not cause a delay (if it does, please inform us). We anticipate notices will be given rarely, when there is an update available or an important bug to tell you about.