Re: make dist target for Windows

[Christoph <cschol2112@googlemail.com>]

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

On 3/31/2010 2:30 AM, Eli Zaretskii wrote:
>> +echo.   --distfiles             path to files to be included when running make dist, e.g. libXpm.dll
>>      
> Please make this text shorter, so it fits on a single 80-column line.
>    
Done.

>> +set distfilename=%~nx1
>>      
> I actually don't quite understand why you need to use %~nx1: it looks
> like distfilename is only used to check for messages to the user, so
> you could easily use distfilepath itself.  Is it just for beauty?
>    
Yes, just to show the filename. I removed all of that and just display a 
generic message.

>>   .PHONY: $(ALL)
>>
>> -
>>   addpm:		  stamp_BLD $(BLD)/addpm.exe
>>      
> Please don't make gratuitous white-space changes, at least not as part
> of a patch with real changes.
>    
Sorry, about that. That was not intentional.

>> +	- zipdist.bat $(INSTALL_DIR) $(VERSION)
>>      
> Why do you ignore errors in this command?  It is the single most
> important command in the `dist' target, so perhaps it should really
> error out.
>    
Yes it should. Fixed.

>> +set ARG_PATH="%~f1"
>>      
> Suggest SETLOCAL before the first command that sets environment
> variables.
Good point. Added.

>> +set ARG_PATH=%ARG_PATH:\=;%
>>      
> This warrants a comment, I think.
>    
I had some trouble parsing the path with '\' in it. Someone suggested 
replacing it and it worked miraculously. Still would like to know why 
the '\' didnt work, but my batch-fu is not that great. Do you have any idea?

>> +rem Check, if 7zip is installed and available on path
>> +:ZIP_CHECK
>> +7z a zipcheck zipdist.bat
>> +if %ERRORLEVEL% NEQ 0 goto :ZIP_ERROR
>> +rm zipcheck.7z
>>      
> I suggest instead to run 7z without arguments, which should fail only
> if 7z cannot be invoked by the user.  As a nice side-effect, you also
> get rid of the need to have rm.exe on PATH.
>    
Agreed. This is a better solution.

>> +rem Build distributions
>> +:ZIP_DIST
>> +set CUR_DIR=%CD%
>> +cd ..\..
>> [...]
>> +:EXIT
>> +cd %CUR_DIR%
>>      
> Why not use pushd/popd instead?
>    
Ignorance, I guess. ;) Fixed.

>> +rem Build&  verify full distribution
>>      
> Beware of shell-special characters in REM comments: no one said that
> the shell ignores them.  Older Windows shells didn't.  Just use "and"
> here, to be safe.
>    
Good point. Didn't think of that. Fixed.


v2 of the patch with all the fixes above is attached.

Thanks,
Christoph

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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: cschol2112@gmail.com-20100401014558-cs8rubve1vxlprx5
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: d805eb747d2a5c1188907cfbef960058b1d2252b
# timestamp: 2010-03-31 19:46:37 -0600
# base_revision_id: cyd@stupidchicken.com-20100313195429-\
#   ntt2gdnu64kb6vh8
# 
# Begin patch
=== modified file 'admin/admin.el'
--- admin/admin.el	2010-01-13 08:35:10 +0000
+++ admin/admin.el	2010-03-31 02:27:15 +0000
@@ -95,6 +95,9 @@
   (set-version-in-file root "lib-src/makefile.w32-in" version
 		       (rx (and "VERSION" (0+ space) "=" (0+ space)
 				(submatch (1+ (in "0-9."))))))
+  (set-version-in-file root "nt/makefile.w32-in" version
+		       (rx (and "VERSION" (0+ space) "=" (0+ space)
+				(submatch (1+ (in "0-9."))))))
   ;; nt/emacs.rc also contains the version number, but in an awkward
   ;; format. It must contain four components, separated by commas, and
   ;; in two places those commas are followed by space, in two other

=== added file 'nt/README.W32'
--- nt/README.W32	1970-01-01 00:00:00 +0000
+++ nt/README.W32	2010-03-31 02:27:15 +0000
@@ -0,0 +1,264 @@
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+			   Emacs for Windows
+
+  This README file describes how to set up and run a precompiled
+  version of GNU Emacs for Windows.  This distribution can be found on
+  the ftp.gnu.org server and its mirrors:
+
+	ftp://ftp.gnu.org/gnu/emacs/windows/
+
+  This server contains other distributions, including the full Emacs
+  source distribution and a barebin distribution which can be installed
+  over it, as well as older releases of Emacs for Windows.
+
+  Answers to frequently asked questions, and further information about
+  this port of GNU Emacs and related software packages can be found via
+  http:
+
+	http://www.gnu.org/software/emacs/windows/
+
+* Preliminaries
+
+  Along with this file should be six subdirectories (bin, etc, info,
+  lisp, leim, site-lisp).  If you have downloaded the barebin
+  distribution, then it will contain only the bin directory and the
+  built in documentation in etc/DOC-X, the rest of the subdirectories
+  are in the src distribution, which the barebin distribution is
+  designed to be used with.
+
+* Setting up Emacs
+
+  To install Emacs, simply unpack all the files into a directory of
+  your choice, but note that you might encounter minor problems if
+  there is a space anywhere in the directory name.  To complete the
+  installation process, you can optionally run the program addpm.exe
+  in the bin subdirectory.  This will put an icon for Emacs in the
+  Start Menu under "Start -> Programs -> Gnu Emacs".
+
+  Some users have reported that the Start Menu item is not created for
+  them.  If this happens, just create your own shortcut to runemacs.exe,
+  eg. by dragging it on to the desktop or the Start button.
+
+  Note that running addpm is now an optional step; Emacs is able to
+  locate all of its files without needing any information to be set in
+  the environment or the registry, although such settings will still
+  be obeyed if present.  This is convenient for running Emacs on a
+  machine which disallows registry changes, or on which software
+  should not be installed.  For instance, you can now run Emacs
+  directly from a CD or USB flash drive without copying or installing
+  anything on the machine itself.
+
+* Starting Emacs
+
+  To run Emacs, simply select Emacs from the Start Menu, or invoke
+  runemacs.exe directly from Explorer or from a command prompt.  This
+  will start Emacs in its default GUI mode, ready to use.  If you have
+  never used Emacs before, you should follow the tutorial at this
+  point (select Emacs Tutorial from the Help menu), since Emacs is
+  quite different from ordinary Windows applications in many respects.
+
+  If you want to use Emacs in tty or character mode within a command
+  window, you can start it by typing "emacs -nw" at the command prompt.
+  (Obviously, you need to ensure that the Emacs bin subdirectory is in
+  your PATH first, or specify the path to emacs.exe.)  The -nw
+  (non-windowed) mode of operation is most useful if you have a telnet
+  server on your machine, allowing you to run Emacs remotely.
+
+* EXE files included
+
+  Emacs comes with the following executable files in the bin directory.
+
+  + emacs.exe - The main Emacs executable.  As this is designed to run
+    as both a text-mode application (emacs -nw) and as a GUI application,
+    it will pop up a command prompt window if run directly from Explorer.
+
+  + runemacs.exe - A wrapper for running Emacs as a GUI application
+    without popping up a command prompt window.
+
+  + emacsclient.exe - A command-line client program that can
+    communicate with a running Emacs process.  See the `Emacs Server'
+    node of the Emacs manual.
+
+  + emacsclientw.exe - A version of emacsclient that does not open
+    a command-line window.
+
+  + addpm.exe - A basic installer that creates Start Menu icons for Emacs.
+    Running this is optional.
+
+  + cmdproxy.exe - Used internally by Emacs to work around problems with
+    the native shells in various versions of Windows.
+
+  + ctags.exe, etags.exe - Tools for generating tag files.  See the
+    `Tags' node of the Emacs manual.
+
+  + ebrowse.exe - A tool for generating C++ browse information.  See the
+    `Ebrowse' manual.
+
+  + ddeclient.exe - A tool for interacting with DDE servers.
+
+  + hexl.exe - A tool for converting files to hex dumps.  See the
+    `Editing Binary Files' node of the Emacs manual.
+
+  + movemail.exe - A helper application for safely moving mail from
+    a mail spool or POP server to a local user mailbox.  See the
+    `Movemail' node of the Emacs manual.
+
+  + digest-doc.exe, sorted-doc.exe - Tools for rebuilding the
+    built-in documentation.
+
+* Image support
+
+  Emacs has built in support for XBM and PPM/PGM/PBM images, and the
+  libXpm library is bundled, providing XPM support (required for color
+  toolbar icons and splash screen).  Source for libXpm should be available
+  on the same place as you got this binary distribution from.  The version
+  of libXpm bundled with this version of Emacs is 3.5.7, based on x.org's
+  libXpm library from X11R7.3.
+
+  Emacs can also support some other image formats with appropriate
+  libraries.  These libraries are all available as part of GTK, or from
+  gnuwin32.sourceforge.net.  Emacs will find them if the directory they
+  are installed in is on the PATH.
+
+      PNG: requires the PNG reference library 1.2 or later, which will
+      be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll
+      or libpng.dll.  LibPNG requires zlib, which should come from the same
+      source as you got libpng.
+
+      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
+
+      TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll
+      or libtiff.dll.
+
+      GIF: requires libungif or giflib 4.1 or later, which will be
+      called giflib4.dll, libungif4.dll or libungif.dll.
+
+   In addition, Emacs can be compiled to support SVG.  This precompiled
+   distribution has not been compiled that way, since the SVG library
+   or one or more of its extensive dependencies appear to be
+   unreliable under Windows.  See nt/INSTALL in the src distribution if
+   you wish to compile Emacs with SVG support.
+
+* Uninstalling Emacs
+
+  If you should need to uninstall Emacs, simply delete all the files
+  and subdirectories from the directory where it was unpacked (Emacs
+  does not install or update any files in system directories or
+  anywhere else).  If you ran the addpm.exe program to create the
+  registry entries and the Start menu icon, then you can remove the
+  registry entries using regedit.  All of the settings are written
+  under the Software\GNU\Emacs key in HKEY_LOCAL_MACHINE, or if you
+  didn't have administrator privileges when you installed, the same
+  key in HKEY_CURRENT_USER.  Just delete the whole Software\GNU\Emacs
+  key.
+
+  The Start menu entry can be removed by right-clicking on the Task bar
+  and selecting Properties, then using the Remove option on the Start
+  Menu Programs page.  (If you installed under an account with
+  administrator privileges, then you need to click the Advanced button
+  and look for the Gnu Emacs menu item under All Users.)
+
+* Troubleshooting
+
+  Unpacking the distributions
+
+  If you encounter trouble trying to run Emacs, there are a number of
+  possible causes.  Check the following for indications that the
+  distribution was not corrupted by the tools used to unpack it:
+
+    * Be sure to disable CR/LF translation or the executables will
+      be unusable.  Older versions of WinZipNT would enable this
+      translation by default.  If you are using WinZipNT, disable it.
+      (I don't have WinZipNT myself, and I do not know the specific
+      commands necessary to disable it.)
+
+    * Check that filenames were not truncated to 8.3.  For example,
+      there should be a file lisp\abbrevlist.elc; if this has been
+      truncated to abbrevli.elc, your distribution has been corrupted
+      while unpacking and Emacs will not start.
+
+  If you believe you have unpacked the distributions correctly and are
+  still encountering problems, see the section on Further Information
+  below.
+
+  Virus scanners
+
+  Some virus scanners interfere with Emacs' use of subprocesses.  If you
+  are unable to use subprocesses and you use Dr. Solomon's WinGuard or
+  McAfee's Vshield, turn off "Scan all files" (WinGuard) or "boot sector
+  scanning" (McAfee exclusion properties).
+
+* Further information
+
+  If you have access to the World Wide Web, I would recommend pointing
+  your favorite web browser to the following document (if you haven't
+  already):
+
+	http://www.gnu.org/software/emacs/windows/
+
+  This document serves as an FAQ and a source for further information
+  about the Windows port and related software packages.
+
+  In addition to the FAQ, there is a mailing list for discussing issues
+  related to the Windows port of Emacs.  For information about the
+  list, see this Web page:
+
+	http://lists.gnu.org/mailman/listinfo/help-emacs-windows
+
+  To ask questions on the mailing list, send email to
+  help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
+  To subscribe to the list or unsubscribe from it, fill the form you
+  find at http://lists.gnu.org/mailman/listinfo/help-emacs-windows as
+  explained there.
+
+  Another valuable source of information and help which should not be
+  overlooked is the various Usenet news groups dedicated to Emacs.
+  These are particularly good for help with general issues which aren't
+  specific to the Windows port of Emacs.  The main news groups to use
+  for seeking help are:
+
+	gnu.emacs.help
+	comp.emacs
+
+  There are also fairly regular postings and announcements of new or
+  updated Emacs packages on this group:
+
+	gnu.emacs.sources
+
+* Reporting bugs
+
+  If you encounter a bug in this port of Emacs, we would like to hear
+  about it.  First check the FAQ on the web page above to see if the bug
+  is already known and if there are any workarounds.  Then check whether
+  the bug has something to do with code in your .emacs file, e.g. by
+  invoking Emacs with the "-Q" option.
+
+  If you decide that it is a bug in Emacs, use the built in bug
+  reporting facility to report it (from the menu; Help -> Send Bug Report).
+  If you have not yet configured Emacs for mail, then when you press
+  C-c C-c to send the report, it will ask you to paste the text of the
+  report into your mail client.  If the bug is related to subprocesses,
+  also specify which shell you are using (e.g., include the values of
+  `shell-file-name' and `explicit-shell-file-name' in your message).
+
+  Enjoy!
+
+\f
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

=== modified file 'nt/configure.bat'
--- nt/configure.bat	2010-01-13 08:35:10 +0000
+++ nt/configure.bat	2010-04-01 01:45:58 +0000
@@ -89,6 +89,7 @@
 set doldflags=
 set sep1=
 set sep2=
+set distfilepath=
 
 rem ----------------------------------------------------------------------
 rem   Handle arguments.
@@ -110,6 +111,7 @@
 if "%1" == "--without-tiff" goto withouttiff
 if "%1" == "--without-xpm" goto withoutxpm
 if "%1" == "--with-svg" goto withsvg
+if "%1" == "--distfiles" goto distfiles
 if "%1" == "" goto checkutils
 :usage
 echo Usage: configure [options]
@@ -129,6 +131,7 @@
 echo.   --without-tiff          do not use TIFF library even if it is installed
 echo.   --without-xpm           do not use XPM library even if it is installed
 echo.   --with-svg              use the RSVG library (experimental)
+echo.   --distfiles             path to files for make dist, e.g. libXpm.dll
 goto end
 rem ----------------------------------------------------------------------
 :setprefix
@@ -226,6 +229,14 @@
 goto again
 
 rem ----------------------------------------------------------------------
+
+:distfiles
+shift
+set distfilepath=%1
+shift
+goto again
+
+rem ----------------------------------------------------------------------
 rem    Check that necessary utilities (cp and rm) are present.
 :checkutils
 echo Checking for 'cp'...
@@ -513,6 +524,21 @@
 :svgDone
 rm -f junk.c junk.obj junk.err junk.out
 
+if [%distfilepath%] == [] goto distfilesDone
+
+echo Checking for distfiles...
+if exist %distfilepath% goto haveDistfiles
+
+echo ...distfiles not found.
+set distfilepath=
+goto :distfilesDone
+
+:haveDistfiles
+echo ...distfiles found.
+
+:distfilesDone
+
+
 rem ----------------------------------------------------------------------
 :genmakefiles
 echo Generating makefiles
@@ -532,6 +558,7 @@
 if (%profile%) == (Y) echo PROFILE=1 >>config.settings
 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings
 if not "(%prefix%)" == "()" echo INSTALL_DIR=%prefix%>>config.settings
+if not "(%distfilepath%)" == "()" echo DIST_FILES=%distfilepath%>>config.settings
 rem We go thru docflags because usercflags could be "-DFOO=bar" -something
 rem and the if command cannot cope with this
 for %%v in (%usercflags%) do if not (%%v)==() set docflags=Y

=== modified file 'nt/makefile.w32-in'
--- nt/makefile.w32-in	2010-01-13 08:35:10 +0000
+++ nt/makefile.w32-in	2010-04-01 01:40:58 +0000
@@ -23,6 +23,8 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out
 #        (and remove or replace this comment).
 
+VERSION		= 24.0.50
+
 TRES		= $(BLD)/emacs.res
 CLIENTRES	= $(BLD)/emacsclient.res
 
@@ -202,7 +204,6 @@
 	- $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin
 	- $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin
 	- $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin
-	- "$(INSTALL_DIR)/bin/addpm" -q
 	- $(DEL) ../same-dir.tst
 	- $(DEL) $(INSTALL_DIR)/same-dir.tst
 	echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
@@ -238,6 +239,16 @@
 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
 	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
 
+install-shortcuts:
+	"$(INSTALL_DIR)/bin/addpm" -q
+	
+.PHONY: install	
+
+dist: install
+	- $(CP) $(DIST_FILES) $(INSTALL_DIR)/bin
+	- $(CP) README.W32 $(INSTALL_DIR)
+	zipdist.bat $(INSTALL_DIR) $(VERSION)
+    
 force-info:
 # Note that doc/emacs/makefile knows how to
 # put the info files in $(infodir),

=== added file 'nt/zipdist.bat'
--- nt/zipdist.bat	1970-01-01 00:00:00 +0000
+++ nt/zipdist.bat	2010-04-01 01:40:58 +0000
@@ -0,0 +1,66 @@
+@echo off
+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+rem   Free Software Foundation, Inc.
+
+rem Author: Christoph Scholtes cschol2112 at gmail.com
+
+rem This file is part of GNU Emacs.
+
+rem GNU Emacs is free software: you can redistribute it and/or modify
+rem it under the terms of the GNU General Public License as published by
+rem the Free Software Foundation, either version 3 of the License, or
+rem (at your option) any later version.
+
+rem GNU Emacs is distributed in the hope that it will be useful,
+rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+rem GNU General Public License for more details.
+
+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 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 Check, if 7zip is installed and available on path
+:ZIP_CHECK
+7z
+if %ERRORLEVEL% NEQ 0 goto :ZIP_ERROR
+goto ZIP_DIST
+
+:ZIP_ERROR
+echo.
+echo ERROR: Make sure 7zip is installed and available on the Windows Path!
+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 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 t emacs-%EMACS_VER%-barebin-i386.zip
+popd
+goto EXIT
+
+:EXIT

# Begin bundle
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
VGk9kgnN1i+xzv6fef+LuSKcKEgue8M+gA==