Configure for Conda-build - update distribution config files

trevorsandy · Sep 3, 2023 · e6b2b84 · e6b2b84
1 parent 527373d
commit e6b2b84
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 57 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.3546
+pkgver=2.4.7.3547
 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.3546
+pkgver=2.4.7.3547
 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.3546) debian; urgency=medium
+lpub3d (2.4.7.3547) debian; urgency=medium
 
-  * LPub3D version 2.4.7.70.3546_20230903 for Linux
+  * LPub3D version 2.4.7.71.3547_20230903 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 03 Sep 2023 23:55:38 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 03 Sep 2023 23:58:19 +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.3546
+Version: 2.4.7.3547
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3546
+Version: 2.4.7.3547
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sun Sep 03 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3546
+* Sun Sep 03 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3547
 - 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.3546) debian; urgency=medium
+lpub3d (2.4.7.3547) debian; urgency=medium
 
-  * LPub3D version 2.4.7.70.3546_20230903 for Linux
+  * LPub3D version 2.4.7.71.3547_20230903 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 03 Sep 2023 23:55:40 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 03 Sep 2023 23:58:21 +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.3546
+Version: 2.4.7.3547
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3546
+Version: 2.4.7.3547
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sun Sep 03 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3546
+* Sun Sep 03 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.7.3547
 - 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/json/complete.json b/builds/utilities/json/complete.json
@@ -1,34 +1,39 @@
 {
   "updates": {
     "windows": {
-	  "download-name": "complete.zip",
-		  "open-url": "https://www.ldraw.org/direct-parts-access",
-			"download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
     },
     "windows-exe": {
-	  "download-name": "complete.zip",
-		  "open-url": "https://www.ldraw.org/direct-parts-access",
-			"download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
     },
+    "windows-conda": {
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    },	
     "macos-dmg": {
-	  "download-name": "complete.zip",
-		  "open-url": "https://www.ldraw.org/direct-parts-access",
-			"download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
     },
     "linux-deb": {
-	  "download-name": "complete.zip",
-		  "open-url": "https://www.ldraw.org/direct-parts-access",
-			"download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
     },
     "linux-rpm": {
-	  "download-name": "complete.zip",
-		  "open-url": "https://www.ldraw.org/direct-parts-access",
-			"download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
     },
     "linux-pkg": {
-	  "download-name": "complete.zip",
-		  "open-url": "https://www.ldraw.org/direct-parts-access",
-			"download-url": "https://library.ldraw.org/library/updates/complete.zip"
+    "download-name": "complete.zip",
+    "open-url": "https://www.ldraw.org/direct-parts-access",
+      "download-url": "https://library.ldraw.org/library/updates/complete.zip"
     },
     "linux-api": {
     "download-name": "complete.zip",

diff --git a/builds/utilities/json/lpub3dldrawunf.json b/builds/utilities/json/lpub3dldrawunf.json
@@ -1,32 +1,37 @@
 {
   "updates": {
     "windows": {
-	  "download-name": "lpub3dldrawunf.zip",
+      "download-name": "lpub3dldrawunf.zip",
       "open-url": "https://www.ldraw.org/direct-parts-access",
     "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
     },
     "windows-exe": {
-	  "download-name": "lpub3dldrawunf.zip",
+      "download-name": "lpub3dldrawunf.zip",
       "open-url": "https://www.ldraw.org/direct-parts-access",
     "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
     },
+    "windows-conda": {
+      "download-name": "lpub3dldrawunf.zip",
+      "open-url": "https://www.ldraw.org/direct-parts-access",
+    "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
+    },	
     "macos-dmg": {
-	  "download-name": "lpub3dldrawunf.zip",
+      "download-name": "lpub3dldrawunf.zip",
       "open-url": "https://www.ldraw.org/direct-parts-access",
     "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
     },
     "linux-deb": {
-	  "download-name": "lpub3dldrawunf.zip",
+      "download-name": "lpub3dldrawunf.zip",
       "open-url": "https://www.ldraw.org/direct-parts-access",
     "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
     },
     "linux-rpm": {
-	  "download-name": "lpub3dldrawunf.zip",
+      "download-name": "lpub3dldrawunf.zip",
       "open-url": "https://www.ldraw.org/direct-parts-access",
     "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
     },
     "linux-pkg": {
-	  "download-name": "lpub3dldrawunf.zip",
+      "download-name": "lpub3dldrawunf.zip",
       "open-url": "https://www.ldraw.org/direct-parts-access",
     "download-url": "https://library.ldraw.org/library/unofficial/ldrawunf.zip"
     },

diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 7 70 3546 1283dfa2d
+2 4 7 71 3547 527373da8
diff --git a/builds/windows/CreateExePkg.bat b/builds/windows/CreateExePkg.bat
@@ -2,7 +2,7 @@
 Title Create windows installer and portable package archive LPub3D distributions
 rem --
 rem  Trevor SANDY <trevor.sandy@gmail.com>
-rem  Last Update: Jun 03, 2022
+rem  Last Update: September 04, 2022
 rem  Copyright (C) 2015 - 2023 by Trevor SANDY
 rem --
 rem This script is distributed in the hope that it will be useful,
@@ -823,6 +823,15 @@ SET genLPub3DUpdates=%updatesFile% ECHO
 >>%genLPub3DUpdates%       "available-versions": "%LP3D_AVAILABLE_VERSIONS_exe%",
 >>%genLPub3DUpdates%       "alt-version-gen-placeholder-windows": {}
 >>%genLPub3DUpdates%     },
+>>%genLPub3DUpdates%     "windows-conda": {
+>>%genLPub3DUpdates%       "open-url": "%LP3D_GITHUB_BASE%/releases/tag/%LP3D_VER_TAG_NAME%/",
+>>%genLPub3DUpdates%       "latest-version": "%LP3D_VERSION%",
+>>%genLPub3DUpdates%       "latest-revision": "%LP3D_VER_REVISION%",
+>>%genLPub3DUpdates%       "download-url": "%LP3D_GITHUB_BASE%/releases/download/%LP3D_VER_TAG_NAME%/LPub3D-%LP3D_APP_VERSION_LONG%-%LP3D_ARCH%.tar.bz2",
+>>%genLPub3DUpdates%       "changelog-url": "%LP3D_SOURCEFORGE_UPDATE_BASE%/release_notes_%LP3D_VERSION%.%LP3D_VER_REVISION%.html",
+>>%genLPub3DUpdates%       "available-versions": "%LP3D_AVAILABLE_VERSIONS_flp%",
+>>%genLPub3DUpdates%       "alt-version-gen-placeholder-windows-conda": {}
+>>%genLPub3DUpdates%     }
 >>%genLPub3DUpdates%     "macos-dmg": {
 >>%genLPub3DUpdates%       "open-url": "%LP3D_GITHUB_BASE%/releases/tag/%LP3D_VER_TAG_NAME%/",
 >>%genLPub3DUpdates%       "latest-version": "%LP3D_VERSION%",

diff --git a/gitversion.pri b/gitversion.pri
@@ -44,7 +44,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 = 70
+        GIT_REVISION = 71
         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}
@@ -72,7 +72,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 = 3546
+            GIT_COMMIT = 3547
             message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -120,7 +120,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}.70.3546.1283dfa2d
+            GIT_VERSION = $${VERSION}.71.3547.527373da8
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.7.70.3546 (03 09 2023 23:55:40)
+LPub3D 2.4.7.71.3547 (03 09 2023 23:58:21)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -17,7 +17,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.7.70.3546 (03 09 2023 23:55:40)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.7.71.3547 (03 09 2023 23:58:21)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><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.70.3546
-;; Last Update.: Sun, 03 Sep 2023 23:55:40 +0200
+;; Version.....: 2.4.7.71.3547
+;; Last Update.: Sun, 03 Sep 2023 23:58:21 +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.3546" date="2023-09-03">
+            <release version="2.4.7.3547" date="2023-09-03">
                 <description>
-                    <p>LPub3D 03.09.2023 v2.4.7 r70 Continuous Build.
+                    <p>LPub3D 03.09.2023 v2.4.7 r71 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.

diff --git a/qsimpleupdater/src/updater.cpp b/qsimpleupdater/src/updater.cpp
@@ -79,21 +79,31 @@ Updater::Updater()
     m_downloader = new Downloader();
     m_manager = new QNetworkAccessManager();
 
+// LPub3D Mod
 #if defined Q_OS_WIN
+#if defined LP3D_CONDA
+    m_platform = "windows-conda";
+#else
     m_platform = "windows-exe";
+#endif
 #elif defined Q_OS_MAC
-    m_platform = "macos-dmg";
+    m_platform = QLatin1String("macos-dmg");
 #elif defined Q_OS_LINUX
-  #if defined DISTRO_PACKAGE
-      m_platform = QString("linux-%1").arg(DISTRO_PACKAGE);
-  #else
-      m_platform = "linux";
-  #endif
+#if defined LP3D_APPIMAGE
+    m_platform = QLatin1String("linux-api");
+#elif defined LP3D_SNAP
+    m_platform = QLatin1String("linux-snp");
+#elif defined LP3D_FLATPACK
+    m_platform = QLatin1String("linux-flp");
+#else
+    m_platform = QLatin1String("linux");
+#endif
 #elif defined Q_OS_ANDROID
-    m_platform = "android";
+    m_platform = QLatin1String("android");
 #elif defined Q_OS_IOS
-    m_platform = "ios";
+    m_platform = QLatin1String("ios");
 #endif
+// End Mod
 
     //qDebug() << qPrintable(QString("DISTRO_PACKAGE_CODE (m_platform): %1").arg(m_platform));