RegexPlugin and FMPLisp now live together (due to different bundle id…

…entifiers)

deliver.lisp

@@ -31,20 +31,13 @@
 
 (lw:load-all-patches)
 
-#+win32
-(define-action "Initialize LispWorks Tools"
-               "Dismiss Splash Screen Quickly"
-  #'(lambda (screen)
-      (declare (ignore screen))
-      (win32:dismiss-splash-screen t)))
-
-(set-default-character-element-type 'simple-char)
-
-(defvar *system-homedir* #+win32 #p"C:/" #-win32 (user-homedir-pathname))
+(defvar *system-homedir*
+  #+win32 #p"C:/" #-win32 (user-homedir-pathname))
 
 ;;; The following lines added by ql:add-to-init-file:
 #+(not quicklisp)
-(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp" (user-homedir-pathname))))
+(let ((quicklisp-init (merge-pathnames "quicklisp/setup.lisp"
+                                       (user-homedir-pathname))))
   (when (probe-file quicklisp-init)
     (load quicklisp-init)))
 
@@ -70,7 +63,7 @@ depend on FM-PLUGIN-TOOLS.")
   "Whether the plug-in needs MP.  This is only relevant if
 *CAPI-REQUIRED-P* is NIL.")
 
-(defvar *deliver-level* 0
+(defvar *deliver-level* 5
   ;; level 0 is good for development - for deployment you most likely
   ;; want higher values for a much smaller DLL file
   "Delivery level for the delivered DLL.")
@@ -103,6 +96,8 @@ depend on FM-PLUGIN-TOOLS.")
               :output-file :temp
               :load t)
 
+(defvar *template* (merge-pathnames "Template.fmplugin/" *load-pathname*))
+
 ;; create shared library
 (lw:deliver *start-function*
             ;; we assume this is called from the build script
@@ -118,8 +113,7 @@ depend on FM-PLUGIN-TOOLS.")
              :template-bundle (make-pathname :name nil
                                              :type nil
                                              :version nil
-                                             :defaults (merge-pathnames "Template.fmplugin/"
-                                                                        *load-pathname*))
+                                             :defaults *template*)
              :identifier fm:*plugin-bundle-identifier*
              :version (fm:version-string)             
              :executable-name (fourth sys:*line-arguments-list*)

regex-plugin/RegexPlugIn.fmplugin/Contents/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleIdentifier</key>
+	<string>de.weitz</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>RegexPlugIn</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>RegexPlugIn</string>
+	<key>CFBundleSignature</key>
+	<string>RegP</string>
+	<key>CFBundleVersion</key>
+	<string>1.2</string>
+</dict>
+</plist>

regex-plugin/RegexPlugIn.fmplugin/Contents/PkgInfo

@@ -0,0 +1 @@
+BNDL????

regex-plugin/deliver.lisp

@@ -32,20 +32,21 @@
 
 (in-package :cl-user)
 
-(defvar *asdf-system* :regex-plugin
+(defvar *asdf-system* :fm-regex-plugin
   "The ASDF system which contains the code for the plug-in.  It should
 depend on FM-PLUGIN-TOOLS.")
 
 (defvar *deliver-level* 5
   "Delivery level for the delivered DLL.")
 
+(defvar *template*
+  (merge-pathnames "RegexPlugIn.fmplugin/" *load-pathname*))
+
 ;;; Use the "original" delivery script for the rest of the work.
 ;;; (Adapt the path to match your local setup.  Also, don't forget to
 ;;; adapt the paths in the delivery file referenced below as well!)
 
 (defvar *deliver-script*
-  (merge-pathnames "../deliver.lisp"
-                   (load-time-value
-                    (or #.*compile-file-pathname* *load-pathname*))))
+  (merge-pathnames "../deliver.lisp" *load-pathname*))
 
 (load *deliver-script*)