custom info.plist with supported document types

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/docview/Info.plist b/samples/docview/Info.plist
new file mode 100755 (executable)
index 0000000..9bf4d70
--- /dev/null
+++ b/samples/docview/Info.plist
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//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>CFBundleDocumentTypes</key>
+       <array>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>drw</string>
+                       </array>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>chart.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>DocView Drawing</string>
+                       <key>CFBundleTypeOSTypes</key>
+                       <array>
+                               <string>WXMB</string>
+                       </array>
+                       <key>CFBundleTypeRole</key>
+                       <string>Editor</string>
+                       <key>LSTypeIsPackage</key>
+                       <false/>
+                       <key>NSPersistentStoreTypeKey</key>
+                       <string>Binary</string>
+               </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>txt</string>
+                               <string>text</string>
+                       </array>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>notepad.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>DocView Text</string>
+                       <key>CFBundleTypeOSTypes</key>
+                       <array>
+                               <string>TEXT</string>
+                       </array>
+                       <key>CFBundleTypeRole</key>
+                       <string>Editor</string>
+                       <key>LSTypeIsPackage</key>
+                       <false/>
+                       <key>NSPersistentStoreTypeKey</key>
+                       <string>Binary</string>
+               </dict>
+       </array>
+       <key>CFBundleExecutable</key>
+       <string>$(PRODUCT_NAME)</string>
+       <key>CFBundleGetInfoString</key>
+       <string>$(PRODUCT_NAME) version 2.9.0, (c) 2005-2008 wxWidgets</string>
+       <key>CFBundleIconFile</key>
+       <string>doc</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.wxwidgets.samples.$(PRODUCT_NAME)</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleLocalizations</key>
+       <array>
+               <string>de</string>
+               <string>en</string>
+               <string>fr</string>
+               <string>it</string>
+       </array>
+       <key>CFBundleLongVersionString</key>
+       <string>2.9.0, (c) 2005-2008 wxWidgets</string>
+       <key>CFBundleName</key>
+       <string>$(PRODUCT_NAME)</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>2.9.0</string>
+       <key>CFBundleSignature</key>
+       <string>WXMA</string>
+       <key>CFBundleVersion</key>
+       <string>2.9.0</string>
+       <key>CSResourcesFileMapped</key>
+       <true/>
+       <key>LSRequiresCarbon</key>
+       <true/>
+       <key>NSHumanReadableCopyright</key>
+       <string>Copyright 2005-2008 wxWidgets</string>
+</dict>
+</plist>

diff --git a/samples/docview/Info.plist.in b/samples/docview/Info.plist.in
new file mode 100644 (file)
index 0000000..95180ea
--- /dev/null
+++ b/samples/docview/Info.plist.in
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.wxwindows.IDENTIFIER</string>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleLocalizations</key>
+       <array>
+               <string>de</string>
+               <string>en</string>
+               <string>fr</string>
+               <string>it</string>
+       </array>
+       <key>CFBundleDocumentTypes</key>
+       <array>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>drw</string>
+                       </array>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>chart.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>DocView Drawing</string>
+                       <key>CFBundleTypeOSTypes</key>
+                       <array>
+                               <string>WXMB</string>
+                       </array>
+                       <key>CFBundleTypeRole</key>
+                       <string>Editor</string>
+                       <key>LSTypeIsPackage</key>
+                       <false/>
+                       <key>NSPersistentStoreTypeKey</key>
+                       <string>Binary</string>
+               </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>txt</string>
+                               <string>text</string>
+                       </array>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>notepad.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>DocView Text</string>
+                       <key>CFBundleTypeOSTypes</key>
+                       <array>
+                               <string>TEXT</string>
+                       </array>
+                       <key>CFBundleTypeRole</key>
+                       <string>Editor</string>
+                       <key>LSTypeIsPackage</key>
+                       <false/>
+                       <key>NSPersistentStoreTypeKey</key>
+                       <string>Binary</string>
+               </dict>
+       </array>
+       <key>CFBundleExecutable</key>
+       <string>EXECUTABLE</string>
+       <key>CFBundleIconFile</key>
+       <string>doc.icns</string>
+       <key>CFBundleName</key>
+       <string>EXECUTABLE</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleSignature</key>
+       <string>WXMA</string>
+       <key>CFBundleVersion</key>
+       <string>VERSION</string>
+       <key>CFBundleShortVersionString</key>
+       <string>VERSION</string>
+       <key>CFBundleGetInfoString</key>
+       <string>EXECUTABLE version VERSION, (c) 2002-2008 wxWidgets</string>
+       <key>CFBundleLongVersionString</key>
+       <string>VERSION, (c) 2002-2008 wxWidgets</string>
+       <key>NSHumanReadableCopyright</key>
+       <string>Copyright 2002-2008 wxWidgets</string>
+       <key>LSRequiresCarbon</key>
+       <true/>
+       <key>CSResourcesFileMapped</key>
+       <true/>
+</dict>
+</plist>

diff --git a/samples/docview/Makefile.in b/samples/docview/Makefile.in
index 80f89472c560ac28d6f4268f90f310397a143cda..8be62dac88e2bc79eb028ec114a713c81cf842bf 100644 (file)
--- a/samples/docview/Makefile.in
+++ b/samples/docview/Makefile.in
@@ -163,7 +163,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
        $(__docview___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-@COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/chart.icns $(srcdir)/doc.icns $(srcdir)/notepad.icns
 @COND_PLATFORM_MACOSX_1@       mkdir -p docview.app/Contents
 @COND_PLATFORM_MACOSX_1@       mkdir -p docview.app/Contents/MacOS
 @COND_PLATFORM_MACOSX_1@       mkdir -p docview.app/Contents/Resources
@@ -172,7 +172,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
 @COND_PLATFORM_MACOSX_1@       sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/EXECUTABLE/docview/" \
 @COND_PLATFORM_MACOSX_1@       -e "s/VERSION/$(WX_VERSION)/" \
-@COND_PLATFORM_MACOSX_1@       $(top_srcdir)/src/osx/carbon/Info.plist.in >docview.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@       $(srcdir)/Info.plist.in >docview.app/Contents/Info.plist
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       echo -n "APPL????" >docview.app/Contents/PkgInfo
@@ -181,7 +181,7 @@ docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
 @COND_PLATFORM_MACOSX_1@       ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
 @COND_PLATFORM_MACOSX_1@       
 @COND_PLATFORM_MACOSX_1@       
-@COND_PLATFORM_MACOSX_1@       cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns docview.app/Contents/Resources/wxmac.icns
+@COND_PLATFORM_MACOSX_1@       cp -f $(srcdir)/chart.icns $(srcdir)/doc.icns $(srcdir)/notepad.icns docview.app/Contents/Resources
 
 @COND_PLATFORM_MACOSX_1@docview_bundle: $(____docview_BUNDLE_TGT_REF_DEP)
 
@@ -198,6 +198,15 @@ docview_docview_rc.o: $(srcdir)/docview.rc
        $(WINDRES) -i$< -o$@    --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)  $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
 
 
+$(srcdir)/include/wx/stc/stc.h: \
+$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
+$(srcdir)/src/stc/stc.cpp.in \
+$(srcdir)/src/stc/stc.h.in \
+$(srcdir)/src/stc/gen_iface.py
+       cd $(srcdir)/src/stc && ./gen_iface.py
+monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
+$(srcdir)/include/wx/stc/stc.h
+
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include .deps/*.d
 

diff --git a/samples/docview/chart.icns b/samples/docview/chart.icns
new file mode 100644 (file)
index 0000000..3624c0c
Binary files /dev/null and b/samples/docview/chart.icns differ

diff --git a/samples/docview/doc.icns b/samples/docview/doc.icns
new file mode 100644 (file)
index 0000000..7cda58e
Binary files /dev/null and b/samples/docview/doc.icns differ

diff --git a/samples/docview/docview.bkl b/samples/docview/docview.bkl
index 62ba8dc77dada80e916fb85bbb37c443a2e5509f..1edbffd24f3eabf13348bbee7a52c7324b7d138b 100644 (file)
--- a/samples/docview/docview.bkl
+++ b/samples/docview/docview.bkl
@@ -1,6 +1,9 @@
 <?xml version="1.0" ?>
 <makefile>
 
+    <set var="BUNDLE_PLIST">$(SRCDIR)/Info.plist.in</set>
+    <set var="BUNDLE_ICONS">$(SRCDIR)/chart.icns $(SRCDIR)/doc.icns $(SRCDIR)/notepad.icns</set>
+
     <include file="../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="docview" template="wx_sample" template_append="wx_append">

diff --git a/samples/docview/notepad.icns b/samples/docview/notepad.icns
new file mode 100644 (file)
index 0000000..69ea4a3
Binary files /dev/null and b/samples/docview/notepad.icns differ