Mercurial > mxe-octave

comparison binary-dist-rules.mk @ 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 4779ae33e544
children ebe73c541a16
comparison
equal deleted inserted replaced
3434:7864014bc84a 3435:9fcc72373e24
1 1
2 ifeq ($(STABLE_BUILD),yes) 2 ifeq ($(STABLE_BUILD),yes)
3 OCTAVE_TARGET := stable-octave
4 OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION) 3 OCTAVE_DIST_NAME := octave-$($(OCTAVE_TARGET)_VERSION)
5 else 4 else
6 OCTAVE_TARGET := octave
7 OCTAVE_DIST_NAME := octave-$(DATE) 5 OCTAVE_DIST_NAME := octave-$(DATE)
8 endif 6 endif
9 7
10 OCTAVE_DIST_DIR := $(TOP_DIR)/dist/$(OCTAVE_DIST_NAME) 8 OCTAVE_DIST_DIR := $(TOP_DIR)/dist/$(OCTAVE_DIST_NAME)
11 9
12 OCTAVE_NSI_FILE := $(TOP_DIR)/dist/octave.nsi 10 OCTAVE_NSI_FILE := $(TOP_DIR)/dist/octave.nsi
13 11
14 ## FIXME: We need a way to ask "is this a windows build?" 12 ## FIXME: We need a way to ask "is this a windows build?"
15 ifeq ($(MXE_SYSTEM), mingw) 13 ifeq ($(MXE_SYSTEM), mingw)
16 WINDOWS_BINARY_DIST_FILES := msys-base npp 14 WINDOWS_BINARY_DIST_DEPS := msys-base npp
17 endif 15 endif
18 ifeq ($(MXE_SYSTEM), msvc) 16 ifeq ($(MXE_SYSTEM), msvc)
19 WINDOWS_BINARY_DIST_FILES := msys-base npp 17 WINDOWS_BINARY_DIST_DEPS := msys-base npp
20 endif 18 endif
21 19
22 BINARY_DIST_DEPS := \ 20 BINARY_DIST_DEPS := \
23 $(OCTAVE_TARGET) \ 21 $(OCTAVE_TARGET) \
24 native-gcc \ 22 native-gcc \
25 native-binutils \ 23 native-binutils \
26 octave-forge-packages \ 24 octave-forge-packages \
27 units \ 25 units \
28 transfig \ 26 transfig \
29 $(WINDOWS_BINARY_DIST_FILES) 27 $(WINDOWS_BINARY_DIST_DEPS)
30 28
31 define delete-dist-directory 29 define delete-dist-directory
32 echo "deleting previous dist directory..." 30 echo "deleting previous dist directory..."
33 rm -rf $(TOP_DIR)/dist 31 rm -rf $(TOP_DIR)/dist
34 endef 32 endef
35 33
36 define make-dist-directory 34 define make-dist-directory
37 echo "creating dist directory..."
38 mkdir -p $(TOP_DIR)/dist/octave-$(DATE)
39 endef
40
41 define make-stable-dist-directory
42 echo "creating dist directory..." 35 echo "creating dist directory..."
43 mkdir -p $(OCTAVE_DIST_DIR) 36 mkdir -p $(OCTAVE_DIST_DIR)
44 endef 37 endef
45 38
46 define generate-dist-exclude-list 39 define generate-dist-exclude-list