[launchd-changes] [23725] branches/PR-6248586
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 16 10:32:20 PDT 2008
Revision: 23725
http://trac.macosforge.org/projects/launchd/changeset/23725
Author: kvv at apple.com
Date: 2008-10-16 10:32:18 -0700 (Thu, 16 Oct 2008)
Log Message:
-----------
adapt to moved header files and other build fixes
Modified Paths:
--------------
branches/PR-6248586/launchd/src/IPC.c
branches/PR-6248586/launchd/src/launchctl.c
branches/PR-6248586/launchd/src/launchd.c
branches/PR-6248586/launchd/src/launchd.h
branches/PR-6248586/launchd/src/launchd_core_logic.c
branches/PR-6248586/launchd/src/launchd_runtime.c
branches/PR-6248586/launchd/src/launchd_unix_ipc.c
branches/PR-6248586/launchd/src/launchd_unix_ipc.h
branches/PR-6248586/launchd/src/protocol_job_reply.defs
branches/PR-6248586/launchd.xcodeproj/project.pbxproj
Modified: branches/PR-6248586/launchd/src/IPC.c
===================================================================
--- branches/PR-6248586/launchd/src/IPC.c 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/IPC.c 2008-10-16 17:32:18 UTC (rev 23725)
@@ -30,7 +30,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include <syslog.h>
-#include "libbootstrap_public.h"
+#include "bootstrap.h"
#include "IPC.h"
#include "StartupItems.h"
Modified: branches/PR-6248586/launchd/src/launchctl.c
===================================================================
--- branches/PR-6248586/launchd/src/launchctl.c 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchctl.c 2008-10-16 17:32:18 UTC (rev 23725)
@@ -20,12 +20,12 @@
static const char *const __rcs_file_version__ = "$Revision$";
-#include "liblaunch_public.h"
-#include "liblaunch_private.h"
-#include "libbootstrap_public.h"
-#include "libvproc_public.h"
-#include "libvproc_private.h"
-#include "libvproc_internal.h"
+#include "launch.h"
+#include "launch_priv.h"
+#include "bootstrap.h"
+#include "vproc.h"
+#include "vproc_priv.h"
+#include "vproc_internal.h"
#include <CoreFoundation/CoreFoundation.h>
#include <CoreFoundation/CFPriv.h>
Modified: branches/PR-6248586/launchd/src/launchd.c
===================================================================
--- branches/PR-6248586/launchd/src/launchd.c 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd.c 2008-10-16 17:32:18 UTC (rev 23725)
@@ -68,10 +68,10 @@
#include <spawn.h>
#include <sched.h>
-#include "libbootstrap_public.h"
-#include "libvproc_public.h"
-#include "libvproc_internal.h"
-#include "liblaunch_public.h"
+#include "bootstrap.h"
+#include "vproc.h"
+#include "vproc_internal.h"
+#include "launch.h"
#include "launchd_runtime.h"
#include "launchd_core_logic.h"
Modified: branches/PR-6248586/launchd/src/launchd.h
===================================================================
--- branches/PR-6248586/launchd/src/launchd.h 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd.h 2008-10-16 17:32:18 UTC (rev 23725)
@@ -22,8 +22,8 @@
#include <mach/mach.h>
#include <mach/port.h>
-#include "liblaunch_public.h"
-#include "libbootstrap_public.h"
+#include "launch.h"
+#include "bootstrap.h"
#include "launchd_runtime.h"
#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
Modified: branches/PR-6248586/launchd/src/launchd_core_logic.c
===================================================================
--- branches/PR-6248586/launchd/src/launchd_core_logic.c 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_core_logic.c 2008-10-16 17:32:18 UTC (rev 23725)
@@ -2829,6 +2829,9 @@
job_log_error(j, LOG_ERR, "posix_spawnp(\"%s\", ...)", argv[0]);
}
+#if HAVE_SANDBOX
+out_bad:
+#endif
_exit(EXIT_FAILURE);
}
Modified: branches/PR-6248586/launchd/src/launchd_runtime.c
===================================================================
--- branches/PR-6248586/launchd/src/launchd_runtime.c 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_runtime.c 2008-10-16 17:32:18 UTC (rev 23725)
@@ -67,7 +67,7 @@
#include "launch.h"
#include "launchd.h"
#include "launchd_core_logic.h"
-#include "libvproc_internal.h"
+#include "vproc_internal.h"
#include "protocol_job_reply.h"
static mach_port_t ipc_port_set;
Modified: branches/PR-6248586/launchd/src/launchd_unix_ipc.c
===================================================================
--- branches/PR-6248586/launchd/src/launchd_unix_ipc.c 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_unix_ipc.c 2008-10-16 17:32:18 UTC (rev 23725)
@@ -47,8 +47,8 @@
#include <paths.h>
#include <string.h>
-#include "liblaunch_public.h"
-#include "liblaunch_private.h"
+#include "launch.h"
+#include "launch_priv.h"
#include "launchd.h"
#include "launchd_runtime.h"
#include "launchd_core_logic.h"
Modified: branches/PR-6248586/launchd/src/launchd_unix_ipc.h
===================================================================
--- branches/PR-6248586/launchd/src/launchd_unix_ipc.h 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/launchd_unix_ipc.h 2008-10-16 17:32:18 UTC (rev 23725)
@@ -24,7 +24,7 @@
#include "launchd_runtime.h"
#include "launchd_core_logic.h"
-#include "liblaunch_private.h"
+#include "launch_priv.h"
struct conncb {
kq_callback kqconn_callback;
Modified: branches/PR-6248586/launchd/src/protocol_job_reply.defs
===================================================================
--- branches/PR-6248586/launchd/src/protocol_job_reply.defs 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd/src/protocol_job_reply.defs 2008-10-16 17:32:18 UTC (rev 23725)
@@ -23,9 +23,9 @@
#include <mach/std_types.defs>
#include <mach/mach_types.defs>
#include "launchd_mig_types.defs"
-import "libbootstrap_public.h";
-import "libvproc_public.h";
-import "libvproc_internal.h";
+import "bootstrap.h";
+import "vproc.h";
+import "vproc_internal.h";
skip; /* create_server */
Modified: branches/PR-6248586/launchd.xcodeproj/project.pbxproj
===================================================================
--- branches/PR-6248586/launchd.xcodeproj/project.pbxproj 2008-10-16 17:05:37 UTC (rev 23724)
+++ branches/PR-6248586/launchd.xcodeproj/project.pbxproj 2008-10-16 17:32:18 UTC (rev 23725)
@@ -36,6 +36,7 @@
/* End PBXAggregateTarget section */
/* Begin PBXBuildFile section */
+ 721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721FBEBB0EA7AE2F0057462B /* Security.framework */; };
FC3627BA0E9343220054F1A3 /* StartupItems.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A0FD0E8C8ADF00D41150 /* StartupItems.c */; };
FC3627BB0E93432A0054F1A3 /* SystemStarter.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A1000E8C8ADF00D41150 /* SystemStarter.c */; };
FC3627D40E93439B0054F1A3 /* StartupItemContext.8 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FC59A0FE0E8C8ADF00D41150 /* StartupItemContext.8 */; };
@@ -240,6 +241,7 @@
/* Begin PBXFileReference section */
721FBEA50EA7ABC40057462B /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = launchd/src/config.h; sourceTree = "<group>"; };
+ 721FBEBB0EA7AE2F0057462B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
FC3627DF0E9344BF0054F1A3 /* protocol_vproc.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; name = protocol_vproc.defs; path = launchd/src/protocol_vproc.defs; sourceTree = "<group>"; };
FC3628070E9345E10054F1A3 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
FC36283E0E93463C0054F1A3 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
@@ -343,6 +345,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -359,6 +362,7 @@
FC36280C0E9345F60054F1A3 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 721FBEBB0EA7AE2F0057462B /* Security.framework */,
FC36292C0E934AA40054F1A3 /* libbsm.dylib */,
FCD713730E95DE49001B0111 /* libedit.dylib */,
FC3628070E9345E10054F1A3 /* CoreFoundation.framework */,
@@ -876,6 +880,7 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
+ DEAD_CODE_STRIPPING = YES;
GCC_MODEL_TUNING = "";
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
@@ -917,6 +922,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = YES;
+ DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
INSTALL_PATH = /sbin;
@@ -997,6 +1003,7 @@
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = YES;
+ DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
INSTALL_PATH = /bin;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20081016/ba45f47a/attachment-0001.html
More information about the launchd-changes
mailing list