[Gnash-commit] gnash ChangeLog gui/Info.plist gui/Makefile.am

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/07/28 14:55:28

Modified files:
        .              : ChangeLog 
        gui            : Info.plist Makefile.am 

Log message:
        Now we can build a bundle by running 'make bundle', albeit I must fix 
the linkage.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3848&r2=1.3849
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Info.plist?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.90&r2=1.91

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3848
retrieving revision 1.3849
diff -u -b -r1.3848 -r1.3849
--- ChangeLog   28 Jul 2007 12:58:08 -0000      1.3848
+++ ChangeLog   28 Jul 2007 14:55:27 -0000      1.3849
@@ -6,6 +6,9 @@
 2007-07-28 Markus Gothe <address@hidden>
        
        * configure.ac: Don't try building KDE/Klash if we'vent got the libs...
+       * gui/aqua*, gui/Info.pist, gui/images/GnashG.icns, gui/Makefile.am: 
+         Now we can build a bundle by running 'make bundle', albeit I must
+         fix the linkage.
 
 2007-07-27 Nick Warne <address@hidden>
 

Index: gui/Info.plist
===================================================================
RCS file: /sources/gnash/gnash/gui/Info.plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gui/Info.plist      26 Jul 2007 08:49:28 -0000      1.1
+++ gui/Info.plist      28 Jul 2007 14:55:28 -0000      1.2
@@ -6,8 +6,24 @@
        <string>English</string>
        <key>CFBundleExecutable</key>
        <string>gnash</string>
+       <key>CFBundleGetInfoString</key>
+       <string>0.8.1, Copyright (C) 2005-2007 Free Software Foundation, 
Inc.</string>
+       <key>CFBundleTypeExtensions</key>
+       <array>
+       <string>swf</string>
+    <string>SWF</string>
+    </array>
+    <key>CFBundleTypeName</key>
+       <string>Flash File</string>
+       <key>CFBundleTypeOSTypes</key>
+       <array>
+       <string>swf</string>
+    <string>SWF</string>
+       </array>
+    <key>CFBundleGetInfoString</key>
+       <string>gnash Version 0.8.1</string>
        <key>CFBundleIconFile</key>
-       <string></string>
+       <string>GnashG.icns</string>
        <key>CFBundleIdentifier</key>
        <string>com.gnash.aqua</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -18,6 +34,8 @@
        <string>????</string>
        <key>CFBundleVersion</key>
        <string>1.0</string>
+       <key>SUFeedURL</key>
+       <string>http://www.gnashdev.org/update.xml</string>
        <key>CSResourcesFileMapped</key>
        <true/>
 </dict>

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- gui/Makefile.am     27 Jul 2007 14:13:01 -0000      1.90
+++ gui/Makefile.am     28 Jul 2007 14:55:28 -0000      1.91
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.90 2007/07/27 14:13:01 strk Exp $
+# $Id: Makefile.am,v 1.91 2007/07/28 14:55:28 nihilus Exp $
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
@@ -153,7 +153,23 @@
 
 # AQUA Toolkit
 if BUILD_AQUA_GUI
+
+#OS X stuff goes here...
+
      GUI_CPPFLAGS += -DGUI_AQUA
+
+bundle_name = gnash.app
+
+bundle: Info.plist $(ICONFILE)
+       @echo " Building: $(bundle_name)" 
+       -rm -rf $(bundle_name)/Contents
+       mkdir -p $(bundle_name)/Contents/MacOS
+       mkdir -p $(bundle_name)/Contents/Resources
+       echo "APPL????" > $(bundle_name)/Contents/PkgInfo
+       cp Info.plist $(bundle_name)/Contents/Info.plist
+       cp -f gnash $(bundle_name)/Contents/MacOS
+       cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
+     
 if  HAVE_OPENGL
      plugins_LTLIBRARIES += libgnashaqua_ogl.la
      libgnashaqua_ogl_la_CPPFLAGS = $(AM_CPPFLAGS) \