bug#6602: [PATCH] make dist target for Windows

[Christoph <cschol2112@googlemail.com>]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

On 7/24/2010 7:28 AM, Juanma Barranquero wrote:

> That said, I'm committing your change right now. Great work. Thanks!

Thanks for doing this.

After testing it in the trunk I remembered: one thing I never was quite 
sure how to fix best is the fact that when you run `make dist' on the 
trunk, the root directory the zip file contains is `trunk' (or whatever 
you named your bzr checkout), but it should be `emacs-VERSION'.

Well, I guess it helps to have the code sitting around for a while. :) 
Find attached a patch that fixes this.

The main change is that it copies all necessary files to a temporary 
directory and then creates the zip files from that. After that the 
temporary directory is removed.

This change also made `zipdist.bat' a lot simpler, since I don't need to 
do funky path processing.

Now the correct root directory (based on version) will show inside the 
zip file for the trunk as well as any pretest or final version.

There is also a minor bugfix: README.W32 was not copied to the install 
directory when using `make install'.

Christoph


[-- Attachment #2: makedistw32v7.txt --]
[-- Type: text/plain, Size: 8407 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cschol2112@gmail.com-20100724221001-daf5uef6ueley5d3
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: cbe7fd9fdcab5324d5db459af1712f057ad38e25
# timestamp: 2010-07-24 16:10:20 -0600
# base_revision_id: lekktu@gmail.com-20100724134348-x1dl00925oxq9svi
# 
# Begin patch
=== modified file 'nt/ChangeLog'
--- nt/ChangeLog	2010-07-24 13:35:31 +0000
+++ nt/ChangeLog	2010-07-24 22:10:01 +0000
@@ -1,5 +1,12 @@
 2010-07-24  Christoph Scholtes  <cschol2112@gmail.com>
 
+	* 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  <cschol2112@gmail.com>
+
 	New make target for Windows platform: make dist (bug#6602)
 
 	* INSTALL: Document new dist target and add section about

=== modified file 'nt/makefile.w32-in'
--- nt/makefile.w32-in	2010-07-24 13:35:31 +0000
+++ nt/makefile.w32-in	2010-07-24 22:07:04 +0000
@@ -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 @@
 	- $(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-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

=== modified file 'nt/zipdist.bat'
--- nt/zipdist.bat	2010-07-24 13:35:31 +0000
+++ nt/zipdist.bat	2010-07-24 22:04:10 +0000
@@ -20,25 +20,10 @@
 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 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
+rem arg 1: Emacs version number
+set EMACS_VER=%1
+
+set TMP_DIST_DIR=emacs-%EMACS_VER%
 
 rem Check, if 7zip is installed and available on path
 :ZIP_CHECK
@@ -53,14 +38,12 @@
 
 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 -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
-popd
 goto EXIT
 
 :EXIT

# Begin bundle
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
NA==