changeset 5954:90a4202652e7

Don't delete octave wrapper executables when packaging for Windows. * binary-dist-rules.mk: Don't delete octave wrapper executables when packaging for Windows.
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 17 Nov 2021 15:09:42 +0100
parents 00a24f9b9cae
children f42752ce0ae3
files binary-dist-rules.mk
diffstat 1 files changed, 2 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/binary-dist-rules.mk	Wed Nov 17 10:46:45 2021 +0100
+++ b/binary-dist-rules.mk	Wed Nov 17 15:09:42 2021 +0100
@@ -121,9 +121,7 @@
         (cd '$(OCTAVE_DIST_DIR)' && $(PATCH) -p1 -u) < $(TOP_DIR)/installer-files/octave-no-short-path.patch; \
       fi
       cp $(TOP_BUILD_DIR)/HG-ID $(OCTAVE_DIST_DIR)/
-      echo "  updating octave .exe to script files..."
-      rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.exe
-      rm -f $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
+      echo "  installing octave.bat script file..."
       cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/bin/octave.bat
       # This patch can be dropped as soon as those lines are removed from
       # "octave.bat" for all targets (including stable and release).
@@ -165,9 +163,7 @@
       cp $(TOP_DIR)/installer-files/octave-firsttime.vbs $(OCTAVE_DIST_DIR)/
       cp $(TOP_DIR)/installer-files/fc_update.bat $(OCTAVE_DIST_DIR)/
       cp $(TOP_DIR)/installer-files/post-install.bat $(OCTAVE_DIST_DIR)/
-      echo "  updating octave .exe to script files..."
-      rm -f $(OCTAVE_DIST_DIR)/bin/octave.exe
-      rm -f $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).exe
+      echo "  installing octave.bat script files..."
       cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave.bat
       cp $(TOP_DIR)/installer-files/octave.bat $(OCTAVE_DIST_DIR)/bin/octave-$($(OCTAVE_TARGET)_VERSION).bat
     endef