Skip to content

Commit dfde430

Browse files
committed
Document via the configure what installation method was used
Store optional installation method for install metrics, we can use this to see what to focus efforts on.
1 parent fd14ec0 commit dfde430

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

configure.ac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ AC_DEFUN([AX_WITH_COMMENT], [
1111
AC_ARG_WITH([ax_comment_$1],[$2],[],[])
1212
])
1313

14+
AC_SUBST(INSTALL_METHOD, git)
15+
AC_ARG_WITH(install_method,AS_HELP_STRING([--with-install-method],
16+
[installation method e.g. debpackage, docker, git, tarball, (default: git).]),
17+
[if test "x$with_install_method" != x ; then AC_SUBST(INSTALL_METHOD,$with_install_method) fi])
18+
1419
AC_SUBST(FHS_ENABLED,no)
1520
AC_ARG_ENABLE(fhs,AS_HELP_STRING([--enable-fhs],
1621
[use FHS directories (default: no), see below under "Optional
@@ -329,6 +334,7 @@ if test "x$QUIET" = x ; then
329334
echo ""
330335
echo "Summary:"
331336
echo " * project.............: $PACKAGE_NAME $PACKAGE_VERSION"
337+
echo " * installation source.: $INSTALL_METHOD"
332338
echo " * prefix..............: $prefix"
333339
if test "x$JUDGEHOST_BUILD_ENABLED" = xyes; then
334340
echo " * CPPFLAGS............: $CPPFLAGS"

etc/domserver-static.php.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// @configure_input@
77

88
define('DOMJUDGE_VERSION', '@DOMJUDGE_VERSION@');
9+
define('DOMJUDGE_INSTALL_METHOD', '@INSTALL_METHOD@');
910

1011
define('BINDIR', '@domserver_bindir@');
1112
define('ETCDIR', '@domserver_etcdir@');

paths.mk.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
1515
PACKAGE_STRING = @PACKAGE_STRING@
1616
PACKAGE_TARNAME = @PACKAGE_TARNAME@
1717
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
18+
INSTALL_METHOD = @INSTALL_METHOD@
1819

1920
# Compilers and FLAGS
2021
CC = @CC@
@@ -130,6 +131,7 @@ define substconfigvars
130131
-e "s|@configure_input[@]|Generated from '$<' on `date`.|g" \
131132
-e 's,@PACKAGE_NAME[@],@PACKAGE_NAME@,g' \
132133
-e 's,@DOMJUDGE_VERSION[@],@DOMJUDGE_VERSION@,g' \
134+
-e 's,@INSTALL_METHOD[@],@INSTALL_METHOD@,g' \
133135
-e 's,@domserver_bindir[@],@domserver_bindir@,g' \
134136
-e 's,@domserver_etcdir[@],@domserver_etcdir@,g' \
135137
-e 's,@domserver_webappdir[@],@domserver_webappdir@,g' \

webapp/config/static.yaml.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
parameters:
44
domjudge.version: @DOMJUDGE_VERSION@
5+
domjudge.installmethod: @INSTALL_METHOD@
56
domjudge.bindir: @domserver_bindir@
67
domjudge.etcdir: @domserver_etcdir@
78
domjudge.webappdir: @domserver_webappdir@

0 commit comments

Comments
 (0)