Mercurial > mxe-octave

changeset 3435:9fcc72373e24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build stable-octave package by default * Makefile.in (STABLE_BUILD): Set default to yes. (OCTAVE_TARGET): Set here instead of in binary-dist-rules.mk * binary-dist-rules.mk: Use WINDOWS_BINARY_DIST_DEPS instead of WINDOWS_BINARY_DIST_FILES. (make-stable-dist-directory): Delete macro definition.
author John W. Eaton <jwe@octave.org>
date Mon, 20 Jan 2014 03:00:19 -0500
parents 7864014bc84a
children 9eda8d4b772d
files Makefile.in binary-dist-rules.mk
diffstat 2 files changed, 12 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Sun Jan 19 17:37:35 2014 -0500
+++ b/Makefile.in	Mon Jan 20 03:00:19 2014 -0500
@@ -1,12 +1,18 @@
 # This file is part of MXE.
 # See index.html for further information.
 
+STABLE_BUILD := yes
+
+ifeq ($(STABLE_BUILD),yes)
+  OCTAVE_TARGET := stable-octave
+else
+  OCTAVE_TARGET := octave
+endif
+
 PWD := $(shell pwd)
 
 STRIP_DIST_FILES := @STRIP_DIST_FILES@
 
-STABLE_BUILD := no
-
 DATE := $(shell date +%Y-%m-%d-%H-%M)
 
 ## Configuration variables.
@@ -420,7 +426,7 @@
 endif
 
 .PHONY: all
-all: configure Makefile octave
+all: configure Makefile $(OCTAVE_PACKAGE)
 
 .PHONY: all-packages
 all-packages: $(PKGS)
--- a/binary-dist-rules.mk	Sun Jan 19 17:37:35 2014 -0500
+++ b/binary-dist-rules.mk	Mon Jan 20 03:00:19 2014 -0500
@@ -1,9 +1,7 @@
 
 ifeq ($(STABLE_BUILD),yes)
-  OCTAVE_TARGET := stable-octave
   OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION)
 else
-  OCTAVE_TARGET := octave
   OCTAVE_DIST_NAME := octave-$(DATE)
 endif
 
@@ -13,10 +11,10 @@
 
 ## FIXME: We need a way to ask "is this a windows build?"
 ifeq ($(MXE_SYSTEM), mingw)
-  WINDOWS_BINARY_DIST_FILES := msys-base npp
+  WINDOWS_BINARY_DIST_DEPS := msys-base npp
 endif
 ifeq ($(MXE_SYSTEM), msvc)
-  WINDOWS_BINARY_DIST_FILES := msys-base npp
+  WINDOWS_BINARY_DIST_DEPS := msys-base npp
 endif
 
 BINARY_DIST_DEPS := \
@@ -26,7 +24,7 @@
   octave-forge-packages \
   units \
   transfig \
-  $(WINDOWS_BINARY_DIST_FILES)
+  $(WINDOWS_BINARY_DIST_DEPS)
 
 define delete-dist-directory
   echo "deleting previous dist directory..."
@@ -35,11 +33,6 @@
 
 define make-dist-directory
   echo "creating dist directory..."
-  mkdir -p $(TOP_DIR)/dist/octave-$(DATE)
-endef
-
-define make-stable-dist-directory
-  echo "creating dist directory..."
   mkdir -p $(OCTAVE_DIST_DIR)
 endef