diff options
| author | Christoph Scholtes <cschol2112@gmail.com> | 2010-07-24 16:04:10 -0600 |
|---|---|---|
| committer | Christoph Scholtes <cschol2112@gmail.com> | 2010-07-24 16:04:10 -0600 |
| commit | e0d6af9cc6544f93da4fac99226f0f9cfa01440d (patch) | |
| tree | 00d3612d31179c2eee198629ae1934dc44953b45 /nt | |
| parent | 4ad28e2787389c20cefaa9817996650430c6f119 (diff) | |
| download | emacs-e0d6af9cc6544f93da4fac99226f0f9cfa01440d.tar.gz | |
Code cleanup. Added ChangeLog entry.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 22 | ||||
| -rw-r--r-- | 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,5 +1,11 @@ 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) * INSTALL: Document new dist target and add section about 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
|