Code cleanup. Added ChangeLog entry.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index fbf5bdbaa3013fb630b50ead18478e26207d98cd..4bbf483eb696f660430849b2bbec6744cdab31fd 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
+
+       * makefile.w32-in: Use temporary directory to create distribution
+       zip files in `dist' target.
+       * zipdist.bat: Simplify code using temporary directory.
+
 2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
 
        New make target for Windows platform: make dist (bug#6602)

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index f8e3390873cbf64db8539bcf989f5d5d277bae95..58f4478fb848ea0617a2d8b7f1e22a78ed238454 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -251,17 +251,17 @@ install-shortcuts:
 \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) "$(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

diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index 2ab74a498bf1e0344263826c64d07a689e2e18b7..af90f6173b9a2004df5c0faa5280552be73bca5b 100644 (file)
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -42,7 +42,7 @@ rem Build and verify full distribution
 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 %TMP_DIST_DIR%/README.W32 %TMP_DIST_DIR%/bin %TMP_DIST_DIR%/etc/DOC-X %TMP_DIST_DIR%/COPYING\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%-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
 goto EXIT\r
 \r