Mercurial > mxe-octave

diff binary-dist-rules.mk @ 4066:0962acdde3be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
builld: allow out of source build * Makefile.in: add TOP_BUILD_DIR var and use TOP_DIR=srcdir, TOP_BUILD_DIR=builddir, modify paths to use TOP_DIR where needed * binary-dist-rules.mk: use TOP_DIR and TOP_BUILD_DIR where needed * makeinst-script.sh: use script path to determine TOPDIR, use TOPDIR where needed * src/default-octave.mk: install octave-version to builddir * src/stable-octave.mk: install octave-version to builddir * src/octave.mk: install octave-version to builddir * tools/set-mxe-env.sh.in: update fir builddir and srcdir use
author John Donoghue
date Wed, 23 Dec 2015 08:11:04 -0500
parents 8803dfa40236
children e5e0b3f7244b
line wrap: on
line diff
--- a/binary-dist-rules.mk	Fri Dec 11 15:56:18 2015 -0500
+++ b/binary-dist-rules.mk	Wed Dec 23 08:11:04 2015 -0500
@@ -5,9 +5,9 @@
   OCTAVE_DIST_NAME := octave-$(DATE)
 endif
 
-OCTAVE_DIST_DIR := $(TOP_DIR)/dist/$(OCTAVE_DIST_NAME)
+OCTAVE_DIST_DIR := $(TOP_BUILD_DIR)/dist/$(OCTAVE_DIST_NAME)
 
-OCTAVE_NSI_FILE := $(TOP_DIR)/dist/octave.nsi
+OCTAVE_NSI_FILE := $(TOP_BUILD_DIR)/dist/octave.nsi
 
 ifeq ($(MXE_WINDOWS_BUILD),yes)
   TAR_H_OPTION := -h
@@ -35,7 +35,7 @@
 
 define delete-dist-directory
   echo "deleting previous dist directory..."
-  rm -rf $(TOP_DIR)/dist
+  rm -rf $(TOP_BUILD_DIR)/dist
 endef
 
 define make-dist-directory
@@ -62,13 +62,13 @@
       cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/*.dll $(OCTAVE_DIST_DIR)/bin
       cp $(BUILD_TOOLS_PREFIX)/lib/gcc/$(TARGET)/$(build-gcc_VERSION)/*.dll $(OCTAVE_DIST_DIR)/bin
       echo "  msys base files..."
-      cd $(TOP_DIR)/msys-base \
+      cd $(TOP_BUILD_DIR)/msys-base \
         && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
       echo "  msys extension files..."
-      cd $(TOP_DIR)/msys-extension \
+      cd $(TOP_BUILD_DIR)/msys-extension \
         && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
       echo "  notepad++..."
-      cd $(TOP_DIR) \
+      cd $(TOP_BUILD_DIR) \
           && tar -c $(TAR_H_OPTION) -f - notepad++ | ( cd $(OCTAVE_DIST_DIR) ; tar xpf - )
       echo "  README.html..."
       cp $(TOP_DIR)/installer-files/README.html $(OCTAVE_DIST_DIR)/
@@ -174,9 +174,9 @@
     rm -f $(OCTAVE_NSI_FILE); \
   fi
   echo "generating installer script..."
-  ./makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_NSI_FILE)
+  $(TOP_DIR)/makeinst-script.sh $(OCTAVE_DIST_DIR) $(OCTAVE_NSI_FILE)
   echo "generating installer..."
-  $(TARGET)-makensis $(OCTAVE_NSI_FILE) > $(TOP_DIR)/dist/nsis.log
+  $(TARGET)-makensis $(OCTAVE_NSI_FILE) > $(TOP_BUILD_DIR)/dist/nsis.log
 endef
 
 $(OCTAVE_DIST_NAME)-installer.exe: nsis binary-dist-files
@@ -187,7 +187,7 @@
 
 define make-zip-dist
   echo "generating zip file..."
-  cd $(TOP_DIR)/dist \
+  cd $(TOP_BUILD_DIR)/dist \
     && zip -q -9 -r $(OCTAVE_DIST_NAME).zip $(OCTAVE_DIST_NAME)
 endef
 
@@ -197,7 +197,7 @@
 
 define make-tar-dist
   echo "generating tar file..."
-  cd $(TOP_DIR)/dist \
+  cd $(TOP_BUILD_DIR)/dist \
     && tar -c -z -f $(OCTAVE_DIST_NAME).tgz $(OCTAVE_DIST_NAME)
 endef