Allow specifying the path to odk at configure time.

The name and location of the main `odk` script will change in ODK 1.7:
currently (up to ODK 1.6), the script is in `/tools/odk.py`; starting
from ODK 1.7, it will be in `/usr/local/bin/odk`. Docker images for ODK
1.7 will include symlinks so that invoking `/tools/odk.py` will still
work, but the recommended way to invoke the script will be to simply
call `odk` (no `.py` extension, and fully relying on the shell to find
the executable in the PATH).

This commit adds a configure-time option to the ODK Runner to specify
how the ODK script should be invoked. The default is `/tools/odk.py`,
for compatibility with both pre- and post-1.7 images. Run the configure
script with `--with-odk-executable=odk` to build a runner that will work
only on post-1.7 images.

At some point after the publication of ODK 1.7, the default value will
change to `odk`, so that it would be required to use
`--with-odk-executable=/tools/odk.py` to build a runner that will keep
working with pre-1.7 images.

Author: gouttegd

configure.ac

@@ -35,6 +35,14 @@ AC_ARG_WITH([min-osx-version],
             [MACOS_EXTRA_CFLAGS="$MACOS_EXTRA_CFLAGS -mmacosx-version-min=$withval"],
             [MACOS_EXTRA_CFLAGS="$MACOS_EXTRA_CFLAGS"])
 
+dnl Support for pre-1.7 ODK images
+AC_ARG_WITH([odk-executable],
+              [AS_HELP_STRING([--with-odk-executable],
+                              [Name of (of full path to) the odk script.])],
+              [],
+              [with_odk_executable="/tools/odk.py"])
+AC_DEFINE_UNQUOTED([ODK_EXECUTABLE], ["$with_odk_executable"], [Name or path of the odk script])
+
 dnl Host-based tweaks
 AC_CANONICAL_HOST
 AS_CASE([$host],

src/backend-docker.c

@@ -129,7 +129,7 @@ run(odk_backend_t *backend, odk_run_config_t *cfg, char **command)
         argv[i++] = "### DEBUG STATS ###\nElapsed time: %E\nPeak memory: %M kb";
     }
     if ( cfg->flags & ODK_FLAG_SEEDMODE ) {
-        argv[i++] = "/tools/odk.py";
+        argv[i++] = ODK_EXECUTABLE;
         argv[i++] = "seed";
     }
     for ( cursor = &command[0]; *cursor; cursor++ )

src/backend-native.c

@@ -99,7 +99,8 @@ run(odk_backend_t *backend, odk_run_config_t *cfg, char **command)
             argv[i++] = "### DEBUG STATS ###\nElapsed time: %E\nPeak memory: %M kb";
         }
         if ( cfg->flags & ODK_FLAG_SEEDMODE ) {
-            argv[i++] = "odk";   /* We assume the odk script is in PATH */
+            argv[i++] = "odk";   /* In native environments the odk script
+                                    should always be in the PATH. */
             argv[i++] = "seed";
         }
         for ( cursor = &command[0]; *cursor; cursor++ )

src/backend-singularity.c

@@ -138,7 +138,7 @@ run(odk_backend_t *backend, odk_run_config_t *cfg, char **command)
         argv[i++] = "### DEBUG STATS ###\nElapsed time: %E\nPeak memory: %M kb";
     }
     if ( cfg->flags & ODK_FLAG_SEEDMODE ) {
-        argv[i++] = "/tools/odk.py";
+        argv[i++] = ODK_EXECUTABLE;
         argv[i++] = "seed";
     }
     for ( cursor = &command[0]; *cursor; cursor++ )