Makefile modifications, the MF_BUILD and MF_VERSION are taken from Makefile.config.

the Info.plist is generated from the localize.sh script in macosx folder. Xcode settings are set at build time, no need the play around.

If modifications are needed in Info.plist, you must correct the localize script to show the right output.

The info.plist informations are seen in aboutbox of Mac GUI.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.8.0_beta2_5.1@364 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/BUILD b/BUILD
index 8f4788ad9c127a2c8ba3d4e95ef141edb419a90d..87cfc9f1525bd879d80791d0579675b7ad7d0415 100644 (file)
--- a/BUILD
+++ b/BUILD
@@ -2,8 +2,8 @@ $Id: BUILD,v 1.11 2005/10/23 01:35:59 titer Exp $
 
 BUILD file for HandBrake <http://handbrake.m0k.org/>
 
-Building HandBrake
-==================
+Building HandBrake with jam
+===========================
 
 You can build HandBrake on BeOS, MacOS X, Linux, and on Windows using Cygwin.
 If you'd like to port it to another OS, email me (titer@m0k.org).
@@ -45,13 +45,47 @@ Step 2: build
 Run `./configure && jam'. This will build every library HandBrake
 requires, then HandBrake itself.
 
+-----------------------------------------------------------------------------------------------------
 
-Experimental UB build on MacOsX
-===============================
+Building HandBrake with make
+============================
+
+Step 1: get needed tools
+========================
+
++ gcc and g++
+    There are usually included in your OS' dev tools. On BeOS/Zeta, the
+    default gcc isn't enough, gcc 2.95.3 is required.
+
++ nasm (Only for x86. On Mac OS X Intel, Xcode 2.4.1 include it)
+
+Cygwin setup:
+    There are a couple extra things required to make the code build for Cygwin.
+    Make sure you have /bin and /usr/bin on your path *first*, before
+    the Windows paths.  Otherwise the Cygwin find.exe won't be used, and
+    lame won't build.
+    Also, I have not tried to build this with MinGW, I've only built it with
+    the Cygwin environment, so you should build with Cygwin gcc and dev tools.
+    Unfortunately this means you need to have cygwin1.dll around to run the
+    HBTest.exe program, but that's the way it is for now, until I get time
+    to try building it with MinGW.  If you want to try making it work with
+    MinGW, then go for it!
+
+
+
+
+Step 2: configuration
+=====================
+
+The HB_BUILD and HB_VERSION are defined in a single file, the Makefile correct the values in Xcode too.
+
+The file where the informations are stored is Makefile.config
+
+Step 3: build
+=============
 
 Run `make'. This will build libmediafork, MediaFork and MediaForkCLI as Universal Binary.
 This build method use precompiled contrib libraries. Script to build those binaries are provided too.
 All the build is handled by Xcode 2.4.1, should work on powerPC and Intel Macs.
 
 
-

diff --git a/Makefile b/Makefile
index 226bb44467ee754330db7ba92597f6fd6eba136d..5f50dec2159a2339a12d127a68ff028ea040bc48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifeq ($(SYSTEM),Darwin)
 all:    clean app
 
 app:
-       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app)
+       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(MF_VERSION)\\\" -DHB_BUILD=$(MF_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh MediaFork.app $(MF_VERSION) $(MF_BUILD))
 
 clean:
        (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )

diff --git a/macosx/MediaFork.xcodeproj/project.pbxproj b/macosx/MediaFork.xcodeproj/project.pbxproj
index cac952351c4a212d32294b940929cc66fc6181fe..249cd5316ea22cb7b771600441606c260a3dc607 100644 (file)
--- a/macosx/MediaFork.xcodeproj/project.pbxproj
+++ b/macosx/MediaFork.xcodeproj/project.pbxproj
@@ -932,10 +932,9 @@
                                        "-D__LIBMEDIAFORK__",
                                        "-DSYS_DARWIN",
                                        "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DHB_BUILD=2007021100",
                                        "-DUSE_PTHREAD",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\"";
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
                                OTHER_LDFLAGS = "";
                                PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;
@@ -1099,10 +1098,9 @@
                                        "-D__LIBMEDIAFORK__",
                                        "-DSYS_DARWIN",
                                        "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DHB_BUILD=20070211",
                                        "-DUSE_PTHREAD",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
                                OTHER_LDFLAGS = "";
                                PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;
@@ -1129,10 +1127,9 @@
                                        "-D__LIBMEDIAFORK__",
                                        "-DSYS_DARWIN",
                                        "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DHB_BUILD=20070211",
                                        "-DUSE_PTHREAD",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
                                OTHER_LDFLAGS = "";
                                PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;
@@ -1158,10 +1155,9 @@
                                        "-D__LIBMEDIAFORK__",
                                        "-DSYS_DARWIN",
                                        "$(OTHER_CFLAGS_QUOTED_1)",
-                                       "-DHB_BUILD=20070211",
                                        "-DUSE_PTHREAD",
                                );
-                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0\\\"";
+                               OTHER_CFLAGS_QUOTED_1 = "-DHB_VERSION=\\\"0.8.0b1\\\" -DHB_BUILD=2007021100";
                                OTHER_LDFLAGS = "";
                                PER_ARCH_CFLAGS_ppc = "-DWORDS_BIGENDIAN";
                                PREBINDING = NO;

diff --git a/macosx/localize.sh b/macosx/localize.sh
index 27c423caa47c4885a1a865277764179d05256eb4..3fb37b2a31d0954c33d115dfbfef55c512ed4f45 100755 (executable)
--- a/macosx/localize.sh
+++ b/macosx/localize.sh
@@ -8,3 +8,43 @@ do
        cp -r English.lproj $l.lproj
        cp ../../../macosx/i18n/$l.strings $l.lproj/Localizable.strings
 done
+
+echo Generating Info.plist with correct version information
+cd ..
+echo "<?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>CFBundleDisplayName</key>
+        <string>MediaFork</string>
+        <key>CFBundleExecutable</key>
+        <string>MediaFork</string>
+        <key>CFBundleGetInfoString</key>
+        <string>0.8.0b1</string>
+        <key>CFBundleIconFile</key>
+        <string>MediaFork</string>
+        <key>CFBundleIdentifier</key>
+        <string>org.mediafork.dynalias</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>MediaFork</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>$2</string>
+        <key>CFBundleSignature</key>
+        <string>HB##</string>
+        <key>CFBundleVersion</key>
+        <string>$3</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>MediaFork Devs</string>
+        <key>NSMainNibFile</key>
+        <string>MainMenu</string>
+        <key>NSPrincipalClass</key>
+        <string>NSApplication</string>
+</dict>
+</plist>" > Info.plist
+