Commit graph

163 commits

Author SHA1 Message Date
Stefan Kangas
cda78edc7d ; Fix typos 2025-01-23 03:14:37 +01:00
Stefan Kangas
7fa975adbc Update copyright year to 2025
Run "TZ=UTC0 admin/update-copyright".
2025-01-02 18:39:42 +01:00
Stefan Kangas
5bafb11b40 ; Fix copyright year 2024-12-28 02:24:07 +01:00
Corwin Brust
8b95549e90 * admin/nt/dist-build/build-dep-zips.py: (deps src) handle zst
This patch fixes various problems preventing this script from
working. The job of this script is to collect Emacs' dependanicies and
the (MSYS2/MinGW64) source archives for dependancies (including 2nd
etc. order dependancies) into zip archives.  GPL requires distributing such
archives (along with Emacs' own sources) when distributing GPL binaries.

Most principle of the changes is support for MSYS2 "w64" source archives
in zst format; previously this script assumed all sources were available
as tar.gz files.   Additionaly several DLLs are added to list of
required, including sqllite3 and tree-sitter.

In general this is a maintaince fix to ensure others have access to the
code used to create pretest (and, presumably release) version of Emacs
30.  Additional changes are required to progmatically identify changes
in Emacs' dependancies (e.g. after building a new Emacs binary for
distribution).  There is commented out code to this effect in the
changes I've installed which did work, for a brief period in time; I
suspect some changes in MSYS2 made it more difficult (or impossible?) to
invoke the MSYS2 shell (under which this python script must run) from
the MINGW64 (under which Emacs is built).  I may resort to a powershell
script as a way to orchistrate/invoke both MSYS2 and MING64 but I'm
currently still messing with a Makefile based approach (which would run
under MINGW64), in any event I believe we're all agreed this script
must interigate Emacs to create the "starting list" of dependancies to
include as a way to resolve this issue (missing/incorrect deps are
frequent source of broken binary releases).  (bug#65206)
2024-12-24 23:55:21 -06:00
Corwin Brust
0e43e35f96 * admin/nt/dist-build/emacs.nsi: (Uninstall) delete only one Emacs
Previously, the uninstaller would recursively, unconditionally, remove
the parent folder in which Emacs was installed (the folder selected by
when running the installer), into which the installer places a folder
named for the given release (e.g. emacs-30.1).  This was a problem
during uinstalation when the selected folder contained other versions of
Emacs the user did not wish to remove.  Additionally, deleting Start Menu
short-cuts did not work (bug#68756).

Some installer language now better reflects that users are not
required to "Accept" the GNU Public License in order to use (etc.)
Emacs (bug#67667).

Users selections related to where to create (or not create) Start Menu
shortcuts are no longer ignored. (bug#75013)

Emacs (as installed by the installer) can now be uninstalled via
Windows' Add/Remove Progrms Control Panel.

The uninstaller will now remove (empty) parent folders, both under
Program Files and (when creation of shortcuts is enabled) under the
select Start Menu location.
2024-12-22 23:08:08 -06:00
Stefan Kangas
a6cab228d4 ; Fix typos 2024-07-18 11:46:50 +02:00
Mattias Engdegård
1135ce461d Always enable native JSON support and remove Jansson references
* src/json.c (Fjson__available_p): Remove.
* lisp/subr.el (json-available-p): Always return t.
* admin/nt/dist-build/build-dep-zips.py:
* configure.ac:
* doc/lispref/text.texi (Parsing JSON):
* java/INSTALL:
* java/org/gnu/emacs/EmacsNative.java (EmacsNative):
* lisp/term/w32-win.el (dynamic-library-alist):
* m4/ndk-build.m4 (ndk_INIT):
* msdos/sed1v2.inp:
* nt/INSTALL:
* nt/INSTALL.W64:
* src/Makefile.in:
* src/emacs.c (main):
* src/lisp.h:
Remove JSON configuration options and references to it and Jansson from
documentation and build files.
* etc/NEWS: Announce.
2024-03-30 15:19:56 +01:00
Po Lu
8e1c56ae46 ; Add 2024 to copyright years 2024-01-02 09:47:10 +08:00
Eli Zaretskii
cae528457c ; Add 2023 to copyright years. 2023-01-01 05:31:12 -05:00
Paul Eggert
54e0b14a69 Adjust better to Autoconf quoting style change
* admin/gitmerge.el (gitmerge-emacs-version):
* admin/nt/dist-build/build-zips.sh (ACTUAL_VERSION):
* admin/quick-install-emacs (VERSION):
* lisp/cedet/ede/emacs.el (ede-emacs-version):
Adjust to change in configure.ac’s Autoconf quoting style.
* etc/srecode/ede-autoconf.srt:
* test/lisp/progmodes/autoconf-tests.el:
(autoconf-tests-current-defun-function-define)
(autoconf-tests-current-defun-function-subst):
Use better Autoconf quoting.
* make-dist (version): Simplify.
2022-07-05 23:27:17 -05:00
Mattias Engdegård
8d68760dde ; Fix typos. 2022-07-02 13:32:41 +02:00
Eli Zaretskii
dcd76bd48d Merge from origin/emacs-28
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
#	lib/cdefs.h
#	lisp/erc/erc-dcc.el
#	lisp/erc/erc-imenu.el
#	lisp/erc/erc-replace.el
#	lisp/image-dired.el
#	lisp/progmodes/xref.el
#	m4/alloca.m4
#	m4/byteswap.m4
#	m4/errno_h.m4
#	m4/getopt.m4
#	m4/gnulib-common.m4
#	m4/inttypes.m4
#	m4/stddef_h.m4
#	m4/stdint.m4
#	m4/sys_socket_h.m4
2022-01-01 07:03:03 -05:00
Eli Zaretskii
19dcb237b5 ; Add 2022 to copyright years. 2022-01-01 02:45:51 -05:00
Lars Ingebrigtsen
5beed9dfed Adjust build-dep-zips.py download link
* admin/nt/dist-build/build-dep-zips.py (download_source): Adjust
the download link (bug#40628).
2021-11-14 02:06:26 +01:00
Noam Postavsky
00e3baf6e3 Optimize admin/nt dependency computation
admin/nt/dist-build/build-dep-zips.py (immediate_deps)
(extract_deps): Gather package dependency info in batches, rather than
one at a time.  This reduces the number of invocations of 'pacman -Si
...' to the depth of the dependency tree, rather than the number of
dependent packages.
(top-level): Don't call 'extract_deps' when given the '-l' option (bug#40628).
2021-11-12 10:21:45 +01:00
Phillip Lord
a16e66c681 Clarify build environment
* admin/nt/dist-build/README-scripts:
2021-11-03 11:03:00 +00:00
Phillip Lord
6ab6b2f1c8 Clarify build directory structure
* admin/nt/dist-build/README-scripts: Clarify build directory structure
2021-11-03 10:30:02 +00:00
Stefan Kangas
0cabf8bc36 ; Fix typos 2021-09-03 13:05:32 +02:00
Phillip Lord
667f2e097c Remove support for 32 bit build
* admin/nt/dist-build/README-scripts: Update
* admin/nt/dist-build/README-windows-binaries: Update
* admin/nt/dist-build/build-zips.sh: Remove 32 bit and fix paths
* admin/nt/dist-build/build-dep-zips.py: Remove 32 bit and update
  paths
* admin/nt/dist-build/emacs.nsi: Remove 32 bit and fix paths
2021-01-15 21:37:25 +00:00
Phillip Lord
f95c1b3230 Update dependency capture
* admin/nt/dist-build/build-dep-zips.py: Use ntldd to directly
  determine DLL dependencies
2021-01-15 21:37:25 +00:00
Phillip Lord
1fa1354964 Remove relative paths for consistency
* admin/nt/dist-build/build-zips.sh: Remove Paths
2021-01-03 21:05:45 +00:00
Paul Eggert
ba05d005e5 Update copyright year to 2021
Run "TZ=UTC0 admin/update-copyright".
2021-01-01 01:13:56 -08:00
Stefan Kangas
1c75ca109d * admin/nt/dist-build/build-dep-zips.py: Remove unused import. 2020-12-08 09:30:55 +01:00
Phillip Lord
256bb844b0 Remove Emacs-27 reference
* admin/nt/dist-build/README-windows-binaries:
2020-07-02 18:03:23 +01:00
Glenn Morris
ffb89ed5f0 Merge from origin/emacs-27
5280e118c0 (origin/emacs-27) ; * src/xdisp.c (pos_visible_p): Fix las...
bb1a9481c9 Fix posn-at-point at beginning of a display string
0c4b033670 Improve documentation of Info node movement commands
632b0119e1 Add Jansson dependency to Windows Build
dbfcdab837 Unbreak 'reverse-region'
c37de84845 Fix typos and markup in fill column indicator docs
f61bff3ee9 ; * CONTRIBUTE: Clarify the preferences for patch formatting.
368e140660 Avoid crashes in 'defconst'
11e3413cff Fix text about Lisp archives in the Emacs FQ
4c81724675 Don't use 'cl' functions in ELisp manual's examples
2020-06-26 07:50:38 -07:00
Phillip Lord
632b0119e1 Add Jansson dependency to Windows Build
* admin/nt/dist-build/build-dep-zips.py: Add dependency
2020-06-22 18:15:22 +01:00
Glenn Morris
5d5d5d492c Merge from origin/emacs-27
d66331aea4 (origin/emacs-27) Don't build the Gnulib 'utimens' module ...
f2351a689b Add Harfbuzz dependency
8944310d7c Don't signal during backtrace unrewind (Bug#40088)
8709aaddd8 Fix a couple of problems in changelog generating functions
9ab85f087f Fix cl-concatenate (Bug#40180)
561e9fb91b Improve documentation of project.el commands
b28a9a6cc3 Make svg images with links valid
7515252cce * lisp/tab-line.el (tab-line-new-button-show): New defcustom.

# Conflicts:
#	etc/NEWS
#	nt/gnulib-cfg.mk
2020-03-23 09:48:15 -07:00
Phillip Lord
f2351a689b Add Harfbuzz dependency
* admin/nt/dist-build/build-dep-zips.py: Add harfbuzz as a dependency.
2020-03-23 09:38:36 +00:00
Glenn Morris
00ddb49408 Merge from origin/emacs-27
138e9051c7 Update distribution documentation
2020-01-03 07:50:15 -08:00
Phillip Lord
138e9051c7 Update distribution documentation
* admin/nt/README-ftp-server: Remove as obsolete
* admin/nt/dist-build/README-windows-binaries: Add information
  about installer
2020-01-01 11:50:14 +01:00
Paul Eggert
c6fb86b40b Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3
4cd143aded Fix copyright years by hand
365e01cc9f Update copyright year to 2020
cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac...

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
2020-01-01 01:08:16 +00:00
Paul Eggert
365e01cc9f Update copyright year to 2020
Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
2020-01-01 00:59:52 +00:00
Glenn Morris
822c98a442 Merge from origin/emacs-27
8aad80d661 Fix installer build
47a73e3e14 Update Windows build documentation
cd55984153 Calc: add missing dynamic variable declarations
e8aa6f19e9 * doc/emacs/buffers.texi (Kill Buffer): Improve indexing.
ccd7cd2c51 Speed up dired-do-find-regexp
7edb1f0773 ; Remove outdated declarations
6ab40c1a51 ; Clarify the assumption
be38e39fcc project--find-regexp-in-files: Support remote files
21c3020fce Document some restrictions for module functions.
e1ce9f3423 Don't recommend using 'module-load' for loading modules.
03f962a486 Port x_get_monitor_attributes_fallback to !HAVE_GTK3
0b32f59764 Fix compilation warning in gnus-start.el
2019-12-27 07:50:16 -08:00
Phillip Lord
8aad80d661 Fix installer build
* admin/nt/dist-build/build-zips.sh: Ensure that NSIS build always
  uses the actual build number to locate its files.
2019-12-26 23:01:02 +01:00
Phillip Lord
f10409914d Update for Emacs-28
* admin/nt/dist-build/build-dep-zips.py: Emacs major version number.
2019-12-26 21:15:32 +01:00
Phillip Lord
47a73e3e14 Update Windows build documentation
* admin/nt/dist-build/README-scripts: Update with branch and snapshot
  information.
2019-12-26 21:13:38 +01:00
Paul Eggert
b0f20651e3 ; Spelling fixes 2019-12-10 20:05:49 -08:00
Phillip Lord
61c2183a44 Improve logic for dependencies checking
* admin/nt/dist-build/build-dep-zips.py:
2019-09-18 18:10:35 +01:00
Eli Zaretskii
4ebfec02f0 Merge remote-tracking branch 'origin/harfbuzz' 2019-06-07 17:52:16 +03:00
Phillip Lord
9201cf62ce No longer add debug symbols to release build
* admin/nt/dist-build/build-zips.sh: Remove -g3 from release build and
  install with install-strip
2019-06-05 22:15:21 +01:00
Phillip Lord
f3fddfb5ef Update dependencies
* admin/nt/dist-build/build-dep-zips.py: Add harfbuzz as dependency
2019-06-03 22:50:05 +01:00
Paul Eggert
ba809612c0 Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height.  (Bug#33921)
2018-12-31 17:57:29 -08:00
Paul Eggert
26bed8ba10 Update copyright year to 2019
Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
2019-01-01 01:01:13 +00:00
Phillip Lord
cbb9c78de0 Fix windows snapshot building
* admin/nt/dist-build/build-zips.sh: Fix broken if statement
2018-05-03 22:14:13 +01:00
Phillip Lord
a2003f9663 * admin/nt/dist-build/build-zips.sh: Support building of branches 2018-05-03 21:15:12 +01:00
Phillip Lord
4b3f1a9556 Reduce parallelism to Windows build
* admin/nt/dist-build/build-zips.sh: Reduce make parallelism to 2.
2018-03-28 09:40:55 +01:00
Phillip Lord
9c1176247b Remove architecture dependent source downloads
* admin/nt/dist-build/build-dep-zips.py:
2018-03-26 12:49:50 +01:00
Phillip Lord
198de458f9 Reduce build load
* admin/nt/dist-build/build-zips.sh: Reduce parallelism to 8
2018-03-24 17:34:19 +00:00
Phillip Lord
7b371f0b60 Limit build load
* admin/nt/dist-build/build-zips.sh: Limit build load.
2018-03-23 23:11:13 +00:00
Phillip Lord
40fde7a75d Ensure configure is running if necessary
* admin/nt/dist-build/build-zips.sh: Check for missing Makefile.
2018-03-23 22:01:08 +00:00