From 4ad28e2787389c20cefaa9817996650430c6f119 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 24 Jul 2010 15:35:36 -0600 Subject: [PATCH 1/5] Refactoring of make dist target --- nt/makefile.w32-in | 23 +++++++++++++++++++---- nt/zipdist.bat | 27 +++++---------------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 47f9b901075..f8e3390873c 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -25,6 +25,8 @@ VERSION = 24.0.50 +TMP_DIST_DIR = emacs-$(VERSION) + TRES = $(BLD)/emacs.res CLIENTRES = $(BLD)/emacsclient.res @@ -208,6 +210,7 @@ install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE) - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin + - $(CP) README.W32 $(INSTALL_DIR) - $(DEL) ../same-dir.tst - $(DEL) $(INSTALL_DIR)/same-dir.tst echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst" @@ -246,10 +249,22 @@ install-other-dirs-gmake: install-shortcuts: "$(INSTALL_DIR)/bin/addpm" -q -dist: install-bin - $(CP) $(DIST_FILES) $(INSTALL_DIR)/bin - $(CP) README.W32 $(INSTALL_DIR) - $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(INSTALL_DIR) $(VERSION)$(ARGQUOTE) +dist: install-bin + mkdir $(TMP_DIST_DIR) + $(CP) $(INSTALL_DIR)/BUGS $(TMP_DIST_DIR) + $(CP) $(INSTALL_DIR)/COPYING $(TMP_DIST_DIR) + $(CP) $(INSTALL_DIR)/README $(TMP_DIST_DIR) + $(CP) $(INSTALL_DIR)/README.W32 $(TMP_DIST_DIR) + $(CP) $(INSTALL_DIR)/INSTALL $(TMP_DIST_DIR) + $(CP_DIR) $(INSTALL_DIR)/bin $(TMP_DIST_DIR) + $(CP_DIR) $(INSTALL_DIR)/etc $(TMP_DIST_DIR) + $(CP_DIR) $(INSTALL_DIR)/info $(TMP_DIST_DIR) + $(CP_DIR) $(INSTALL_DIR)/lisp $(TMP_DIST_DIR) + $(CP_DIR) $(INSTALL_DIR)/leim $(TMP_DIST_DIR) + $(CP_DIR) $(INSTALL_DIR)/site-lisp $(TMP_DIST_DIR) + $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin + $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE) + $(DEL_TREE) $(TMP_DIST_DIR) force-info: # Note that doc/emacs/makefile knows how to diff --git a/nt/zipdist.bat b/nt/zipdist.bat index 87c4e06c4be..2ab74a498bf 100644 --- 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/. SETLOCAL -rem arg 1: full path to Emacs root directory -set ARG_PATH="%~f1" -rem Path separator cannot be parsed correctly, substitute -set ARG_PATH=%ARG_PATH:\=;% +rem arg 1: Emacs version number +set EMACS_VER=%1 -rem arg 2: Emacs version number -set EMACS_VER=%2 - -rem Parse out last directory from passed in full path (arg 1) -for /f "tokens=* delims=;" %%G in (%ARG_PATH%) do call :PARSE_PATH %%G -goto :EXIT - -:PARSE_PATH -if "%1"=="" ( - goto :ZIP_CHECK -) -set ROOT_DIR=%1 -SHIFT -goto :PARSE_PATH +set TMP_DIST_DIR=emacs-%EMACS_VER% rem Check, if 7zip is installed and available on path :ZIP_CHECK @@ -53,14 +38,12 @@ goto EXIT rem Build distributions :ZIP_DIST -pushd ..\.. 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 %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 +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% 7z t emacs-%EMACS_VER%-bin-i386.zip rem Build and verify binary only distribution -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 +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 7z t emacs-%EMACS_VER%-barebin-i386.zip -popd goto EXIT :EXIT From e0d6af9cc6544f93da4fac99226f0f9cfa01440d Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 24 Jul 2010 16:04:10 -0600 Subject: [PATCH 2/5] Code cleanup. Added ChangeLog entry. --- nt/ChangeLog | 6 ++++++ nt/makefile.w32-in | 22 +++++++++++----------- nt/zipdist.bat | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index fbf5bdbaa30..4bbf483eb69 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2010-07-24 Christoph Scholtes + + * 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 New make target for Windows platform: make dist (bug#6602) diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index f8e3390873c..58f4478fb84 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -251,17 +251,17 @@ install-shortcuts: dist: install-bin mkdir $(TMP_DIST_DIR) - $(CP) $(INSTALL_DIR)/BUGS $(TMP_DIST_DIR) - $(CP) $(INSTALL_DIR)/COPYING $(TMP_DIST_DIR) - $(CP) $(INSTALL_DIR)/README $(TMP_DIST_DIR) - $(CP) $(INSTALL_DIR)/README.W32 $(TMP_DIST_DIR) - $(CP) $(INSTALL_DIR)/INSTALL $(TMP_DIST_DIR) - $(CP_DIR) $(INSTALL_DIR)/bin $(TMP_DIST_DIR) - $(CP_DIR) $(INSTALL_DIR)/etc $(TMP_DIST_DIR) - $(CP_DIR) $(INSTALL_DIR)/info $(TMP_DIST_DIR) - $(CP_DIR) $(INSTALL_DIR)/lisp $(TMP_DIST_DIR) - $(CP_DIR) $(INSTALL_DIR)/leim $(TMP_DIST_DIR) - $(CP_DIR) $(INSTALL_DIR)/site-lisp $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/INSTALL" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR) $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE) $(DEL_TREE) $(TMP_DIST_DIR) diff --git a/nt/zipdist.bat b/nt/zipdist.bat index 2ab74a498bf..af90f6173b9 100644 --- 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% 7z t emacs-%EMACS_VER%-bin-i386.zip rem Build and verify binary only distribution -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 +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 7z t emacs-%EMACS_VER%-barebin-i386.zip goto EXIT From 5904117d3cff170416515d4a691a00bdb243fce1 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 24 Jul 2010 16:07:04 -0600 Subject: [PATCH 3/5] Fixed whitespace. --- nt/makefile.w32-in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 58f4478fb84..2b9ffbad61e 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -25,7 +25,7 @@ VERSION = 24.0.50 -TMP_DIST_DIR = emacs-$(VERSION) +TMP_DIST_DIR = emacs-$(VERSION) TRES = $(BLD)/emacs.res CLIENTRES = $(BLD)/emacsclient.res From 7f86df5f422abd4738c4e4e8a2a6d0e447783746 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 24 Jul 2010 16:10:01 -0600 Subject: [PATCH 4/5] Added ChangeLog entry for copying of README.W32. --- nt/ChangeLog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index 4bbf483eb69..e73f91091ce 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,7 +1,8 @@ 2010-07-24 Christoph Scholtes - * makefile.w32-in: Use temporary directory to create distribution - zip files in `dist' target. + * makefile.w32-in: Copy README.W32 to installation directory + during `make install'. Use temporary directory to create + distribution zip files in `dist' target. * zipdist.bat: Simplify code using temporary directory. 2010-07-24 Christoph Scholtes From d24076a601db4f988b261514bf62550f77d06837 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sat, 24 Jul 2010 21:07:15 -0600 Subject: [PATCH 5/5] Added README.W32 to distclean. Updated Changelog. --- nt/ChangeLog | 5 +++-- nt/makefile.w32-in | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nt/ChangeLog b/nt/ChangeLog index e73f91091ce..702f44e069b 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,8 +1,9 @@ 2010-07-24 Christoph Scholtes * makefile.w32-in: Copy README.W32 to installation directory - during `make install'. Use temporary directory to create - distribution zip files in `dist' target. + during `make install'. Remove README.W32 with `distclean' (in + case Emacs was installed in place). Use temporary directory to + create distribution zip files in `dist' target. * zipdist.bat: Simplify code using temporary directory. 2010-07-24 Christoph Scholtes diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 2b9ffbad61e..b0f5edb28a2 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -351,6 +351,7 @@ top-distclean: - $(DEL) stamp_BLD - $(DEL) ../etc/DOC ../etc/DOC-X - $(DEL) config.log Makefile + - $(DEL) ../README.W32 distclean: distclean-other-dirs-$(MAKETYPE) top-distclean