From 6703b82a990c4e4b3a28cd13d92081a8288e17fe Mon Sep 17 00:00:00 2001 From: Eric Gallager Date: Thu, 26 Sep 2024 21:01:37 -0400 Subject: [PATCH] a few more things --- .github/workflows/codeql.yml | 14 ++++++++--- admin/charsets/.gitignore | 1 + configure | 46 ++++++++++++++++++++++++++++++++++++ configure.ac | 34 ++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6c182c374849..81d63131ec4a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -130,7 +130,7 @@ jobs: cobjfile="$(echo "${cfile}" | sed "s/\.c/.o/g")"; \ if test ! -e "${cobjfile}"; then \ sync && echo "One last attempt at compiling ${cfile}..."; \ - gcc -c -I. -I.. "${cfile}" || stat "${cfile}" || \ + gcc -c -I. -I.. "${cfile}" || stat -t "${cfile}" || \ (sync && echo "cfile is ${cfile}"); \ else \ echo "object file ${cobjfile} already exists for ${cfile}."; \ @@ -141,12 +141,20 @@ jobs: # shellcheck disable=SC2044 for ccfile in $(find . -name '*.cc' -type f); do \ sync && echo "One last attempt at compiling ${ccfile}..."; \ - (test -x "$(which sccache)" && sccache g++ -c "${ccfile}") || g++ -c -Wfatal-errors "${ccfile}" || g++ -c -w -Wfatal-errors -I. "${ccfile}" || g++ -c -w -Wno-error -Wfatal-errors -fpermissive -I. -I.. "${ccfile}" || stat -t "${ccfile}"; \ + (test -x "$(which sccache)" && sccache g++ -c "${ccfile}") || \ + g++ -c -Wfatal-errors "${ccfile}" || \ + g++ -c -w -Wfatal-errors -I. "${ccfile}" || \ + g++ -c -w -Wno-error -Wfatal-errors -fpermissive -I. -I.. "${ccfile}" || \ + stat -t "${ccfile}"; \ done # shellcheck disable=SC2044 for cppfile in $(find . -name '*.cpp' -type f); do \ sync && echo "One last attempt at compiling ${cppfile}..."; \ - (test -x "$(which sccache)" && sccache g++ -c "${cppfile}") || g++ -c -Wfatal-errors "${cppfile}" || g++ -c -w -Wfatal-errors -I. "${cppfile}" || g++ -c -w -Wno-error -Wfatal-errors -fpermissive -I. -I.. "${cppfile}" || stat -t "${cppfile}"; \ + (test -x "$(which sccache)" && sccache g++ -c "${cppfile}") || \ + g++ -c -Wfatal-errors "${cppfile}" || \ + g++ -c -w -Wfatal-errors -I. "${cppfile}" || \ + g++ -c -w -Wno-error -Wfatal-errors -fpermissive -I. -I.. "${cppfile}" || \ + stat -t "${cppfile}"; \ done - name: Extra coverage build (Java) diff --git a/admin/charsets/.gitignore b/admin/charsets/.gitignore index 796607ef442e..bcc44cce2750 100644 --- a/admin/charsets/.gitignore +++ b/admin/charsets/.gitignore @@ -1,3 +1,4 @@ # gitignore file for emacs/admin/charsets *.map *.el +!Makefile diff --git a/configure b/configure index f8f091135e89..e5e14679d50f 100755 --- a/configure +++ b/configure @@ -121922,6 +121922,8 @@ to run if these resources are not installed." echo "Use it at your own risk." fi echo "" +else + echo "Building without Carbon." fi if test "x${HAVE_NS}" = "xyes"; then @@ -121937,6 +121939,8 @@ You may need to run \"${MAKE-make} install\" with sudo. The application will fai to run if these resources are not installed." fi echo "" +else + echo "Building without Cocoa." fi @@ -122012,6 +122016,41 @@ then : ac_config_files="$ac_config_files test/manual/noverlay/Makefile" fi +if test "x${ANDROID}" = "xyes"; then + if test -d java; then + if test -r "${srcdir}/java/Makefile.in"; then + SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} java/Makefile" + ac_config_files="$ac_config_files java/Makefile" + + fi + if test -r "${srcdir}/java/AndroidManifest.xml.in"; then + ac_config_files="$ac_config_files java/AndroidManifest.xml" + + fi + fi + if test -d cross; then + if test -r "${srcdir}/cross/Makefile.in"; then + SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} cross/Makefile" + ac_config_files="$ac_config_files cross/Makefile" + + fi + if test -d cross/ndk-build; then + if test -r "${srcdir}/cross/ndk-build/Makefile.in"; then + SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} cross/ndk-build/Makefile" + ac_config_files="$ac_config_files cross/ndk-build/Makefile" + + fi + if test -r "${srcdir}/cross/ndk-build/ndk-build.mk.in"; then + ac_config_files="$ac_config_files cross/ndk-build/ndk-build.mk" + + fi + fi + fi +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: skipping generating android-specific files" >&5 +printf "%s\n" "$as_me: skipping generating android-specific files" >&6;} +fi + if test -d machocheck || test -d ${srcdir}/machocheck; then SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} machocheck/Makefile" ac_config_files="$ac_config_files machocheck/Makefile" @@ -122038,6 +122077,8 @@ ac_config_commands="$ac_config_commands doc/emacs/emacsver.texi" ac_config_commands="$ac_config_commands etc-refcards-emacsver.tex" +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: doing final output now" >&5 +printf "%s\n" "$as_me: doing final output now" >&6;} cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -123431,6 +123472,11 @@ do "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;; "test/infra/Makefile") CONFIG_FILES="$CONFIG_FILES test/infra/Makefile" ;; "test/manual/noverlay/Makefile") CONFIG_FILES="$CONFIG_FILES test/manual/noverlay/Makefile" ;; + "java/Makefile") CONFIG_FILES="$CONFIG_FILES java/Makefile" ;; + "java/AndroidManifest.xml") CONFIG_FILES="$CONFIG_FILES java/AndroidManifest.xml" ;; + "cross/Makefile") CONFIG_FILES="$CONFIG_FILES cross/Makefile" ;; + "cross/ndk-build/Makefile") CONFIG_FILES="$CONFIG_FILES cross/ndk-build/Makefile" ;; + "cross/ndk-build/ndk-build.mk") CONFIG_FILES="$CONFIG_FILES cross/ndk-build/ndk-build.mk" ;; "machocheck/Makefile") CONFIG_FILES="$CONFIG_FILES machocheck/Makefile" ;; "admin/Makefile") CONFIG_FILES="$CONFIG_FILES admin/Makefile" ;; "admin/unidata/Makefile") CONFIG_FILES="$CONFIG_FILES admin/unidata/Makefile" ;; diff --git a/configure.ac b/configure.ac index d5fc2cac9beb..4b032ff5264c 100644 --- a/configure.ac +++ b/configure.ac @@ -10856,6 +10856,8 @@ to run if these resources are not installed." echo "Use it at your own risk." fi echo "" +else + echo "Building without Carbon." fi if test "x${HAVE_NS}" = "xyes"; then @@ -10871,6 +10873,8 @@ You may need to run \"${MAKE-make} install\" with sudo. The application will fai to run if these resources are not installed." fi echo "" +else + echo "Building without Cocoa." fi ] dnl# end final m4-quotation block @@ -10960,6 +10964,35 @@ AS_IF([test -d test/manual/noverlay && test -r "${srcdir}/test/manual/noverlay/M AC_CONFIG_FILES([test/manual/noverlay/Makefile])dnl ])dnl +if test "x${ANDROID}" = "xyes"; then + if test -d java; then + if test -r "${srcdir}/java/Makefile.in"; then + SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} java/Makefile" + AC_CONFIG_FILES([java/Makefile]) + fi + if test -r "${srcdir}/java/AndroidManifest.xml.in"; then + AC_CONFIG_FILES([java/AndroidManifest.xml]) + fi + fi + if test -d cross; then + if test -r "${srcdir}/cross/Makefile.in"; then + SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} cross/Makefile" + AC_CONFIG_FILES([cross/Makefile]) + fi + if test -d cross/ndk-build; then + if test -r "${srcdir}/cross/ndk-build/Makefile.in"; then + SUBDIR_MAKEFILES="${SUBDIR_MAKEFILES} cross/ndk-build/Makefile" + AC_CONFIG_FILES([cross/ndk-build/Makefile]) + fi + if test -r "${srcdir}/cross/ndk-build/ndk-build.mk.in"; then + AC_CONFIG_FILES([cross/ndk-build/ndk-build.mk]) + fi + fi + fi +else + AC_MSG_NOTICE([skipping generating android-specific files]) +fi + dnl# this subdir is imported from ld64, and used like a library for the dnl# isemacsvalid executable: if test -d machocheck || test -d ${srcdir}/machocheck; then @@ -11027,6 +11060,7 @@ ${MAKE-make} -s MAKEFILE_NAME=do-not-make-Makefile etc-emacsver || \ AC_MSG_WARN(['etc/refcards/emacsver.tex' could not be made.]) ])dnl +AC_MSG_NOTICE([doing final output now]) AC_OUTPUT test "x${MAKE}" = "xmake" || \