diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | launchd/privileged_startx/Makefile.am | 8 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx.plist.cpp | 4 | ||||
| -rw-r--r-- | launchd/privileged_startx/privileged_startx_types.h | 2 | ||||
| -rw-r--r-- | launchd/privileged_startx/server.c | 2 | ||||
| -rw-r--r-- | launchd/user_startx/Makefile.am | 10 | ||||
| -rw-r--r-- | launchd/user_startx/launchd_startx.c | 2 | ||||
| -rw-r--r-- | launchd/user_startx/startx.plist.cpp | 4 | ||||
| -rw-r--r-- | startx.cpp | 2 |
10 files changed, 26 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 2ba7364..bd35ef7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,7 @@ CPP_FILES_FLAGS = \ -DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \ -D__libexecdir__="$(libexecdir)" \ -D__bindir__="$(bindir)" \ - -DLAUNCHD_ID_PREFIX="$(launchdidprefix)" + -DBUNDLE_ID_PREFIX="$(bundleidprefix)" if LAUNCHD SUBDIRS = launchd diff --git a/configure.ac b/configure.ac index d9c795d..15bcc12 100644 --- a/configure.ac +++ b/configure.ac @@ -104,9 +104,12 @@ AC_ARG_WITH(launchagents-dir, AS_HELP_STRING([--with-launchagents-dir=PATH], [ AC_ARG_WITH(launchdaemons-dir, AS_HELP_STRING([--with-launchdaemons-dir=PATH], [Path to launchd's LaunchDaemonss directory (default: /Library/LaunchDaemons)]), [ launchdaemonsdir="${withval}" ], [ launchdaemonsdir="/Library/LaunchDaemons" ]) -AC_ARG_WITH(launchd-id-prefix, AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]), - [ launchdidprefix="${withval}" ], - [ launchdidprefix="org.x" ]) +AC_ARG_WITH(launchd-id-prefix, AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Deprecated: Use --with-bundle-id-prefix.]), + [ bundleidprefix="${withval}" ], + [ bundleidprefix="org.x" ]) +AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=PATH], [Prefix to use for bundle identifiers (default: org.x)]), + [ bundleidprefix="${withval}" ], + [ bundleidprefix="org.x" ]) if test "x$LAUNCHD" = "xauto"; then unset LAUNCHD @@ -126,10 +129,10 @@ else launchdaemonsdir="" fi -AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$launchdidprefix", [Prefix to use for launchd identifiers]) +AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$bundleidprefix", [Prefix to use for launchd identifiers]) AC_SUBST([launchagentsdir]) AC_SUBST([launchdaemonsdir]) -AC_SUBST([launchdidprefix]) +AC_SUBST([bundleidprefix]) AM_CONDITIONAL(LAUNCHD, [test "x$LAUNCHD" = "xyes"]) AM_CONDITIONAL(TIGER_LAUNCHD, [test "x$TIGER_LAUNCHD" = "xyes"]) diff --git a/launchd/privileged_startx/Makefile.am b/launchd/privileged_startx/Makefile.am index d0f2322..c7cf0e8 100644 --- a/launchd/privileged_startx/Makefile.am +++ b/launchd/privileged_startx/Makefile.am @@ -34,7 +34,7 @@ xinitrc_PROGRAMS = privileged_startx privstartx_SCRIPTS = 10-tmpdirs 20-font_cache AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\" -CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DLAUNCHD_ID_PREFIX="$(launchdidprefix)" +CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)" if TIGER_LAUNCHD CPP_FILES_FLAGS += -DTIGER_LAUNCHD @@ -56,10 +56,10 @@ BUILT_SOURCES = \ privileged_startxServer.h \ privileged_startx.h -$(launchdidprefix).privileged_startx.plist.cpp: privileged_startx.plist.cpp +$(bundleidprefix).privileged_startx.plist.cpp: privileged_startx.plist.cpp cp $< $@ -launchdaemons_PRE = $(launchdidprefix).privileged_startx.plist.cpp +launchdaemons_PRE = $(bundleidprefix).privileged_startx.plist.cpp launchdaemons_DATA = $(launchdaemons_PRE:plist.cpp=plist) 10-tmpdirs: 10-tmpdirs.cpp Makefile @@ -69,7 +69,7 @@ CLEANFILES = \ $(privstartx_SCRIPTS) \ $(BUILT_SOURCES) \ $(launchdaemons_DATA) \ - $(launchdidprefix).privileged_startx.plist.cpp + $(bundleidprefix).privileged_startx.plist.cpp EXTRA_DIST = \ 10-tmpdirs.cpp \ diff --git a/launchd/privileged_startx/privileged_startx.plist.cpp b/launchd/privileged_startx/privileged_startx.plist.cpp index 02e1cce..533fc32 100644 --- a/launchd/privileged_startx/privileged_startx.plist.cpp +++ b/launchd/privileged_startx/privileged_startx.plist.cpp @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>Label</key> - <string>LAUNCHD_ID_PREFIX.privileged_startx</string> + <string>BUNDLE_ID_PREFIX.privileged_startx</string> <key>ProgramArguments</key> <array> <string>XINITDIR/privileged_startx</string> @@ -16,7 +16,7 @@ #else <key>MachServices</key> <dict> - <key>LAUNCHD_ID_PREFIX.privileged_startx</key> + <key>BUNDLE_ID_PREFIX.privileged_startx</key> <true/> </dict> <key>TimeOut</key> diff --git a/launchd/privileged_startx/privileged_startx_types.h b/launchd/privileged_startx/privileged_startx_types.h index 8928e64..a0d3439 100644 --- a/launchd/privileged_startx/privileged_startx_types.h +++ b/launchd/privileged_startx/privileged_startx_types.h @@ -5,6 +5,6 @@ #include <config.h> #endif -#define BOOTSTRAP_NAME LAUNCHD_ID_PREFIX".privileged_startx" +#define BOOTSTRAP_NAME BUNDLE_ID_PREFIX".privileged_startx" #endif diff --git a/launchd/privileged_startx/server.c b/launchd/privileged_startx/server.c index d513ec0..ff86935 100644 --- a/launchd/privileged_startx/server.c +++ b/launchd/privileged_startx/server.c @@ -171,7 +171,7 @@ int server_main(const char *dir) { mp = launch_data_get_machport(svc); #else - mp = checkin_or_register(LAUNCHD_ID_PREFIX".privileged_startx"); + mp = checkin_or_register(BUNDLE_ID_PREFIX".privileged_startx"); #endif if (mp == MACH_PORT_NULL) { diff --git a/launchd/user_startx/Makefile.am b/launchd/user_startx/Makefile.am index 30270dd..75573da 100644 --- a/launchd/user_startx/Makefile.am +++ b/launchd/user_startx/Makefile.am @@ -25,7 +25,7 @@ xinitrcdir = $(XINITDIR) xinitrc_PROGRAMS = launchd_startx -AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\" -DLAUNCHD_ID_PREFIX=\"$(launchdidprefix)\" +AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\" -DBUNDLE_ID_PREFIX=\"$(bundleidprefix)\" dist_launchd_startx_SOURCES = \ ../console_redirect.c \ @@ -34,16 +34,16 @@ dist_launchd_startx_SOURCES = \ CPP_FILES_FLAGS = \ -D__xinitrcdir__="$(xinitrcdir)" \ -D__bindir__="$(bindir)" \ - -DLAUNCHD_ID_PREFIX="$(launchdidprefix)" + -DBUNDLE_ID_PREFIX="$(bundleidprefix)" -$(launchdidprefix).startx.plist.cpp: startx.plist.cpp +$(bundleidprefix).startx.plist.cpp: startx.plist.cpp cp $< $@ -launchagents_PRE = $(launchdidprefix).startx.plist.cpp +launchagents_PRE = $(bundleidprefix).startx.plist.cpp launchagents_DATA = $(launchagents_PRE:plist.cpp=plist) EXTRA_DIST = startx.plist.cpp CLEANFILES = \ $(launchagents_DATA) \ - $(launchdidprefix).startx.plist.cpp + $(bundleidprefix).startx.plist.cpp diff --git a/launchd/user_startx/launchd_startx.c b/launchd/user_startx/launchd_startx.c index 41d1511..976b2d7 100644 --- a/launchd/user_startx/launchd_startx.c +++ b/launchd/user_startx/launchd_startx.c @@ -48,7 +48,7 @@ int main(int argc, char **argv, char **envp) { exit(EXIT_FAILURE); } - aslc = asl_open(LAUNCHD_ID_PREFIX".startx", "user", ASL_OPT_NO_DELAY); + aslc = asl_open(BUNDLE_ID_PREFIX".startx", "user", ASL_OPT_NO_DELAY); (void)console_redirect(aslc, NULL, ASL_LEVEL_INFO, ASL_LEVEL_NOTICE); assert(posix_spawnp(&child, argv[1], NULL, NULL, &argv[1], envp) == 0); diff --git a/launchd/user_startx/startx.plist.cpp b/launchd/user_startx/startx.plist.cpp index 1a87527..9d9c1a4 100644 --- a/launchd/user_startx/startx.plist.cpp +++ b/launchd/user_startx/startx.plist.cpp @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>Label</key> - <string>LAUNCHD_ID_PREFIX.startx</string> + <string>BUNDLE_ID_PREFIX.startx</string> <key>ProgramArguments</key> <array> <string>__xinitrcdir__/launchd_startx</string> @@ -11,7 +11,7 @@ </array> <key>Sockets</key> <dict> - <key>LAUNCHD_ID_PREFIX:0</key> + <key>BUNDLE_ID_PREFIX:0</key> <dict> <key>SecureSocketWithKey</key> <string>DISPLAY</string> @@ -83,7 +83,7 @@ serverargs="" #ifdef __APPLE__ if [ "x$X11_PREFS_DOMAIN" = x ] ; then - export X11_PREFS_DOMAIN=LAUNCHD_ID_PREFIX".X11" + export X11_PREFS_DOMAIN=BUNDLE_ID_PREFIX".X11" fi XCOMM Initialize defaults (this will cut down on "safe" error messages) |