Mercurial > mxe-octave
changeset 4540:2a8b5cf2085c
allow stable-octave to build from hg
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 21 Nov 2017 16:45:20 -0500 |
| parents | 58c55baead8f |
| children | 23a905c6f5d3 |
| files | dist-files.mk hg-octave-dist.mk src/stable-octave-2-appid-version.patch src/stable-octave.mk |
| diffstat | 4 files changed, 9 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Tue Nov 21 12:26:13 2017 -0500 +++ b/dist-files.mk Tue Nov 21 16:45:20 2017 -0500 @@ -653,7 +653,6 @@ src-msys-zip.mk \ src-msys-zlib.mk \ stable-octave-1-gnulib.patch \ - stable-octave-2-appid-version.patch \ stable-octave.mk \ suitesparse-1.patch \ suitesparse.mk \
--- a/hg-octave-dist.mk Tue Nov 21 12:26:13 2017 -0500 +++ b/hg-octave-dist.mk Tue Nov 21 16:45:20 2017 -0500 @@ -40,12 +40,15 @@ $(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' all && \ $(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' install && \ $(HG_OCTAVE_DIST_ENV_FLAGS) make -j '$(JOBS)' dist && \ - mv '$(default-octave_FILE)' '$(PKG_DIR)' + mv '$($(OCTAVE_TARGET)_FILE)' '$(PKG_DIR)' .PHONY: update-hg-octave-repo update-hg-octave-repo: if [ -d octave-hg-repo ]; then \ - cd octave-hg-repo && hg pull -u; \ + cd octave-hg-repo \ + && hg pull && hg update $(hg-octave-branch); \ else \ - hg clone http://octave.org/hg/octave octave-hg-repo; \ + hg clone http://octave.org/hg/octave octave-hg-repo \ + && cd octave-hg-repo \ + && hg pull && hg update $(hg-octave-branch); \ fi
--- a/src/stable-octave-2-appid-version.patch Tue Nov 21 12:26:13 2017 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -diff -r a3447dba35c3 libinterp/corefcn/sysdep.cc ---- a/libinterp/corefcn/sysdep.cc Fri Mar 17 13:46:16 2017 -0400 -+++ b/libinterp/corefcn/sysdep.cc Fri Mar 17 14:57:02 2017 -0400 -@@ -196,7 +196,7 @@ - "SetCurrentProcessExplicitAppUserModelID")); - - if (pfnSetCurrentProcessExplicitAppUserModelID) -- pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave"); -+ pfnSetCurrentProcessExplicitAppUserModelID (L"gnu.octave." VERSION); - - FreeLibrary (hShell); - }
--- a/src/stable-octave.mk Tue Nov 21 12:26:13 2017 -0500 +++ b/src/stable-octave.mk Tue Nov 21 16:45:20 2017 -0500 @@ -1,10 +1,12 @@ # This file is part of MXE. # See index.html for further information. +## This can now build from hg stable so we omit the package checksum. + PKG := stable-octave $(PKG)_IGNORE := $(PKG)_VERSION := 4.2.1 -$(PKG)_CHECKSUM := 057dbaa30d0ef75e84db30aeda623a2561b0d547 +$(PKG)_CHECKSUM := ## No checksum $(PKG)_SUBDIR := octave-$($(PKG)_VERSION) $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz $(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)