Changeset 15327

Timestamp:

Apr 14, 2012, 4:29:10 PM (13 years ago)

Author:

Gary Byers

Message:

cocoa-ide/builder-utilites.lisp: in MAKE-DOCTYPE-DICT, declare unused
keyword args to be ignorable.

cocoa-ide/cocoa-application.lisp, objc-bridge/objc-runtime.lisp: move
code which nukes NXArgc/NXArgv to a point just before Cocoa is loaded,
where it seems to work as intended. This makes it safer than it has
been to (REQUIRE "COCOA") in a lisp that was started with command-line
arguments.

See ticket:955, and likely some others.

Location:

trunk/source

Files:

• cocoa-ide/builder-utilities.lisp (modified) (1 diff)
• cocoa-ide/cocoa-application.lisp (modified) (1 diff)
• objc-bridge/objc-runtime.lisp (modified) (1 diff)

trunk/source/cocoa-ide/builder-utilities.lisp

@@ -233 +233 @@
                           (document-class nil)
                           (exportable-as nil))
+  (declare (ignorable bundlep exportable-as icon-file))
   ;; certain values are required
   (assert (or ls-item-content-types extensions mime-types ostypes)

trunk/source/cocoa-ide/cocoa-application.lisp

@@ -39 +39 @@
 (load-ide *cocoa-ide-force-compile*)
 
-#+darwin-target
-;;; Nuke any command-line arguments, to keep the Cocoa runtime from
-;;; trying to process them.
-(let* ((argv (foreign-symbol-address "NXArgv"))
-       (argc (foreign-symbol-address "NXArgc")))
-  (when argc
-    (setf (pref argc :int) 1))
-  (when argv
-    (setf (paref (%get-ptr argv) (:* :char) 1) +null-ptr+)))
+
   
 

trunk/source/objc-bridge/objc-runtime.lisp

@@ -394 +394 @@
 (pushnew #'load-cocoa-framework *lisp-system-pointer-functions* :key #'function-name)
 
+#+darwin-target
+;;; Nuke any command-line arguments, to keep the Cocoa runtime from
+;;; trying to process them.
+(let* ((argv (foreign-symbol-address "NXArgv"))
+       (argc (foreign-symbol-address "NXArgc")))
+  (when argc
+    (setf (pref argc :int) 1))
+  (when argv
+    (setf (paref (%get-ptr argv) (:* :char) 1) +null-ptr+)))
+
 #-cocotron
 (load-cocoa-framework)