Refactoring of make dist target

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 47f9b90107560cab21cbc9762bdd58a9e3aa3816..f8e3390873cbf64db8539bcf989f5d5d277bae95 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -25,6 +25,8 @@
 \r
 VERSION                = 24.0.50\r
 \r
+TMP_DIST_DIR    = emacs-$(VERSION)\r
+\r
 TRES           = $(BLD)/emacs.res\r
 CLIENTRES      = $(BLD)/emacsclient.res\r
 \r
@@ -208,6 +210,7 @@ install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE)
        - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin\r
        - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin\r
+       - $(CP) README.W32 $(INSTALL_DIR)\r
        - $(DEL) ../same-dir.tst\r
        - $(DEL) $(INSTALL_DIR)/same-dir.tst\r
        echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"\r
@@ -246,10 +249,22 @@ install-other-dirs-gmake:
 install-shortcuts:\r
        "$(INSTALL_DIR)/bin/addpm" -q\r
 \r
-dist: install-bin \r
-       $(CP) $(DIST_FILES) $(INSTALL_DIR)/bin\r
-       $(CP) README.W32 $(INSTALL_DIR)\r
-       $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(INSTALL_DIR) $(VERSION)$(ARGQUOTE)\r
+dist: install-bin\r
+       mkdir $(TMP_DIST_DIR)\r
+       $(CP) $(INSTALL_DIR)/BUGS $(TMP_DIST_DIR)\r
+       $(CP) $(INSTALL_DIR)/COPYING $(TMP_DIST_DIR)\r
+       $(CP) $(INSTALL_DIR)/README $(TMP_DIST_DIR)\r
+       $(CP) $(INSTALL_DIR)/README.W32 $(TMP_DIST_DIR)\r
+       $(CP) $(INSTALL_DIR)/INSTALL $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(INSTALL_DIR)/bin $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(INSTALL_DIR)/etc $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(INSTALL_DIR)/info $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(INSTALL_DIR)/lisp $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(INSTALL_DIR)/leim $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(INSTALL_DIR)/site-lisp $(TMP_DIST_DIR)\r
+       $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin\r
+       $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE)\r
+       $(DEL_TREE) $(TMP_DIST_DIR)\r
 \r
 force-info:\r
 # Note that doc/emacs/makefile knows how to\r

diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index 87c4e06c4be2a6eecf2bf60632f2319ba242514c..2ab74a498bf1e0344263826c64d07a689e2e18b7 100644 (file)
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -20,25 +20,10 @@ rem You should have received a copy of the GNU General Public License
 rem along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.\r
 \r
 SETLOCAL\r
-rem arg 1: full path to Emacs root directory\r
-set ARG_PATH="%~f1"\r
-rem Path separator cannot be parsed correctly, substitute\r
-set ARG_PATH=%ARG_PATH:\=;%\r
+rem arg 1: Emacs version number\r
+set EMACS_VER=%1\r
 \r
-rem arg 2: Emacs version number\r
-set EMACS_VER=%2\r
-\r
-rem Parse out last directory from passed in full path (arg 1)\r
-for /f "tokens=* delims=;" %%G in (%ARG_PATH%) do call :PARSE_PATH %%G\r
-goto :EXIT\r
-\r
-:PARSE_PATH\r
-if "%1"=="" (\r
-  goto :ZIP_CHECK\r
-)\r
-set ROOT_DIR=%1\r
-SHIFT\r
-goto :PARSE_PATH\r
+set TMP_DIST_DIR=emacs-%EMACS_VER%\r
 \r
 rem Check, if 7zip is installed and available on path\r
 :ZIP_CHECK\r
@@ -53,14 +38,12 @@ goto EXIT
 \r
 rem Build distributions\r
 :ZIP_DIST\r
-pushd ..\..\r
 rem Build and verify full distribution\r
-7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %ROOT_DIR%/BUGS %ROOT_DIR%/COPYING %ROOT_DIR%/README %ROOT_DIR%/README.W32 %ROOT_DIR%/INSTALL %ROOT_DIR%/bin %ROOT_DIR%/etc %ROOT_DIR%/info %ROOT_DIR%/lisp %ROOT_DIR%/leim %ROOT_DIR%/site-lisp\r
+7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%\r
 7z t emacs-%EMACS_VER%-bin-i386.zip\r
 rem Build and verify binary only distribution\r
-7z a -bd -tZIP -mx=9 emacs-%EMACS_VER%-barebin-i386.zip %ROOT_DIR%/README.W32 %ROOT_DIR%/bin %ROOT_DIR%/etc/DOC-X %ROOT_DIR%/COPYING\r
+7z a -bd -tZIP -mx=9 emacs-%EMACS_VER%-barebin-i386.zip %TMP_DIST_DIR%/README.W32 %TMP_DIST_DIR%/bin %TMP_DIST_DIR%/etc/DOC-X %TMP_DIST_DIR%/COPYING\r
 7z t emacs-%EMACS_VER%-barebin-i386.zip\r
-popd\r
 goto EXIT\r
 \r
 :EXIT\r