LPub3D v2.2.1

README.md

@@ -80,7 +80,7 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut
 [ldview-url]:          https://github.com/trevorsandy/ldview/tree/qmake-build
 [povray-url]:          https://github.com/trevorsandy/povray/tree/lpub3d/raytracer-cui
 
-[sfreleases]:          https://sourceforge.net/projects/lpub3d/files/2.2.0
+[sfreleases]:          https://sourceforge.net/projects/lpub3d/files/2.1.1
 [githubreleases]:      https://github.com/trevorsandy/lpub3d/releases
 [obsreleases]:         https://software.opensuse.org//download.html?project=home:trevorsandy&package=lpub3d
 [travis-badge]:        https://img.shields.io/travis/trevorsandy/lpub3d.svg?label=travis
@@ -141,9 +141,9 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut
 [univention-icon]:     https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/univention.png
 [windows-icon]:        https://raw.githubusercontent.com/trevorsandy/lpub3d/master/builds/utilities/icons/windows.png
 
-[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.2.0/LPub3D-2.2.0.1.823_20180331.exe
-[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.2.0/LPub3D-2.2.0.1.823_20180331-macos.dmg
-[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.2.0/LPub3D-2.2.0.1.823_20180331-x86_64.AppImage
+[windows-url]:         https://github.com/trevorsandy/lpub3d/releases/download/v2.1.1/LPub3D-2.1.1.0.824_20180331.exe
+[macos-url]:           https://github.com/trevorsandy/lpub3d/releases/download/v2.1.1/LPub3D-2.1.1.0.824_20180331-macos.dmg
+[appimage-url]:        https://github.com/trevorsandy/lpub3d/releases/download/v2.1.1/LPub3D-2.1.1.0.824_20180331-x86_64.AppImage
 
 [arch-url]:            https://download.opensuse.org/repositories/home:/trevorsandy/Arch_Extra/
 [centos-url]:          https://download.opensuse.org/repositories/home:/trevorsandy/CentOS_7/

appveyor.yml

@@ -38,6 +38,16 @@ configuration: release
 matrix:
   fast_finish: true
 
+# The following variables/actions can be manipulated from the AppVeyor site->Project->Settings->Environment Variables
+# Variables ending with '_VAR' are designated to be only defined at the AppVeyor site
+# LP3D_BUILD_PKG = "yes"            ; trigger build
+# LP3D_TEST_DEPLOY_SF_VAR = "true"  ; deploy SourceForge
+# LP3D_CLEAR_AVCACHE_VAR = "true"  ; delete cache
+# LP3D_BUILD_RENDERERS_VAR = "true" ; rebuld renderers [NOTE: requires one or more of LP3D_BUILD_<render> variables]
+#   LP3D_BUILD_LDGLITE = 1          ; rebuild LDGLite
+#   LP3D_BUILD_LDVIEW = 1           ; rebuild LDView
+#   LP3D_BUILD_TRACE = 1            ; rebuild LPub3D-Trace (POV-Ray)
+#
 environment:
   LP3D_PACKAGE: LPub3D
   LP3D_PACKAGE_PATH: builds\windows\$(configuration)
@@ -72,6 +82,13 @@ init:
  - ps: cmd.exe /c %windir%\system32\tzutil.exe /s "Central Europe Standard Time"
  - ps: write-host "Building ${env:LP3D_PACKAGE} x86 and x86_64 architectures..."
  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+ - ps: |
+      If ($env:LP3D_TEST_DEPLOY_SF_VAR -eq "true") {
+         write-host "Test Sourceforge deploy detected."
+      }
+      If ($env:LP3D_BUILD_RENDERERS_VAR -eq "true") {
+         write-host "Build renderers detected."
+      }
  - ps: |
       If ($env:APPVEYOR_REPO_COMMIT_MESSAGE.ToLower() -Like "*build pkg*") {
         write-host "[build pkg] detected."
@@ -90,17 +107,23 @@ init:
  - ps: |
       If ($env:LP3D_BUILD_PKG -eq "yes") {
         If ($env:APPVEYOR_REPO_COMMIT_MESSAGE -Match '[^\S]\s?([0-1]?\s?[0-1]?\s?[0-1]?)\].*$') {
-          $env:LP3D_BUILD_LDGLITE = $matches[1].substring(0,1)
-          $env:LP3D_BUILD_LDVIEW = $matches[1].substring(2,1)
-          $env:LP3D_BUILD_TRACE = $matches[1].substring(4,1)
+          If (LP3D_BUILD_RENDERERS_VAR -ne "true") {
+            $env:LP3D_BUILD_LDGLITE = $matches[1].substring(0,1)
+            $env:LP3D_BUILD_LDVIEW = $matches[1].substring(2,1)
+            $env:LP3D_BUILD_TRACE = $matches[1].substring(4,1)
+          }
           $env:LP3D_LDGLITE = "${env:LP3D_DIST_DIR_PATH}\ldglite-1.3"
           $env:LP3D_LDVIEW = "${env:LP3D_DIST_DIR_PATH}\ldview-4.3"
           $env:LP3D_LPUB3D_TRACE = "${env:LP3D_DIST_DIR_PATH}\lpub3d_trace_cui-3.8"
         }
       }
  - ps: |
-      If ($env:APPVEYOR_REPO_COMMIT_MESSAGE.ToLower().Contains("[clear avcache]")) {
-        write-host "[clear avcache] detected."
+      If (($env:APPVEYOR_REPO_COMMIT_MESSAGE.ToLower().Contains("[clear avcache]")) -or ($env:LP3D_CLEAR_AVCACHE_VAR -eq "true")) {
+        If ($env:LP3D_CLEAR_AVCACHE_VAR -eq "true") {
+          write-host "Clear AppVeyor cache detected."
+        } else {
+          write-host "[clear avcache] detected."
+        }
 
         $apiUrl = 'https://ci.appveyor.com/api'
         $token = $env:SECURE_AV_SECRET
@@ -138,12 +161,9 @@ install:
  - cmd: bash -lc "if ! test -d \"${lp3d_librepodir}\"; then curl -sL -o ${lp3d_librepo}.tar.gz https://github.com/trevorsandy/${lp3d_librepo}/archive/master.tar.gz; fi"
  - cmd: bash -lc "if ! test -d \"${lp3d_librepodir}\" && test -f \"${lp3d_librepo}.tar.gz\"; then mkdir -p ${lp3d_librepodir} && tar -xzf ${lp3d_librepo}.tar.gz -C ${lp3d_librepodir} --strip-components=1; fi"
  - cmd: bash -lc "if ! test -d \"${lp3d_librepodir}\"; then echo repository ${lp3d_librepodir} not found; else echo library repository available at ${lp3d_librepodir}; fi"
- - cmd: bash -lc "if test \"$LP3D_BUILD_LDGLITE\" = \"1\" && test -d \"$LP3D_LDGLITE\"; then rm -rf $LP3D_LDGLITE && echo cached $LP3D_LDGLITE deleted; fi"
- - cmd: bash -lc "if test \"$LP3D_BUILD_LDVIEW\" = \"1\" && test -d \"$LP3D_LDVIEW\"; then rm -rf $LP3D_LDVIEW && echo cached $LP3D_LDVIEW deleted; fi"
- - cmd: bash -lc "if test \"$LP3D_BUILD_TRACE\" = \"1\" && test -d \"$LP3D_LPUB3D_TRACE\"; then rm -rf $LP3D_LPUB3D_TRACE && echo cached $LP3D_LPUB3D_TRACE deleted; fi"
- - cmd: bash -lc "if test \"$LP3D_BUILD_LDGLITE\" = \"1\" && test -d \"$LP3D_LDGLITE\"; then rm -rf $LP3D_LDGLITE && echo cached $LP3D_LDGLITE deleted; fi"
- - cmd: bash -lc "if test \"$LP3D_BUILD_LDVIEW\" = \"1\" && test -d \"$LP3D_LDVIEW\"; then rm -rf $LP3D_LDVIEW && echo cached $LP3D_LDVIEW deleted; fi"
- - cmd: bash -lc "if test \"$LP3D_BUILD_TRACE\" = \"1\" && test -d \"$LP3D_LPUB3D_TRACE\"; then rm -rf $LP3D_LPUB3D_TRACE && echo cached $LP3D_LPUB3D_TRACE deleted; fi"
+ - cmd: bash -lc "if test \"$LP3D_BUILD_LDGLITE\" = \"1\" && test -d \"$LP3D_LDGLITE\"; then rm -rf $LP3D_LDGLITE; if ! test -d \"$LP3D_LDGLITE\"; then echo cached $LP3D_LDGLITE deleted; fi; fi"
+ - cmd: bash -lc "if test \"$LP3D_BUILD_LDVIEW\" = \"1\" && test -d \"$LP3D_LDVIEW\"; then rm -rf $LP3D_LDVIEW; if ! test -d \"$LP3D_LDVIEW\"; then echo cached $LP3D_LDVIEW deleted; fi; fi"
+ - cmd: bash -lc "if test \"$LP3D_BUILD_TRACE\" = \"1\" && test -d \"$LP3D_LPUB3D_TRACE\"; then rm -rf $LP3D_LPUB3D_TRACE; if ! test -d \"$LP3D_LPUB3D_TRACE\"; then echo cached $LP3D_LPUB3D_TRACE deleted; fi; fi"
  - cmd: C:\msys64\usr\bin\bash -lc "cd ${lp3d_librepodir}/qt-5.9.2-2-release; pacman -U --needed --noconfirm ${LP3D_QT32_LIBS} ${LP3D_QT64_LIBS} > InstallQtBuildEnv.log 2>&1"
  - cmd: C:\msys64\usr\bin\bash -lc "pacman -S --needed --noconfirm openssh rsync > InstallSecureTransfer.log 2>&1"
 
@@ -188,9 +208,9 @@ after_build:
         } Else {
           Write-Error -Message "env var LP3D_UPDATE_ASSETS is null." -ErrorAction Stop
         }
-        If ($env:LP3D_DEPLOY_PKG -eq $true) {
+        If (($env:LP3D_DEPLOY_PKG -eq $true) -or ($env:LP3D_TEST_DEPLOY_SF_VAR -eq "true")) {
           write-host "`n"
-          If ((git tag -l -n $env:APPVEYOR_REPO_TAG_NAME) -NotLike "*skip sfr*") {
+          If (((git tag -l -n $env:APPVEYOR_REPO_TAG_NAME) -NotLike "*skip sfr*") -or ($env:LP3D_TEST_DEPLOY_SF_VAR -eq "true")) {
             cmd.exe /c nuget install secure-file -ExcludeVersion
             cmd.exe /c secure-file\tools\secure-file -decrypt %LP3D_SECURE_DIR%\.sfdeploy_appveyor_rsa.enc -secret %SECURE_SF_SECRET%
             C:\msys64\usr\bin\bash -lc 'cd $APPVEYOR_BUILD_FOLDER && chmod +x builds/utilities/ci/sfdeploy.sh && ./builds/utilities/ci/sfdeploy.sh 2>&1'

builds/linux/obs/alldeps/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Trevor SANDY <trevor[dot]sandy[at]gmail[dot]com>
 # Last Update March 09, 2018
 pkgname=lpub3d
-pkgver=2.2.0.823
+pkgver=2.1.1.824
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

builds/linux/obs/alldeps/debian/changelog

@@ -1,5 +1,5 @@
-lpub3d (2.2.0.823) debian; urgency=medium
+lpub3d (2.1.1.824) debian; urgency=medium
 
-  * LPub3D version 2.2.0.1.823_20180331 for Linux
+  * LPub3D version 2.1.1.0.824_20180331 for Linux
 
- -- Trevor SANDY <[email protected]>  Sat, 31 Mar 2018 13:02:53 +0200
+ -- Trevor SANDY <[email protected]>  Sat, 31 Mar 2018 13:24:24 +0200

builds/linux/obs/alldeps/debian/lpub3d.dsc

@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.2.0.823
+Version: 2.1.1.824
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

builds/linux/obs/alldeps/lpub3d.spec

@@ -112,7 +112,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.2.0.823
+Version: 2.1.1.824
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -686,5 +686,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Sat Mar 31 2018 - trevor.dot.sandy.at.gmail.dot.com 2.2.0.823
+* Sat Mar 31 2018 - trevor.dot.sandy.at.gmail.dot.com 2.1.1.824
 - LPub3D Linux package (rpm) release

builds/utilities/version.info

@@ -1 +1 @@
-2 2 0 1 823 d7ca823
+2 1 1 0 824 31dd943

mainApp/docs/README.txt

@@ -1,4 +1,4 @@
-LPub3D 2.2.0.1.823 (31 03 2018 13:02:54)
+LPub3D 2.1.1.0.824 (31 03 2018 13:24:24)
 
 Features and enhancements
 ------------