From f12ad7a6fca5dc64f4d8db7f1caac6f58431f167 Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Sun, 28 May 2023 18:24:52 +0200 Subject: [PATCH] Blender LDraw Render - use SHELL macros #416 --- builds/linux/obs/PKGBUILD | 2 +- builds/linux/obs/alldeps/PKGBUILD | 2 +- builds/linux/obs/alldeps/debian/changelog | 6 +++--- builds/linux/obs/alldeps/debian/lpub3d.dsc | 2 +- builds/linux/obs/alldeps/lpub3d.spec | 4 ++-- builds/linux/obs/debian/changelog | 6 +++--- builds/linux/obs/debian/lpub3d.dsc | 2 +- builds/linux/obs/lpub3d.spec | 4 ++-- builds/utilities/version.info | 2 +- gitversion.pri | 6 +++--- mainApp/blenderpreferences.cpp | 4 ++-- mainApp/docs/README.txt | 2 +- mainApp/docs/RELEASE_NOTES.html | 2 +- mainApp/extras/LPub3D_Npp_UDL.xml | 4 ++-- mainApp/renderdialog.cpp | 4 ++-- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index eb065c0d5..ecf6b3769 100755 --- 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.6.3381 +pkgver=2.4.6.3382 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 index 821e248aa..012c062a5 100644 --- 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.6.3381 +pkgver=2.4.6.3382 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 index c177b60e1..b9ad71011 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3381) debian; urgency=medium +lpub3d (2.4.6.3382) debian; urgency=medium - * LPub3D version 2.4.6.270.3381_20230528 for Linux + * LPub3D version 2.4.6.271.3382_20230528 for Linux - -- Trevor SANDY Sun, 28 May 2023 18:22:50 +0200 + -- Trevor SANDY Sun, 28 May 2023 18:24:55 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index f77d2e63f..983172dd1 100644 --- 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.6.3381 +Version: 2.4.6.3382 Maintainer: Trevor SANDY 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 index 12c542f27..c9c13f549 100644 --- 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.6.3381 +Version: 2.4.6.3382 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -797,7 +797,7 @@ update-desktop-database || true %endif %changelog -* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3381 +* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3382 - 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 index afc41bf3f..10b30a20a 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3381) debian; urgency=medium +lpub3d (2.4.6.3382) debian; urgency=medium - * LPub3D version 2.4.6.270.3381_20230528 for Linux + * LPub3D version 2.4.6.271.3382_20230528 for Linux - -- Trevor SANDY Sun, 28 May 2023 18:22:52 +0200 + -- Trevor SANDY Sun, 28 May 2023 18:24:57 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 7913a104e..b176fe4b6 100755 --- 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.6.3381 +Version: 2.4.6.3382 Maintainer: Trevor SANDY 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 index 3258039e7..d8f9d7120 100755 --- 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.6.3381 +Version: 2.4.6.3382 Release: 1%{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -313,7 +313,7 @@ update-desktop-database || true %endif %changelog -* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3381 +* Sun May 28 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3382 - 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 index 657543b3d..41d25c811 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 270 3381 d540c6e85 +2 4 6 271 3382 90e16db6e diff --git a/gitversion.pri b/gitversion.pri index d037751bc..2eb373ef2 100644 --- 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 = 270 + GIT_REVISION = 271 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 = 3381 + GIT_COMMIT = 3382 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}.270.3381.d540c6e85 + GIT_VERSION = $${VERSION}.271.3382.90e16db6e message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/mainApp/blenderpreferences.cpp b/mainApp/blenderpreferences.cpp index 8113e5094..ff61043ca 100644 --- a/mainApp/blenderpreferences.cpp +++ b/mainApp/blenderpreferences.cpp @@ -1060,9 +1060,9 @@ void BlenderPreferences::configureBlenderAddon(bool testBlender) QThread::sleep(1); #ifdef Q_OS_WIN - shellProgram = QLatin1String("cmd.exe"); + shellProgram = QLatin1String(WINDOWS_SHELL); #else - shellProgram = QLatin1String("/bin/sh"); + shellProgram = QLatin1String(UNIX_SHELL); #endif ProcEnc result = processCommand(PR_TEST); bool testOk = result != PR_FAIL; diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index aec0b6f56..f79ac8c8b 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.270.3381 (28 05 2023 18:22:52) +LPub3D 2.4.6.271.3382 (28 05 2023 18:24:57) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index f95c1e9da..36dc4c105 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.270.3381 (28 05 2023 18:22:52)

+

LPub3D 2.4.6.271.3382 (28 05 2023 18:24:57)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 410696ee3..4deaf5fea 100644 --- 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.6.270.3381 -;; Last Update.: Sun, 28 May 2023 18:22:52 +0200 +;; Version.....: 2.4.6.271.3382 +;; Last Update.: Sun, 28 May 2023 18:24:57 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY diff --git a/mainApp/renderdialog.cpp b/mainApp/renderdialog.cpp index b9d045752..b065a10d5 100644 --- a/mainApp/renderdialog.cpp +++ b/mainApp/renderdialog.cpp @@ -643,9 +643,9 @@ void RenderDialog::on_RenderButton_clicked() QThread::sleep(2); #ifdef Q_OS_WIN - shellProgram = QLatin1String("cmd.exe"); + shellProgram = QLatin1String(WINDOWS_SHELL); #else - shellProgram = QLatin1String("/bin/sh"); + shellProgram = QLatin1String(UNIX_SHELL); #endif mProcess = new RenderProcess(this);