diff src/stable-octave.mk @ 4752:e839056b9a65

Allow building of unreleased stable branch (4.4.0x) (bug #54176). * src/stable-octave.mk: Define PKG_VERSION to 4.4.0x to match configure.ac for stable branch. Define new variable PKG_WIN_VERSION=4.4.0.5 which is used for unreleased stable branch on Windows. Write PKG_WIN_VERSION to octave-version file. * tools/makeinst-script.sh.in: Define new INSTALLER_VERSION variable. If VERSION is already 4 digits (4.4.0.5) then leave unchanged, otherwise add a fourth zero so that version number matches windows expectations.
author Rik <rik@octave.org>
date Tue, 03 Jul 2018 19:00:22 -0700
parents ad711297712a
children 7d3a56e36206
line wrap: on
line diff
--- a/src/stable-octave.mk	Mon Jul 02 07:55:22 2018 -0400
+++ b/src/stable-octave.mk	Tue Jul 03 19:00:22 2018 -0700
@@ -13,7 +13,8 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.4.0+
+$(PKG)_VERSION  := 4.4.0x
+$(PKG)_WIN_VERSION := 4.4.0.5
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
@@ -213,5 +214,5 @@
     fi
 
     # create a file with latest installed octave rev in it
-    echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
+    echo "$($(PKG)_WIN_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef