Mercurial > mxe-octave

changeset 5286:00a0eac6b6cd octave-release-5.2.0_1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate separate WIN_VERSION for Octave installers (bug #57740) * default-octave.mk, release-octave.mk, stable-octave.mk: Eliminate separate $(PKG)_WIN_VERSION variable. Copy value of $(PKG)_VERSION into octave-version file.
author John W. Eaton <jwe@octave.org>
date Thu, 06 Feb 2020 00:41:35 -0500
parents 7e55d4512a62
children 78e73e419a7a
files src/default-octave.mk src/release-octave.mk src/stable-octave.mk
diffstat 3 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/default-octave.mk	Mon Feb 03 14:37:46 2020 -0500
+++ b/src/default-octave.mk	Thu Feb 06 00:41:35 2020 -0500
@@ -14,7 +14,6 @@
 PKG             := default-octave
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 6.0.0
-$(PKG)_WIN_VERSION := $($(PKG)_VERSION)
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
@@ -219,5 +218,5 @@
     fi
 
     # create a file with latest installed octave rev in it
-    echo "$($(PKG)_WIN_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
+    echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef
--- a/src/release-octave.mk	Mon Feb 03 14:37:46 2020 -0500
+++ b/src/release-octave.mk	Thu Feb 06 00:41:35 2020 -0500
@@ -31,16 +31,10 @@
 ##   * 32-bit Windows build:
 ##
 ##       --disable-windows-64 --disable-64 --disable-fortran-int64
-##
-## The extra digit in the $(PKG)_WIN_VERSION variable may be used to
-## distinguish builds that use the same base Octave sources but include
-## updated dependencies or other minor patches applied specifically for
-## Windows.
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 5.2.0
-$(PKG)_WIN_VERSION := $($(PKG)_VERSION).0
 $(PKG)_CHECKSUM := 94054f3757e246398249e5041b2be698badceac8
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
@@ -245,5 +239,5 @@
     fi
 
     # create a file with latest installed octave rev in it
-    echo "$($(PKG)_WIN_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
+    echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef
--- a/src/stable-octave.mk	Mon Feb 03 14:37:46 2020 -0500
+++ b/src/stable-octave.mk	Thu Feb 06 00:41:35 2020 -0500
@@ -14,7 +14,6 @@
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 5.2.1
-$(PKG)_WIN_VERSION := $($(PKG)_VERSION)
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
@@ -219,5 +218,5 @@
     fi
 
     # create a file with latest installed octave rev in it
-    echo "$($(PKG)_WIN_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
+    echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef