From 0ba24afe3562139f982a091564c5d262f0bcd635 Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Tue, 31 May 2022 02:11:53 +0200 Subject: [PATCH] LPub3D v2.4.4 --- builds/check/build_checks.bat | 14 +- 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/utilities/ci/github/build-deploy.sh | 10 +- builds/utilities/ci/github/windows-build.bat | 134 +++++++++---------- builds/utilities/version.info | 2 +- builds/windows/AutoBuild.bat | 45 +++++-- builds/windows/CreateExePkg.bat | 23 ++-- gitversion.pri | 4 +- mainApp/docs/README.txt | 2 +- mainApp/docs/RELEASE_NOTES.html | 2 +- mainApp/lpub3d.appdata.xml | 4 +- 14 files changed, 130 insertions(+), 124 deletions(-) diff --git a/builds/check/build_checks.bat b/builds/check/build_checks.bat index b0f5f3b27..347c23667 100644 --- a/builds/check/build_checks.bat +++ b/builds/check/build_checks.bat @@ -3,7 +3,7 @@ Title LPub3D Windows build check script rem Trevor SANDY -rem Last Update: July 09, 2021 +rem Last Update: May 31, 2022 rem Copyright (C) 2018 - 2022 by Trevor SANDY rem -- rem This script is distributed in the hope that it will be useful, @@ -104,12 +104,12 @@ IF NOT EXIST "%PKG_TARGET%" ( ) ELSE ( ECHO -%PKG_TARGET_PDB% found. COPY /V /Y "%PKG_TARGET_PDB%" "%PKG_TARGET_DIR%\" /A | findstr /i /v /r /c:"copied\>" - ECHO. - ECHO -Copying %PACKAGE%.pdb to log assets.... - IF NOT EXIST %PKG_RUNLOG_DIR% ( - MKDIR %PKG_RUNLOG_DIR% - ) - COPY /V /Y "%PKG_TARGET_PDB%" "%PKG_RUNLOG_DIR%\%PACKAGE%_%PKG_PLATFORM%.pdb" /A | findstr /i /v /r /c:"copied\>" + REM ECHO. + REM ECHO -Copying %PACKAGE%.pdb to log assets.... + REM IF NOT EXIST %PKG_RUNLOG_DIR% ( + REM MKDIR %PKG_RUNLOG_DIR% + REM ) + REM COPY /V /Y "%PKG_TARGET_PDB%" "%PKG_RUNLOG_DIR%\%PACKAGE%_%PKG_PLATFORM%.pdb" /A | findstr /i /v /r /c:"copied\>" ) IF EXIST "%PKG_LOG_FILE%" DEL /Q "%PKG_LOG_FILE%" ECHO. diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index 42922f102..f3765bd25 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 - 2022 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.4.2670 +pkgver=2.4.4.2671 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 bbb42980a..bc58f5e54 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.4.2670) debian; urgency=medium +lpub3d (2.4.4.2671) debian; urgency=medium - * LPub3D version 2.4.4.0.2670_20220528 for Linux + * LPub3D version 2.4.4.0.2671_20220531 for Linux - -- Trevor SANDY Sat, 28 May 2022 12:14:09 +0200 + -- Trevor SANDY Tue, 31 May 2022 02:09:46 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 2f5f3dfec..a22d861ea 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.4.2670 +Version: 2.4.4.2671 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 33240a985..2c705be4b 100644 --- a/builds/linux/obs/alldeps/lpub3d.spec +++ b/builds/linux/obs/alldeps/lpub3d.spec @@ -116,7 +116,7 @@ BuildRequires: fdupes Summary: An LDraw Building Instruction Editor Name: lpub3d Icon: lpub3d.xpm -Version: 2.4.4.2670 +Version: 2.4.4.2671 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -733,5 +733,5 @@ update-mime-database /usr/share/mime >/dev/null || true update-desktop-database || true %endif -* Sat May 28 2022 - trevor.dot.sandy.at.gmail.dot.com 2.4.4.2670 +* Tue May 31 2022 - trevor.dot.sandy.at.gmail.dot.com 2.4.4.2671 - LPub3D Linux package (rpm) release diff --git a/builds/utilities/ci/github/build-deploy.sh b/builds/utilities/ci/github/build-deploy.sh index bedbb2ee2..22ecf7eed 100644 --- a/builds/utilities/ci/github/build-deploy.sh +++ b/builds/utilities/ci/github/build-deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash # Trevor SANDY -# Last Update May 25, 2022 +# Last Update May 31, 2022 # # This script is called from .github/workflows/build.yml # @@ -284,13 +284,7 @@ for LP3D_ASSET in ${LP3D_ASSETS}; do # Process individual release asset case ${LP3D_ASSET_EXT} in ".exe"|".pdb"|".zip"|".deb"|".rpm"|".zst"|".dmg"|".AppImage"|".html"|".txt") - if [ "${LP3D_ASSET_EXT}" = ".pdb" ]; then - LP3D_RELEASE=$(echo ${LP3D_ASSET/.pdb/-${LP3D_APP_VERSION_LONG}.pdb}) - ( mv -v "${LP3D_ASSET}" "${LP3D_RELEASE}" ) >$c.out 2>&1 && rm $c.out - [ -f $c.out ] && echo "WARNING - Rename ${LP3D_ASSET} failed." && tail -80 $c.out || echo "Ok." - else - LP3D_RELEASE=${LP3D_ASSET} - fi + LP3D_RELEASE=${LP3D_ASSET} SignHashAndPublishToGitHub ;; esac diff --git a/builds/utilities/ci/github/windows-build.bat b/builds/utilities/ci/github/windows-build.bat index 240a32b8d..1439d33f1 100644 --- a/builds/utilities/ci/github/windows-build.bat +++ b/builds/utilities/ci/github/windows-build.bat @@ -2,7 +2,7 @@ Title Setup and launch LPub3D auto build script rem -- rem Trevor SANDY -rem Last Update: May 24, 2022 +rem Last Update: May 31, 2022 rem Copyright (C) 2021 - 2022 by Trevor SANDY rem -- rem -- @@ -33,7 +33,8 @@ SET LP3D_UPDATES_PATH=%LP3D_BUILDPKG_PATH%\Updates CD %GITHUB_WORKSPACE% ECHO.%LP3D_COMMIT_MSG% | FIND /I "QUICK_BUILD" >NUL && ( - ECHO -NOTICE - Quick build detected, %~nx0 will not continue. + ECHO. + ECHO - NOTICE - Quick build detected, %~nx0 will not continue. GOTO :END ) @@ -44,6 +45,7 @@ ECHO.%LP3D_COMMIT_MSG% | FIND /I "UPDATE_LDRAW" >NUL && ( IF NOT EXIST "%LP3D_DIST_DIR_PATH%" ( MKDIR "%LP3D_DIST_DIR_PATH%" >NUL 2>&1 IF NOT EXIST "%LP3D_DIST_DIR_PATH%" ( + ECHO. ECHO - ERROR - Create %LP3D_DIST_DIR_PATH% failed GOTO :ERROR_END ) @@ -52,13 +54,15 @@ IF NOT EXIST "%LP3D_DIST_DIR_PATH%" ( IF NOT EXIST "%LP3D_LDRAW_DIR_PATH%" ( MKDIR "%LP3D_LDRAW_DIR_PATH%" >NUL 2>&1 IF NOT EXIST "%LP3D_LDRAW_DIR_PATH%" ( - ECHO -WARNING - Create %LP3D_LDRAW_DIR_PATH% failed + ECHO. + ECHO - WARNING - Create %LP3D_LDRAW_DIR_PATH% failed ) ) IF NOT EXIST "%LP3D_UPDATES_PATH%" ( MKDIR "%LP3D_UPDATES_PATH%" >NUL 2>&1 IF NOT EXIST "%LP3D_UPDATES_PATH%" ( + ECHO. ECHO - ERROR - Create %LP3D_UPDATES_PATH% failed GOTO :ERROR_END ) @@ -67,6 +71,7 @@ IF NOT EXIST "%LP3D_UPDATES_PATH%" ( IF NOT EXIST "%LP3D_DOWNLOADS_PATH%" ( MKDIR "%LP3D_DOWNLOADS_PATH%" >NUL 2>&1 IF NOT EXIST "%LP3D_DOWNLOADS_PATH%" ( + ECHO. ECHO - ERROR - Create %LP3D_DOWNLOADS_PATH% failed GOTO :ERROR_END ) @@ -77,7 +82,7 @@ IF NOT EXIST "%USERPROFILE%\LDraw" ( MKLINK /d %USERPROFILE%\LDraw %LP3D_LDRAW_DIR_PATH% 2>&1 ) ELSE ( ECHO. - ECHO -WARNING - %LP3D_LDRAW_DIR_PATH% path not defined + ECHO - WARNING - %LP3D_LDRAW_DIR_PATH% path not defined ) ) @@ -100,113 +105,103 @@ ECHO.%LP3D_COMMIT_MSG% | FIND /I "ALL_RENDERERS" >NUL && ( CALL :SET_BUILD_ALL_RENDERERS ) ECHO.%LP3D_COMMIT_MSG% | FIND /I "BUILD_LDGLITE" >NUL && ( - ECHO -'Build LDGLite' detected. + ECHO - 'Build LDGLite' detected. IF EXIST "%LP3D_LDGLITE%" ( DEL /S /Q "%LP3D_LDGLITE%" >NUL 2>&1 ) - IF NOT EXIST "%LP3D_LDGLITE%" ( ECHO -Cached %LP3D_LDGLITE% deleted. ) + IF NOT EXIST "%LP3D_LDGLITE%" ( ECHO - Cached %LP3D_LDGLITE% deleted. ) ) ECHO.%LP3D_COMMIT_MSG% | FIND /I "BUILD_LDVIEW" >NUL && ( - ECHO -'Build LDView' detected. + ECHO - 'Build LDView' detected. IF EXIST "%LP3D_LDVIEW%" ( DEL /S /Q "%LP3D_LDVIEW%" >NUL 2>&1 ) - IF NOT EXIST "%LP3D_LDVIEW%" ( ECHO -Cached %LP3D_LDVIEW% deleted. ) + IF NOT EXIST "%LP3D_LDVIEW%" ( ECHO - Cached %LP3D_LDVIEW% deleted. ) ) ECHO.%LP3D_COMMIT_MSG% | FIND /I "BUILD_POVRAY" >NUL && ( - ECHO -'Build POVRay' detected. + ECHO - 'Build POVRay' detected. IF EXIST "%LP3D_POVRAY%" ( DEL /S /Q "%LP3D_POVRAY%" >NUL 2>&1 ) - IF NOT EXIST "%LP3D_POVRAY%" ( ECHO -Cached %LP3D_POVRAY% deleted. ) + IF NOT EXIST "%LP3D_POVRAY%" ( ECHO - Cached %LP3D_POVRAY% deleted. ) ) -SET INVALID_TAG=FALSE -SET IS_PUB_TAG=FALSE ECHO.%GITHUB_REF% | FIND /I "refs/tags/" >NUL && ( - ECHO -Commit tag %GITHUB_REF_NAME% detected. - SET "VER_TAG=%GITHUB_REF_NAME%" - SETLOCAL ENABLEDELAYEDEXPANSION - SET "VER_PREFIX=!VER_TAG:~0,1!" - IF "!VER_PREFIX!" EQU "v" ( - SET "VER_TAG=!VER_TAG:.= !" - SET "VER_TAG=!VER_TAG:v=!" - FOR /F "tokens=1" %%i IN ("!VER_TAG!") DO SET VER_MAJOR=%%i - FOR /F "tokens=2" %%i IN ("!VER_TAG!") DO SET VER_MINOR=%%i - FOR /F "tokens=3" %%i IN ("!VER_TAG!") DO SET VER_PATCH=%%i - CALL :IS_VALID_NUMBER !VER_MAJOR! - CALL :IS_VALID_NUMBER !VER_MINOR! - CALL :IS_VALID_NUMBER !VER_PATCH! - ) - IF !IS_PUB_TAG! EQU TRUE ( + IF "%GITHUB_REF_NAME:~0,1%" EQU "v" ( CALL :SET_BUILD_ALL - ECHO -Publish tag %GITHUB_REF_NAME% confirmed. - ECHO -Commit message: !LP3D_COMMIT_MSG! + ECHO - New version tag %GITHUB_REF_NAME% confirmed. ) - SETLOCAL ) ECHO.%LP3D_COMMIT_MSG% | FIND /I "BUILD_AMD" >NUL && ( + ECHO - Build 'AMD x86 and x86_64' detected. CALL :SET_BUILD_ALL ) ECHO.%GITHUB_EVENT_NAME% | FIND /I "PUSH" >NUL && ( ECHO.%LP3D_COMMIT_MSG% | FIND /V /I "BUILD_ALL" >NUL && ( - ECHO -Build option verify ^(x86 architecture^) only detected. + ECHO - Build option verify ^(x86 architecture^) only detected. SET BUILD_ARCH=x86 ) ) +ECHO - Commit message: %LP3D_COMMIT_MSG% +ECHO - Build command: builds\windows\AutoBuild.bat %BUILD_ARCH% -3rd -ins -chk + CALL builds\windows\AutoBuild.bat %BUILD_ARCH% -3rd -ins -chk 2>&1 || GOTO :ERROR_END IF "%BUILD_ARCH%" EQU "-all" ( CALL builds\windows\CreateExePkg.bat 2>&1 || GOTO :ERROR_END -) ELSE ( - GOTO :END ) -PUSHD %LP3D_DOWNLOADS_PATH% -SET gen_hash=gen_hash.sh -SET f=%gen_hash% ECHO ->%f% #!/bin/bash ->>%f% # generate package hash files ->>%f% LP3D_PKGS=$^(find . -type f^) ->>%f% echo ->>%f% for LP3D_PKG in ${LP3D_PKGS}; do ->>%f% LP3D_PKG_EXT=".${LP3D_PKG##*.}" ->>%f% case "${LP3D_PKG_EXT}" in ->>%f% ".exe"^|".zip"^) ->>%f% [[ -f "${LP3D_PKG}.sha512" ]] ^&^& rm -f "${LP3D_PKG}.sha512" ^|^| : ->>%f% [[ ! "${LP3D_PKG}" == *"-debug"* ]] ^&^& \ ->>%f% sha512sum "${LP3D_PKG}" ^> "${LP3D_PKG}.sha512" ^&^& \ ->>%f% echo "- Created hash file ${LP3D_PKG}.sha512" ^|^| \ ->>%f% echo "- WARNING - Failed to create hash file ${LP3D_PKG}.sha512" ->>%f% ;; ->>%f% esac ->>%f% done -bash -lc "sed -i -e 's/\r$//' gen_hash.sh" -bash -lc "chmod a+x gen_hash.sh; ./gen_hash.sh" -DEL /Q gen_hash.sh -POPD +CALL :GENERATE_HASH_FILES + GOTO :END -:IS_VALID_NUMBER -IF %INVALID_TAG% EQU TRUE EXIT /b -IF %1 EQU +%1 ( - SET IS_PUB_TAG=TRUE - EXIT /b -) -SET IS_PUB_TAG=FALSE -SET INVALID_TAG=TRUE -ECHO -Version number '%1' is invalid. +:GENERATE_HASH_FILES +ECHO. +ECHO - Create sha512 hash files. +PUSHD %LP3D_DOWNLOADS_PATH% +SET gen_hash=Gen_Hash.sh +SET genHash=%gen_hash% ECHO +>%genHash% #!/bin/bash +>>%genHash% # redirect stdout/stderr to a file +>>%genHash% exec ^>%gen_hash%.log 2^>^&1 +>>%genHash% # generate package hash files +>>%genHash% sha512=$^(which sha512sum^) +>>%genHash% if test -z "$sha512"; then +>>%genHash% echo " -WARNING - sha512sum was not found." +>>%genHash% else +>>%genHash% echo " -$sha512 found." +>>%genHash% LP3D_WIN_ASSETS=$^(find . -type f^) +>>%genHash% for LP3D_WIN_ASSET in ${LP3D_WIN_ASSETS}; do +>>%genHash% LP3D_WIN_ASSET_EXT=".${LP3D_WIN_ASSET##*.}" +>>%genHash% case "${LP3D_WIN_ASSET_EXT}" in +>>%genHash% ".exe"^|".zip"^) +>>%genHash% [[ -f "${LP3D_WIN_ASSET}.sha512" ]] ^&^& rm -f "${LP3D_WIN_ASSET}.sha512" ^|^| : +>>%genHash% [[ ! "${LP3D_WIN_ASSET}" == *"-debug"* ]] ^&^& \ +>>%genHash% $sha512 "${LP3D_WIN_ASSET}" ^> "${LP3D_WIN_ASSET}.sha512" ^&^& \ +>>%genHash% echo " -Created hash file ${LP3D_WIN_ASSET}.sha512" ^|^| \ +>>%genHash% echo " -WARNING - Failed to create hash file ${LP3D_WIN_ASSET}.sha512" +>>%genHash% ;; +>>%genHash% esac +>>%genHash% done +>>%genHash% fi +SET run_cmd=Gen_Hash.bat +SET runCmd=%run_cmd% ECHO +>%runCmd% @ECHO OFF +>>%runCmd% bash -lc "sed -i -e 's/\r$//' %gen_hash%" +>>%runCmd% bash -lc "chmod a+x %gen_hash%; ./%gen_hash%" +START /w /b "Gen Hash" CMD /c %run_cmd% +IF EXIST "%gen_hash%.log" ( TYPE %gen_hash%.log ) +DEL /Q %run_cmd% %gen_hash% %gen_hash%.log +POPD EXIT /b :SET_BUILD_ALL ECHO.%LP3D_COMMIT_MSG% | FIND /V /I "BUILD_ALL" >NUL && ( SET LP3D_COMMIT_MSG=%LP3D_COMMIT_MSG% BUILD_ALL ) -ECHO.%LP3D_COMMIT_MSG% | FIND /V /I "-all" >NUL && ( - SET BUILD_ARCH=-all -) +SET BUILD_ARCH=-all EXIT /b :SET_BUILD_ALL_RENDERERS ECHO. -ECHO -'Build LDGLite, LDView and POV-Ray' detected. +ECHO - 'Build LDGLite, LDView and POV-Ray' detected. SET LP3D_COMMIT_MSG=%LP3D_COMMIT_MSG% BUILD_LDGLITE BUILD_LDVIEW BUILD_POVRAY EXIT /b @@ -221,4 +216,3 @@ ECHO. ECHO - %~nx0 finished. ENDLOCAL EXIT /b - diff --git a/builds/utilities/version.info b/builds/utilities/version.info index e1c1cde8a..b6d8a9a58 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 4 0 2670 560b15424 +2 4 4 0 2671 e34f20a6e diff --git a/builds/windows/AutoBuild.bat b/builds/windows/AutoBuild.bat index c023773d6..502e6a8cc 100644 --- a/builds/windows/AutoBuild.bat +++ b/builds/windows/AutoBuild.bat @@ -8,7 +8,7 @@ rem LPub3D distributions and package the build contents (exe, doc and rem resources ) for distribution release. rem -- rem Trevor SANDY -rem Last Update: July 03, 2021 +rem Last Update: May 31, 2022 rem Copyright (C) 2017 - 2022 by Trevor SANDY rem -- rem This script is distributed in the hope that it will be useful, @@ -40,6 +40,9 @@ IF "%GITHUB%" EQU "True" ( IF "%GITHUB_RUNNER_IMAGE%" == "Visual Studio 2019" ( SET LP3D_VSVERSION=2019 ) + IF NOT "%LP3D_LOCAL_CI_BUILD%" == "1" ( + SET CONFIG_CI=github_ci + ) SET DIST_DIR=%LP3D_DIST_DIR_PATH% SET PACKAGE=%LP3D_PACKAGE% SET CONFIGURATION=%GITHUB_CONFIG% @@ -48,8 +51,12 @@ IF "%GITHUB%" EQU "True" ( SET LDRAW_DIR=%LP3D_LDRAW_DIR_PATH% SET LP3D_UPDATE_LDRAW_LIBS=%UPDATE_LDRAW_LIBS% SETLOCAL ENABLEDELAYEDEXPANSION - SET LP3D_QT32_MSVC=%LP3D_BUILD_BASE%\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!\bin - SET LP3D_QT64_MSVC=%LP3D_BUILD_BASE%\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!_64\bin + IF "%LP3D_QT32_MSVC%" == "" ( + SET LP3D_QT32_MSVC=%LP3D_BUILD_BASE%\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!\bin + ) + IF "%LP3D_QT64_MSVC%" == "" ( + SET LP3D_QT64_MSVC=%LP3D_BUILD_BASE%\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!_64\bin + ) SETLOCAL ) @@ -63,6 +70,9 @@ IF "%APPVEYOR%" EQU "True" ( IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2019" ( SET LP3D_VSVERSION=2019 ) + IF NOT "%LP3D_LOCAL_CI_BUILD%" == "1" ( + SET CONFIG_CI=appveyor_ci + ) SET ABS_WD=%APPVEYOR_BUILD_FOLDER% SET DIST_DIR=%LP3D_DIST_DIR_PATH% SET PACKAGE=%LP3D_PACKAGE% @@ -72,8 +82,12 @@ IF "%APPVEYOR%" EQU "True" ( SET LDRAW_DIR=%APPVEYOR_BUILD_FOLDER%\LDraw SET LP3D_UPDATE_LDRAW_LIBS=%LP3D_UPDATE_LDRAW_LIBS_VAR% SETLOCAL ENABLEDELAYEDEXPANSION - SET LP3D_QT32_MSVC=C:\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!\bin - SET LP3D_QT64_MSVC=C:\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!_64\bin + IF "%LP3D_QT32_MSVC%" == "" ( + SET LP3D_QT32_MSVC=C:\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!\bin + ) + IF "%LP3D_QT64_MSVC%" == "" ( + SET LP3D_QT64_MSVC=C:\Qt\%LP3D_QTVERSION%\msvc!LP3D_VSVERSION!_64\bin + ) SETLOCAL ) @@ -292,6 +306,12 @@ ECHO DISTRIBUTION_DIRECTORY.........[%DIST_DIR%] ECHO LDRAW_DIRECTORY................[%LDRAW_DIR%] ECHO LDRAW_INSTALL_ROOT.............[%LDRAW_INSTALL_ROOT%] ECHO LDRAW_LIBS_ROOT................[%LDRAW_LIBS%] +IF "%LP3D_LOCAL_CI_BUILD%" EQU "1" ( + ECHO LOCAL_CI_BUILD.................[TRUE] +) +IF "%LP3D_CREATE_EXE_PKG_ONLY%" EQU "1" ( + ECHO CREATE EXE PACKAGES ONLY.......[TRUE] +) ECHO. rem set application version variables @@ -299,6 +319,9 @@ SET _PRO_FILE_PWD_=%ABS_WD%\mainApp CALL builds\utilities\update-config-files.bat %_PRO_FILE_PWD_% IF ERRORLEVEL 1 (GOTO :ERROR_END) +rem stop here if only running settings for CreateExePkg.bat +IF "%LP3D_CREATE_EXE_PKG_ONLY%" EQU "1" (GOTO :END) + rem Perform 3rd party content install IF /I "%3"=="-ins" ( SET INSTALL=1 @@ -350,10 +373,10 @@ IF /I %CHECK%==1 ( rem set debug suffix IF NOT [%CONFIGURATION%]==[] ( IF "%CONFIGURATION%"=="release" ( - SET d= + SET "d=" ) IF "%CONFIGURATION%"=="debug" ( - SET d=d + SET "d=d" ) ) @@ -395,7 +418,7 @@ IF %PLATFORM_ARCH%==x86 (SET EXE=mainApp\32bit_%CONFIGURATION%\%PACKAGE%%d%.exe) IF %PLATFORM_ARCH%==x86_64 (SET EXE=mainApp\64bit_%CONFIGURATION%\%PACKAGE%%d%.exe) IF NOT EXIST "%EXE%" ( ECHO. - ECHO " -ERROR - %EXE% was not successfully built - %~nx0 will trminate." + ECHO -ERROR - %EXE% was not successfully built - %~nx0 will trminate. GOTO :ERROR_END ) rem Package 3rd party install content - this must come before check so check can use staged content for test @@ -432,7 +455,7 @@ FOR %%P IN ( x86, x86_64 ) DO ( IF %%P==x86_64 (SET EXE=mainApp\64bit_%CONFIGURATION%\%PACKAGE%%d%.exe) IF NOT EXIST "!EXE!" ( ECHO. - ECHO " -ERROR - !EXE! was not successfully built - %~nx0 will trminate." + ECHO -ERROR - !EXE! was not successfully built - %~nx0 will trminate. GOTO :ERROR_END ) IF %INSTALL%==1 (CALL :STAGE_INSTALL) @@ -541,10 +564,10 @@ REM DEBUG============ ECHO LP3D_BUILD_CHECK...............[No] ) IF "%GITHUB%" EQU "True" ( - SET LPUB3D_CONFIG_ARGS=%LPUB3D_CONFIG_ARGS% CONFIG+=github_ci + SET LPUB3D_CONFIG_ARGS=%LPUB3D_CONFIG_ARGS% CONFIG+=%CONFIG_CI% ) IF "%APPVEYOR%" EQU "True" ( - SET LPUB3D_CONFIG_ARGS=%LPUB3D_CONFIG_ARGS% CONFIG+=appveyor_ci + SET LPUB3D_CONFIG_ARGS=%LPUB3D_CONFIG_ARGS% CONFIG+=%CONFIG_CI% IF "%LP3D_BUILD_PKG%" EQU "yes" ( ECHO LP3D_BUILD_PKG.................[%LP3D_BUILD_PKG%] ) diff --git a/builds/windows/CreateExePkg.bat b/builds/windows/CreateExePkg.bat index ac4694bae..a92cdab40 100644 --- 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 -rem Last Update: July 04, 2021 +rem Last Update: May 31, 2021 rem Copyright (C) 2015 - 2022 by Trevor SANDY rem -- rem This script is distributed in the hope that it will be useful, @@ -87,14 +87,9 @@ IF %RUN_NSIS% EQU 0 ( SET CREATE_PORTABLE=0 ) IF %TEST_CI% EQU 1 ( - SET CI_PLATFORM=GITHUB - IF "%CI_PLATFORM%" EQU "GITHUB" (SET GITHUB=True) ELSE (SET GITHUB=False) - IF "%CI_PLATFORM%" EQU "APPVEYOR" (SET APPVEYOR=True) ELSE (SET APPVEYOR=False) - SET CI_BUILD_FOLDER=%USERPROFILE% - SET CI_REPO_BRANCH=master FOR /F "usebackq delims==" %%G IN (`git rev-parse HEAD`) DO ( - IF "%CI_PLATFORM%" EQU "GITHUB" (SET GITHUB_SHA=%%G) - IF "%CI_PLATFORM%" EQU "APPVEYOR" (SET APPVEYOR_REPO_COMMIT=%%G) + IF /I "%GITHUB%" EQU "True" (SET GITHUB_SHA=%%G) + IF /I "%APPVEYOR%" EQU "True" (SET APPVEYOR_REPO_COMMIT=%%G) ) ) @@ -1303,7 +1298,7 @@ IF /I "%GITHUB%" EQU "True" ( SET LDRAW_LIBS=%LP3D_3RD_PARTY_PATH% ) IF /I "%APPVEYOR%" EQU "True" ( - SET LDRAW_LIBS=%CI_BUILD_FOLDER%\LDrawLibs + SET LDRAW_LIBS=%CI_APPVEYOR_LDRAW_BASE%\LDrawLibs ) IF /I "%GITHUB%" NEQ "True" ( IF /I "%APPVEYOR%" NEQ "True" ( @@ -1676,17 +1671,17 @@ SET LP3D_RUNLOG_ASSETS=%LP3D_BUILD_TARGET%\%LP3D_PACKAGE%_Logs SET LP3D_PACKAGE_32_PDB=%CD%\mainApp\32bit_%CONFIGURATION%\%LP3D_PACKAGE%.pdb SET LP3D_PACKAGE_64_PDB=%CD%\mainApp\64bit_%CONFIGURATION%\%LP3D_PACKAGE%.pdb SET FILTER_LIST=LP3D_BUILD_* LP3D_PACKAGE_* LP3D_DOWNLOAD_* LP3D_UPDATE_* LP3D_RUNLOG_* -IF NOT EXIST "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86.pdb" ( - COPY /V /Y /A "%LP3D_PACKAGE_32_PDB%" "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86.pdb" >NUL 2>&1 +IF NOT EXIST "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86-%LP3D_APP_VERSION_LONG%.pdb" ( + COPY /V /Y /A "%LP3D_PACKAGE_32_PDB%" "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86-%LP3D_APP_VERSION_LONG%.pdb" >NUL 2>&1 ) -IF NOT EXIST "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86_64.pdb" ( - COPY /V /Y /A "%LP3D_PACKAGE_64_PDB%" "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86_64.pdb" >NUL 2>&1 +IF NOT EXIST "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86_64-%LP3D_APP_VERSION_LONG%.pdb" ( + COPY /V /Y /A "%LP3D_PACKAGE_64_PDB%" "%LP3D_RUNLOG_ASSETS%\%LP3D_PACKAGE%_x86_64-%LP3D_APP_VERSION_LONG%.pdb" >NUL 2>&1 ) ECHO. FOR /f "delims== tokens=1,2" %%a IN ('SET ^| findstr / "%FILTER_LIST%"') DO (ECHO - %%a = %%b) IF EXIST "%LP3D_DOWNLOAD_ASSETS%" ( ECHO. - ECHO - Move download assets to %LP3D_DOWNLOADS_PATH%... + ECHO - Move download assets to %LP3D_DOWNLOADS_PATH%... FOR /D /R "%LP3D_DOWNLOAD_ASSETS%" %%C IN (*) DO ( IF EXIST "%LP3D_DOWNLOADS_PATH%\%%~nC" ( DIR "%%C" | FIND "0 File(s)" > NUL & IF ERRORLEVEL 1 (MOVE /Y "%%C\*.*" "%LP3D_DOWNLOADS_PATH%\%%~nC") diff --git a/gitversion.pri b/gitversion.pri index 598f6407f..8829a1711 100644 --- a/gitversion.pri +++ b/gitversion.pri @@ -68,7 +68,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 = 2670 + GIT_COMMIT = 2671 message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~") } @@ -115,7 +115,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}.0.2670.560b15424 + GIT_VERSION = $${VERSION}.0.2671.e34f20a6e 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 index e8c52d1b7..89c132b14 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.4.0.2670 (28 05 2022 12:14:09) +LPub3D 2.4.4.0.2671 (31 05 2022 02:09:46) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 86fd255a1..1c2f531ab 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -9,7 +9,7 @@
-

LPub3D 2.4.4.0.2670 (28 05 2022 12:14:09)

+

LPub3D 2.4.4.0.2671 (31 05 2022 02:09:46)

LPub3D Official release.
diff --git a/mainApp/lpub3d.appdata.xml b/mainApp/lpub3d.appdata.xml index 84fd70a66..3bfffadda 100644 --- a/mainApp/lpub3d.appdata.xml +++ b/mainApp/lpub3d.appdata.xml @@ -82,9 +82,9 @@ lpub3d24 ​ - + -

LPub3D 28.05.2022 enhancements and fixes

+

LPub3D 31.05.2022 enhancements and fixes