mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
* .gitignore: Add new files.
* INSTALL.android: Explain how to build Emacs for ancient
versions of Android.
* admin/merge-gnulib (GNULIB_MODULES): Add getdelim.
* build-aux/config.guess (timestamp, version):
* build-aux/config.sub (timestamp, version): Autoupdate.
* configure.ac (BUILD_DETAILS, ANDROID_MIN_SDK):
(ANDROID_STUBIFY): Allow specifying CFLAGS via ANDROID_CFLAGS.
Add new configure tests for Android API version when not
explicitly specified.
* doc/emacs/android.texi (Android): Add reference to ``Other
Input Devices''.
(Android File System): Remove restrictions on directory-files on
the assets directory.
* doc/emacs/emacs.texi (Top): Add Other Input Devices to menu.
* doc/emacs/input.texi (Other Input Devices): New node.
* doc/lispref/commands.texi (Touchscreen Events): Document
changes to touchscreen input events.
* doc/lispref/frames.texi (Pop-Up Menus): Likewise.
* etc/NEWS: Announce changes.
* java/Makefile.in: Use lib-src/asset-directory-tool to generate
an `directory-tree' file placed in /assets.
* java/debug.sh: Large adjustments to support Android 2.2 and
later.
* java/org/gnu/emacs/EmacsContextMenu.java (inflateMenuItems):
* java/org/gnu/emacs/EmacsCopyArea.java (perform):
* java/org/gnu/emacs/EmacsDialog.java (toAlertDialog):
* java/org/gnu/emacs/EmacsDrawLine.java (perform):
* java/org/gnu/emacs/EmacsDrawRectangle.java (perform):
* java/org/gnu/emacs/EmacsDrawable.java (EmacsDrawable):
* java/org/gnu/emacs/EmacsFillPolygon.java (perform):
* java/org/gnu/emacs/EmacsFillRectangle.java (perform):
* java/org/gnu/emacs/EmacsGC.java (EmacsGC):
* java/org/gnu/emacs/EmacsPixmap.java (EmacsPixmap):
(destroyHandle):
* java/org/gnu/emacs/EmacsSdk7FontDriver.java (draw): Avoid
redundant canvas saves and restores.
* java/org/gnu/emacs/EmacsService.java (run):
* java/org/gnu/emacs/EmacsView.java (EmacsView):
(handleDirtyBitmap):
* java/org/gnu/emacs/EmacsWindow.java (changeWindowBackground)
(EmacsWindow): Make compatible with Android 2.2 and later.
* lib-src/Makefile.in (DONT_INSTALL): Add asset-directory-tool
on Android.:(asset-directory-tool{EXEEXT}): New target.
* lib-src/asset-directory-tool.c (struct directory_tree, xmalloc)
(main_1, main_2, main): New file.
* lib, m4: Merge from gnulib. This will be reverted before
merging to master.
* lisp/button.el (button-map):
(push-button):
* lisp/frame.el (display-popup-menus-p): Improve touchscreen
support.
* lisp/subr.el (event-start):
(event-end): Handle touchscreen events.
* lisp/touch-screen.el (touch-screen-handle-timeout):
(touch-screen-handle-point-update):
(touch-screen-handle-point-up):
(touch-screen-track-tap):
(touch-screen-track-drag):
(touch-screen-drag-mode-line-1):
(touch-screen-drag-mode-line): New functions.
([mode-line touchscreen-begin]):
([bottom-divider touchscreen-begin]): Bind new events.
* lisp/wid-edit.el (widget-event-point):
(widget-keymap):
(widget-event-start):
(widget-button--check-and-call-button):
(widget-button-click): Improve touchscreen support.
* src/alloc.c (make_lisp_symbol): Avoid ICE on Android NDK GCC.
(mark_pinned_symbols): Likewise.
* src/android.c (struct android_emacs_window): New struct.
(window_class): New variable.
(android_run_select_thread): Add workaround for Android platform
bug.
(android_extract_long, android_scan_directory_tree): New
functions.
(android_file_access_p): Use those functions instead.
(android_init_emacs_window): New function.
(android_init_emacs_gc_class): Update signature of `markDirty'.
(android_change_gc, android_set_clip_rectangles): Tell the GC
whether or not clip rects were dirtied.
(android_swap_buffers): Do not look up method every time.
(struct android_dir): Adjust for new directory tree lookup.
(android_opendir, android_readdir, android_closedir): Likewise.
(android_four_corners_bilinear): Fix coding style.
(android_ftruncate): New function.
* src/android.h: Update prototypes. Replace ftruncate with
android_ftruncate when necessary.
* src/androidterm.c (handle_one_android_event): Pacify GCC. Fix
touch screen tool bar bug.
* src/emacs.c (using_utf8): Fix compilation error.
* src/fileio.c (Ffile_system_info): Return Qnil when fsusage.o
is not built.
* src/filelock.c (BOOT_TIME_FILE): Fix definition for Android.
* src/frame.c (Fx_parse_geometry): Fix uninitialized variable
uses.
* src/keyboard.c (lispy_function_keys): Fix `back'.
* src/menu.c (x_popup_menu_1): Handle touch screen events.
(Fx_popup_menu): Document changes.
* src/sfnt.c (main): Improve tests.
* src/sfntfont-android.c (sfntfont_android_put_glyphs): Fix
minor problem.
(init_sfntfont_android): Check for
HAVE_DECL_ANDROID_GET_DEVICE_API_LEVEL.
* src/sfntfont.c (struct sfnt_font_desc): New fields `adstyle'
and `languages'.
(sfnt_parse_style): Append tokens to adstyle.
(sfnt_parse_languages): New function.
(sfnt_enum_font_1): Parse supported languages and adstyle.
(sfntfont_list_1): Handle new fields.
(sfntfont_text_extents): Fix uninitialized variable use.
(syms_of_sfntfont, mark_sfntfont): Adjust accordingly.
198 lines
6.4 KiB
Makefile
198 lines
6.4 KiB
Makefile
### @configure_input@
|
|
|
|
# Copyright (C) 2023 Free Software Foundation, Inc.
|
|
|
|
# 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 <https://www.gnu.org/licenses/>.
|
|
|
|
top_builddir = @top_builddir@
|
|
top_srcdir = @top_srcdir@
|
|
version = @version@
|
|
|
|
# This is the host lib-src and lib, not the cross compiler's lib-src.
|
|
libsrc = ../lib-src
|
|
EXEEXT = @EXEEXT@
|
|
|
|
-include ${top_builddir}/src/verbose.mk
|
|
|
|
SHELL = @SHELL@
|
|
JAVAC = @JAVAC@
|
|
AAPT = @AAPT@
|
|
D8 = @D8@
|
|
ZIPALIGN = @ZIPALIGN@
|
|
JARSIGNER = @JARSIGNER@
|
|
JARSIGNER_FLAGS =
|
|
ANDROID_JAR = @ANDROID_JAR@
|
|
ANDROID_ABI = @ANDROID_ABI@
|
|
ANDROID_SDK_18_OR_EARLIER = @ANDROID_SDK_18_OR_EARLIER@
|
|
|
|
WARN_JAVAFLAGS = -Xlint:deprecation
|
|
JAVAFLAGS = -classpath "$(ANDROID_JAR):." -target 1.7 -source 1.7 \
|
|
$(WARN_JAVAFLAGS)
|
|
|
|
# Android 4.3 and earlier require Emacs to be signed with a different
|
|
# digital signature algorithm.
|
|
|
|
ifneq (,$(ANDROID_SDK_18_OR_EARLIER))
|
|
JARSIGNER_FLAGS = -sigalg MD5withRSA -digestalg SHA1
|
|
else
|
|
JARSIGNER_FLAGS =
|
|
endif
|
|
|
|
SIGN_EMACS = -keystore emacs.keystore -storepass emacs1 $(JARSIGNER_FLAGS)
|
|
|
|
JAVA_FILES = $(shell find . -type f -name *.java)
|
|
CLASS_FILES = $(foreach file,$(JAVA_FILES),$(basename $(file)).class)
|
|
|
|
# Compute the name for the Emacs application package. This should be:
|
|
# emacs-<version>-<min-sdk>-<abi>.apk
|
|
|
|
ANDROID_MIN_SDK = @ANDROID_MIN_SDK@
|
|
APK_NAME = emacs-$(version)-$(ANDROID_MIN_SDK)-$(ANDROID_ABI).apk
|
|
|
|
# How this stuff works.
|
|
|
|
# emacs.apk depends on emacs.apk-in, which is simply a ZIP archive
|
|
# containing the following files:
|
|
# lib/$(ANDROID_ABI)/libemacs.so
|
|
# lib/$(ANDROID_ABI)/libandroid-emacs.so
|
|
# lib/$(ANDROID_ABI)/libctags.so
|
|
# lib/$(ANDROID_ABI)/libhexl.so
|
|
# lib/$(ANDROID_ABI)/libmovemail.so
|
|
# lib/$(ANDROID_ABI)/librcs2log.so
|
|
# lib/$(ANDROID_ABI)/libebrowse.so
|
|
# assets/info/
|
|
# assets/etc/
|
|
# assets/lisp/
|
|
|
|
.PHONY: emacs.apk-in all
|
|
all: $(APK_NAME)
|
|
|
|
# Binaries to cross-compile.
|
|
CROSS_BINS = ../xcompile/src/android-emacs ../xcompile/lib-src/ctags \
|
|
../xcompile/lib-src/hexl ../xcompile/lib-src/movemail \
|
|
../xcompile/lib-src/ebrowse ../xcompile/lib-src/emacsclient
|
|
|
|
# Libraries to cross-compile.
|
|
CROSS_LIBS = ../xcompile/src/libemacs.so
|
|
|
|
.PHONY: $(CROSS_BINS) $(CROSS_LIBS)
|
|
|
|
../xcompile/src/android-emacs ../xcompile/src/libemacs.so:
|
|
make -C ../xcompile src/$(notdir $@)
|
|
|
|
../xcompile/lib-src/hexl ../xcompile/lib-src/movemail \
|
|
../xcompile/lib-src/ctags ../xcompile/lib-src/ebrowse &:
|
|
make -C ../xcompile lib-src/$(notdir $@)
|
|
|
|
# This is needed to generate the ``.directory-tree'' file used by the
|
|
# Android emulations of readdir and faccessat.
|
|
|
|
$(libsrc)/asset-directory-tool:
|
|
$(MAKE) -C $(libsrc) $(notdir $@)
|
|
|
|
emacs.apk-in: $(CROSS_BINS) $(CROSS_LIBS) $(libsrc)/asset-directory-tool \
|
|
AndroidManifest.xml
|
|
# Make the working directory for this stuff
|
|
rm -rf install_temp
|
|
mkdir -p install_temp/lib/$(ANDROID_ABI)
|
|
mkdir -p install_temp/assets/etc
|
|
mkdir -p install_temp/assets/lisp
|
|
mkdir -p install_temp/assets/info
|
|
# Install architecture independents to assets/etc and assets/lisp
|
|
cp -r $(top_builddir)/lisp install_temp/assets
|
|
cp -r $(top_builddir)/etc install_temp/assets
|
|
cp -r $(top_builddir)/info install_temp/assets
|
|
# Remove undesirable files from those directories.
|
|
for subdir in `find install_temp -type d -print`; do \
|
|
chmod a+rx $${subdir} ; \
|
|
rm -rf $${subdir}/.gitignore ; \
|
|
rm -rf $${subdir}/.DS_Store ; \
|
|
rm -rf $${subdir}/#* ; \
|
|
rm -rf $${subdir}/.#* ; \
|
|
rm -rf $${subdir}/*~ ; \
|
|
rm -rf $${subdir}/*.orig ; \
|
|
rm -rf $${subdir}/ChangeLog* ; \
|
|
rm -rf $${subdir}/[mM]akefile*[.-]in ; \
|
|
rm -rf $${subdir}/Makefile; \
|
|
done
|
|
# Generate the directory tree for those directories.
|
|
$(libsrc)/asset-directory-tool install_temp/assets \
|
|
install_temp/assets/directory-tree
|
|
# Install architecture dependents to lib/$(ANDROID_ABI). This
|
|
# perculiar naming scheme is required to make Android preserve these
|
|
# binaries upon installation.
|
|
for file in $(CROSS_BINS); do \
|
|
if [ -x $$file ]; then \
|
|
filename=`basename $$file`; \
|
|
cp -f $$file install_temp/lib/$(ANDROID_ABI)/lib$${filename}.so; \
|
|
fi \
|
|
done
|
|
for file in $(CROSS_LIBS); do \
|
|
if [ -x $$file ]; then \
|
|
cp -f $$file install_temp/lib/$(ANDROID_ABI); \
|
|
fi \
|
|
done
|
|
# Package everything. Specifying the assets on this command line is
|
|
# necessary for AAssetManager_getNextFileName to work on old versions
|
|
# of Android.
|
|
$(AAPT) package -I "$(ANDROID_JAR)" -F $@ -f -M AndroidManifest.xml \
|
|
-A install_temp/assets
|
|
pushd install_temp; $(AAPT) add ../$@ `find lib -type f`; popd
|
|
rm -rf install_temp
|
|
|
|
# Makefile itself.
|
|
.PRECIOUS: ../config.status Makefile
|
|
../config.status: $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4
|
|
$(MAKE) -C $(dir $@) $(notdir $@)
|
|
Makefile: ../config.status $(top_builddir)/java/Makefile.in
|
|
$(MAKE) -C .. java/$@
|
|
|
|
# AndroidManifest.xml:
|
|
AndroidManifest.xml: $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4 \
|
|
AndroidManifest.xml.in
|
|
pushd ..; ./config.status java/AndroidManifest.xml; popd
|
|
|
|
.SUFFIXES: .java .class
|
|
.java.class &:
|
|
$(AM_V_JAVAC) $(JAVAC) $(JAVAFLAGS) $<
|
|
|
|
# N.B. that find must be called all over again in case javac generated
|
|
# nested classes.
|
|
|
|
classes.dex: $(CLASS_FILES)
|
|
$(AM_V_D8) $(D8) --classpath $(ANDROID_JAR) \
|
|
$(subst $$,\$$,$(shell find . -type f -name *.class))
|
|
|
|
# When emacs.keystore expires, regenerate it with:
|
|
#
|
|
# keytool -genkey -v -keystore emacs.keystore -alias "Emacs keystore" \
|
|
# -keyalg RSA -sigalg SHA1withRSA -keysize 2048 -validity 100000
|
|
|
|
.PHONY: clean maintainer-clean
|
|
|
|
$(APK_NAME): classes.dex emacs.apk-in emacs.keystore
|
|
cp -f emacs.apk-in $@.unaligned
|
|
$(AAPT) add $@.unaligned classes.dex
|
|
$(JARSIGNER) $(SIGN_EMACS) $@.unaligned "Emacs keystore"
|
|
$(ZIPALIGN) -f 4 $@.unaligned $@
|
|
rm -f $@.unaligned
|
|
|
|
clean:
|
|
rm -f *.apk emacs.apk-in *.dex *.unaligned *.class
|
|
rm -rf install-temp
|
|
find . -name '*.class' -delete
|
|
|
|
maintainer-clean distclean bootstrap-clean: clean
|