Mercurial > mxe-octave

comparison binary-dist-rules.mk @ 3673:972f2d9c76ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tar-dist: update dist rules for native-mingw tar-dist to work (Bug #42874) * binary-dist-rules.mk: only include windows dist deps of native-*, npp and msys-base if not native mingw build. change copy-windows-dist-files for same.
author John Donoghue
date Thu, 31 Jul 2014 11:23:18 -0400
parents ba8987374138
children c8546fe79bc9
comparison
equal deleted inserted replaced
3672:05e3d28e2e67 3673:972f2d9c76ca
10 OCTAVE_NSI_FILE := $(TOP_DIR)/dist/octave.nsi 10 OCTAVE_NSI_FILE := $(TOP_DIR)/dist/octave.nsi
11 11
12 ifeq ($(MXE_WINDOWS_BUILD),yes) 12 ifeq ($(MXE_WINDOWS_BUILD),yes)
13 TAR_H_OPTION := -h 13 TAR_H_OPTION := -h
14 WINDOWS_BINARY_DIST_DEPS := \ 14 WINDOWS_BINARY_DIST_DEPS := \
15 msys-base \ 15 msys-base
16 native-binutils \ 16
17 native-gcc \ 17 ifeq ($(MXE_NATIVE_BUILD),no)
18 npp 18 WINDOWS_BINARY_DIST_DEPS += \
19 native-binutils \
20 native-gcc \
21 npp
22 endif
23
19 endif 24 endif
20 25
21 BINARY_DIST_DEPS := \ 26 BINARY_DIST_DEPS := \
22 $(OCTAVE_TARGET) \ 27 $(OCTAVE_TARGET) \
23 blas-packages \ 28 blas-packages \
46 echo " build_packages.m..." 51 echo " build_packages.m..."
47 cp $(TOP_DIR)/build_packages.m $(OCTAVE_DIST_DIR)/src 52 cp $(TOP_DIR)/build_packages.m $(OCTAVE_DIST_DIR)/src
48 endef 53 endef
49 54
50 ifeq ($(MXE_WINDOWS_BUILD),yes) 55 ifeq ($(MXE_WINDOWS_BUILD),yes)
51 define copy-windows-dist-files 56 ifeq ($(MXE_NATIVE_BUILD),no)
52 echo " DLL files..." 57 define copy-windows-dist-files
53 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin 58 echo " DLL files..."
54 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin 59 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
55 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin 60 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
56 echo " msys base files..." 61 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin
57 cd $(TOP_DIR)/msys-base \ 62 echo " msys base files..."
58 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 63 cd $(TOP_DIR)/msys-base \
59 echo " msys extension files..." 64 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
60 cd $(TOP_DIR)/msys-extension \ 65 echo " msys extension files..."
61 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 66 cd $(TOP_DIR)/msys-extension \
62 echo " notepad++..." 67 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
63 cd $(TOP_DIR) \ 68 echo " notepad++..."
64 && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 69 cd $(TOP_DIR) \
65 echo " README.html..." 70 && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
66 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ 71 echo " README.html..."
67 echo " refblas..." 72 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
68 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll 73 echo " refblas..."
69 endef 74 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
75 endef
76 else
77 define copy-windows-dist-files
78 echo " DLL files..."
79 cp /mingw/bin/*.dll $(OCTAVE_DIST_DIR)/bin
80 echo " README.html..."
81 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
82 echo " refblas..."
83 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
84 endef
85 endif
70 endif 86 endif
71 87
72 define make-dist-files-writable 88 define make-dist-files-writable
73 echo "making all dist files writable by user..." 89 echo "making all dist files writable by user..."
74 chmod -R u+w $(OCTAVE_DIST_DIR) 90 chmod -R u+w $(OCTAVE_DIST_DIR)