[Openmcl-cvs-notifications] r15327 - in /trunk/source: cocoa-ide/builder-utilities.lisp cocoa-ide/cocoa-application.lisp objc-bridge/objc-runtime.lisp

[gb at clozure.com]

Author: gb
Date: Sat Apr 14 18:29:10 2012
New Revision: 15327

Log:
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.

Modified:
    trunk/source/cocoa-ide/builder-utilities.lisp
    trunk/source/cocoa-ide/cocoa-application.lisp
    trunk/source/objc-bridge/objc-runtime.lisp

Modified: trunk/source/cocoa-ide/builder-utilities.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/builder-utilities.lisp (original)
+++ trunk/source/cocoa-ide/builder-utilities.lisp Sat Apr 14 18:29:10 2012
@@ -232,6 +232,7 @@
                           (bundlep nil)
                           (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)
           ()

Modified: trunk/source/cocoa-ide/cocoa-application.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/cocoa-ide/cocoa-application.lisp (original)
+++ trunk/source/cocoa-ide/cocoa-application.lisp Sat Apr 14 18:29:10 2012
@@ -38,15 +38,7 @@
 (load "ccl:cocoa-ide;defsystem.lisp")
 (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+)))
+
   =

 =

 ;;; If things go wrong, you might see some debugging information via

Modified: trunk/source/objc-bridge/objc-runtime.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/objc-bridge/objc-runtime.lisp (original)
+++ trunk/source/objc-bridge/objc-runtime.lisp Sat Apr 14 18:29:10 2012
@@ -393,6 +393,16 @@
 =

 (pushnew #'load-cocoa-framework *lisp-system-pointer-functions* :key #'fun=
ction-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)
 =