Mercurial > mxe-octave

comparison binary-dist-rules.mk @ 3530:1e09264307e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
binary-dist-rules.mk: Style fixes.
author John W. Eaton <jwe@octave.org>
date Sun, 16 Feb 2014 22:48:48 -0500
parents 897cd1614109
children f32ee23a7261
comparison
equal deleted inserted replaced
3529:897cd1614109 3530:1e09264307e8
50 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin 50 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
51 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/4.8.2/*.dll $(OCTAVE_DIST_DIR)/bin 51 cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/4.8.2/*.dll $(OCTAVE_DIST_DIR)/bin
52 endef 52 endef
53 53
54 ifeq ($(MXE_WINDOWS_BUILD),yes) 54 ifeq ($(MXE_WINDOWS_BUILD),yes)
55 define copy-windows-dist-files 55 define copy-windows-dist-files
56 echo " msys base files..." 56 echo " msys base files..."
57 cd $(TOP_DIR)/msys-base \ 57 cd $(TOP_DIR)/msys-base \
58 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 58 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
59 echo " msys extension files..." 59 echo " msys extension files..."
60 cd $(TOP_DIR)/msys-extension \ 60 cd $(TOP_DIR)/msys-extension \
61 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 61 && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
62 echo " notepad++..." 62 echo " notepad++..."
63 cd $(TOP_DIR) \ 63 cd $(TOP_DIR) \
64 && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - ) 64 && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
65 echo " README.html..." 65 echo " README.html..."
66 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/ 66 cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
67 echo " refblas..." 67 echo " refblas..."
68 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll 68 cp $(OCTAVE_DIST_DIR)/bin/libblas.dll $(OCTAVE_DIST_DIR)/bin/librefblas.dll
69 endef 69 endef
70 endif 70 endif
71 71
72 define make-dist-files-writable 72 define make-dist-files-writable
73 echo "making all dist files writable by user..." 73 echo "making all dist files writable by user..."
74 chmod -R u+w $(OCTAVE_DIST_DIR) 74 chmod -R u+w $(OCTAVE_DIST_DIR)
103 endif 103 endif
104 104
105 OCTAVE_WRAPPER_SCRIPTS = octave octave-cli octave-config 105 OCTAVE_WRAPPER_SCRIPTS = octave octave-cli octave-config
106 106
107 ifeq ($(MXE_SYSTEM), gnu-linux) 107 ifeq ($(MXE_SYSTEM), gnu-linux)
108 define install-octave-wrapper-scripts 108 define install-octave-wrapper-scripts
109 echo "installing octave wrapper scripts..." 109 echo "installing octave wrapper scripts..."
110 for f in $(OCTAVE_WRAPPER_SCRIPTS); do \ 110 for f in $(OCTAVE_WRAPPER_SCRIPTS); do \
111 mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \ 111 mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \
112 $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \ 112 $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \
113 $(SED) < octave-wrapper.in \ 113 $(SED) < octave-wrapper.in \
114 -e "s|@OCTAVE_VERSION@|$($(OCTAVE_TARGET)_VERSION)|" \ 114 -e "s|@OCTAVE_VERSION@|$($(OCTAVE_TARGET)_VERSION)|" \
115 -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9]+\.[0-9]+\)/\1/')|" \ 115 -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9]+\.[0-9]+\)/\1/')|" \
116 -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \ 116 -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \
117 && $(INSTALL) -m 755 $$f-t $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION); \ 117 && $(INSTALL) -m 755 $$f-t $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION); \
118 rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \ 118 rm -f $(OCTAVE_DIST_DIR)/bin/$$f; \
119 ln -s $$f-$($(OCTAVE_TARGET)_VERSION) $(OCTAVE_DIST_DIR)/bin/$$f; \ 119 ln -s $$f-$($(OCTAVE_TARGET)_VERSION) $(OCTAVE_DIST_DIR)/bin/$$f; \
120 done 120 done
121 endef 121 endef
122 else 122 else
123 define install-octave-wrapper-scripts 123 define install-octave-wrapper-scripts
124 echo "no octave wrapper scripts to install for this system..." 124 echo "no octave wrapper scripts to install for this system..."
125 endef 125 endef
126 endif 126 endif
127 127
128 .PHONY: binary-dist-files 128 .PHONY: binary-dist-files
129 binary-dist-files: $(BINARY_DIST_DEPS) 129 binary-dist-files: $(BINARY_DIST_DEPS)
130 @$(delete-dist-directory) 130 @$(delete-dist-directory)