diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.am | 14 | ||||
| -rw-r--r-- | macosx/Info-gnustep.plist | 4 | ||||
| -rw-r--r-- | macosx/Info.plist | 34 | ||||
| -rw-r--r-- | macosx/PkgInfo | 2 |
5 files changed, 54 insertions, 9 deletions
@@ -1,3 +1,12 @@ +2007-03-27 Yves Combe <yves@ycombe.net> + + Add SDL* frameworks copy in bundle. + + * Makefile.am: + * macosx/Info-gnustep.plist: + * macosx/Info.plist: + * macosx/PkgInfo: + 2007-03-26 Yves Combe <yves@ycombe.net> Small fix for GNUstep compatibility diff --git a/Makefile.am b/Makefile.am index 245f6b6..20446d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,7 +132,7 @@ FCT_LDD_CP=function ldd_cp { \ FCT_OTOOL_CP=function otool_cp { \ for f in $$(otool -L $$1 | grep $$2 | eval "sed -e 's,^.*$$2/\(.*.dylib\).*$$,\1,' " ); do \ echo install_name_tool -change $$2/$$f @executable_path$$4/$$f $$1;\ - install_name_tool -change $$2/$$f @executable_path$$4/$$f $$1 ; \ + install_name_tool -change $$2/$$f @executable_path$$4/$$f $$1 ; \ if test ! -f $$3/$$f ; then \ echo "$(INSTALL) -d $$(dirname $$3/$$f)"; \ echo "$(INSTALL) $$2/$$f $$3/$$f "; \ @@ -184,16 +184,22 @@ endif for f in $(EXTERN_BIN); do \ $(INSTALL_D) $(prefix)/bin/$$f $(BUNDLE_RESOURCES_DIR)/bin/$$f; \ done - $(INSTALL) $(top_srcdir)/macosx/Info.plist $(BUNDLE_RESOURCES_DIR)/ - $(INSTALL) $(top_srcdir)/macosx/gcompris.svg $(BUNDLE_RESOURCES_DIR)/ - $(INSTALL) $(top_srcdir)/macosx/gcompris.png $(BUNDLE_RESOURCES_DIR)/ if OS_MACOSX + $(INSTALL) $(top_srcdir)/macosx/Info.plist $(BUNDLE_RESOURCES_DIR)/../ + $(INSTALL) $(top_srcdir)/macosx/PkgInfo $(BUNDLE_RESOURCES_DIR)/../ + $(INSTALL) $(top_srcdir)/macosx/GCompris.icns $(BUNDLE_RESOURCES_DIR)/ $(FCT_OTOOL_CP) ; for s in $$(find $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR)/ -name '*.so') ; do \ otool_cp $$s $(prefix) $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR) $(NSBUNDLE_GTK_DIR) ; \ done $(FCT_OTOOL_CP) ; for s in $$(find $(BUNDLE_RESOURCES_DIR) -name '*.so') ; do \ otool_cp $$s $(prefix) $(BUNDLE_EXEC_DIR)$(NSBUNDLE_GTK_DIR) $(NSBUNDLE_GTK_DIR) ; \ done + echo WARNING ! I suppose SDL Framewroks installed in /Library/Frameworks + $(FCT_CP_TAR); cp_tar /Library/Frameworks/SDL.framework $(BUNDLE_EXEC_DIR)/../Frameworks/SDL.framework + $(FCT_CP_TAR); cp_tar /Library/Frameworks/SDL_mixer.framework $(BUNDLE_EXEC_DIR)/../Frameworks/SDL_mixer.framework +else + $(INSTALL) $(top_srcdir)/macosx/gcompris.png $(BUNDLE_RESOURCES_DIR)/ + $(INSTALL) $(top_srcdir)/macosx/Info-gnustep.plist $(BUNDLE_RESOURCES_DIR)/ endif endif diff --git a/macosx/Info-gnustep.plist b/macosx/Info-gnustep.plist new file mode 100644 index 0000000..2978d43 --- /dev/null +++ b/macosx/Info-gnustep.plist @@ -0,0 +1,4 @@ +{ + NSExecutable = "GCompris"; + NSIcon = "gcompris.png"; +}
\ No newline at end of file diff --git a/macosx/Info.plist b/macosx/Info.plist index 2978d43..a61a477 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -1,4 +1,30 @@ -{ - NSExecutable = "GCompris"; - NSIcon = "gcompris.png"; -}
\ No newline at end of file +<?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>CFBundleExecutable</key> + <string>GCompris</string> + <key>CFBundleGetInfoString</key> + <string>8.3BETA1 200-2006 Bruno Coudoin and the GCompris Team</string> + <key>CFBundleIconFile</key> + <string>GCompris.icns</string> + <key>CFBundleIdentifier</key> + <string>org.gcompris.GCompris</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>8.3.BETA1</string> + <key>CFBundleSignature</key> + <string>GCom</string> + <key>CFBundleVersion</key> + <string>8.3.BETA1</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright 2000-2007 GCompris Developers, GNU General Public Licensev2.</string> + <key>LSMinimumSystemVersion</key> + <string>10.3</string> +</dict> +</plist> diff --git a/macosx/PkgInfo b/macosx/PkgInfo index 8576ae6..4ef0f38 100644 --- a/macosx/PkgInfo +++ b/macosx/PkgInfo @@ -1 +1 @@ -APPLGCompris +APPLGCom
\ No newline at end of file |