Blender LDraw Render - fix download version check #416

trevorsandy · Jul 7, 2023 · 28b06b3 · 28b06b3
1 parent b19b90b
commit 28b06b3
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 31 deletions.
diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.7.3499
+pkgver=2.4.7.3500
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.7.3499
+pkgver=2.4.7.3500
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.7.3499) debian; urgency=medium
+lpub3d (2.4.7.3500) debian; urgency=medium
 
-  * LPub3D version 2.4.7.23.3499_20230707 for Linux
+  * LPub3D version 2.4.7.24.3500_20230707 for Linux
 
- -- Trevor SANDY <[email protected]>  Fri, 07 Jul 2023 03:43:46 +0200
+ -- Trevor SANDY <[email protected]>  Fri, 07 Jul 2023 03:46:05 +0200
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.7.3499
+Version: 2.4.7.3500
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.7.3499
+Version: 2.4.7.3500
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Fri Jul 07 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3499
+* Fri Jul 07 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3500
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.7.3499) debian; urgency=medium
+lpub3d (2.4.7.3500) debian; urgency=medium
 
-  * LPub3D version 2.4.7.23.3499_20230707 for Linux
+  * LPub3D version 2.4.7.24.3500_20230707 for Linux
 
- -- Trevor SANDY <[email protected]>  Fri, 07 Jul 2023 03:43:48 +0200
+ -- Trevor SANDY <[email protected]>  Fri, 07 Jul 2023 03:46:06 +0200
diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.7.3499
+Version: 2.4.7.3500
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.7.3499
+Version: 2.4.7.3500
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Fri Jul 07 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3499
+* Fri Jul 07 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3500
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 7 23 3499 c70d7f8c1
+2 4 7 24 3500 b19b90b9b
diff --git a/gitversion.pri b/gitversion.pri
@@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) {
 
     # Check if we do not have a valid version number (i.e. no version tag found)
     isEmpty(GIT_VERSION) {
-        GIT_REVISION = 23
+        GIT_REVISION = 24
         GIT_SHA      = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
         GIT_COMMIT   = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         GIT_VERSION  = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
@@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) {
         # Get commit count
         GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         isEmpty(GIT_COMMIT) {
-            GIT_COMMIT = 3499
+            GIT_COMMIT = 3500
             message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
             GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
         } else {
             message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
-            GIT_VERSION = $${VERSION}.23.3499.c70d7f8c1
+            GIT_VERSION = $${VERSION}.24.3500.b19b90b9b
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/blenderpreferences.cpp b/mainApp/blenderpreferences.cpp
@@ -1353,13 +1353,14 @@ bool BlenderPreferences::getBlenderAddon(const QString &blenderDir)
             QString const addonVersionFile = QString("addons/%1/__version__.py").arg(BLENDER_RENDER_ADDON_FOLDER);
             zip.setCurrentFile(addonVersionFile);
             QuaZipFile file(&zip);
-            // check if legacy addon
-            if (!file.open(QIODevice::ReadOnly))
-                zip.setCurrentFile(QLatin1String("addons/io_scene_lpub3d_renderldraw/__version__.py"));
             if (!file.open(QIODevice::ReadOnly)) {
-                emit gui->messageSig(LOG_WARNING, QObject::tr("Cannot read addon archive version file: [%1]<br>%2.")
-                                                              .arg(addonVersionFile).arg(file.errorString()));
-                return false; // Download new archive
+                // check if legacy addon
+                zip.setCurrentFile(QLatin1String("addons/io_scene_lpub3d_renderldraw/__version__.py"));
+                if (!file.open(QIODevice::ReadOnly)) {
+                    emit gui->messageSig(LOG_WARNING, QObject::tr("Cannot read addon archive version file: [%1]<br>%2.")
+                                                                  .arg(addonVersionFile).arg(file.errorString()));
+                    return false; // Download new archive
+                }
             }
             ba = file.readAll();
             file.close();
@@ -2235,7 +2236,7 @@ void BlenderPreferences::loadSettings()
         Preferences::setBlenderImportModule(QString());
     }
 
-    QString const blenderDir = QString("%1/Blender").arg(Preferences::lpub3d3rdPartyConfigDir);
+    QString const blenderDir = QDir::toNativeSeparators(QString("%1/Blender").arg(Preferences::lpub3d3rdPartyConfigDir));
 
     if (!QDir(QString("%1/addons/%2").arg(blenderDir).arg(BLENDER_RENDER_ADDON_FOLDER)).isReadable())
         Preferences::setBlenderImportModule(QString());

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.7.23.3499 (07 07 2023 03:43:48)
+LPub3D 2.4.7.24.3500 (07 07 2023 03:46:06)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -18,7 +18,7 @@
   <tr>
     <th class="tg-0pky">
       <h4><a id="LPub3D_0"></a>LPub3D 2.4.7.4.3710 (23 06 2023 15:38:49)</h4>
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.7.23.3499 (07 07 2023 03:43:48)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.7.24.3500 (07 07 2023 03:46:06)</h4>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>
              Follow the links in the list below to review additional details for<br>

diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml
@@ -14,8 +14,8 @@
 ;;
 ;; Author......: Trevor SANDY
 ;; Name........: LPub3D_Npp_UDL.xml
-;; Version.....: 2.4.7.23.3499
-;; Last Update.: Fri, 07 Jul 2023 03:43:48 +0200
+;; Version.....: 2.4.7.24.3500
+;; Last Update.: Fri, 07 Jul 2023 03:46:06 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/lpub3d.appdata.xml b/mainApp/lpub3d.appdata.xml
@@ -78,9 +78,9 @@
             <binary>lpub3d24</binary>
         </provides>
         <releases>
-            <release version="2.4.7.3499" date="2023-07-07">
+            <release version="2.4.7.3500" date="2023-07-07">
                 <description>
-                    <p>LPub3D 07.07.2023 v2.4.7 r23 Continuous Build
+                    <p>LPub3D 07.07.2023 v2.4.7 r24 Continuous Build
                        Change - Custom parts with underscore in the name #730.
                        Change - MLCad Part unknown! PART line error after mpd file save #734.
                        Change - Relative justify vertical axis on outside placement #729.