From 65d337fb3e1b796d4d62ea39dcc6f7afec941c64 Mon Sep 17 00:00:00 2001 From: Xant Date: Sun, 13 Sep 2009 18:35:54 +0200 Subject: [PATCH] Increase the build number only when in 'Release' configuration 'NewApplication' => 'Freej' in the application menu --- .../English.lproj/MainMenu.nib/designable.nib | 18 ++++++----- .../MainMenu.nib/keyedobjects.nib | Bin 3452053 -> 3451984 bytes xcode/Info.plist | 28 ------------------ xcode/freej-Info.plist | 2 +- xcode/freej.xcodeproj/project.pbxproj | 23 +++++++++----- 5 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 xcode/Info.plist diff --git a/xcode/English.lproj/MainMenu.nib/designable.nib b/xcode/English.lproj/MainMenu.nib/designable.nib index dd73df55..87f5bf65 100644 --- a/xcode/English.lproj/MainMenu.nib/designable.nib +++ b/xcode/English.lproj/MainMenu.nib/designable.nib @@ -13,7 +13,7 @@ - + YES @@ -46,7 +46,7 @@ YES - NewApplication + FreeJ 1048576 2147483647 @@ -60,12 +60,12 @@ submenuAction: - NewApplication + FreeJ YES - About NewApplication + About FreeJ 2147483647 @@ -781,7 +781,7 @@ YES - NewApplication Help + FreeJ Help ? 1048576 2147483647 @@ -157317,6 +157317,7 @@ AAgAAQABAAEAAQ 297.IBPluginDependency 298.IBPluginDependency 299.IBPluginDependency + 300.IBEditorWindowLastContentRect 300.IBPluginDependency 300.editorWindowContentRectSynchronizationRect 344.IBPluginDependency @@ -157411,7 +157412,7 @@ AAgAAQABAAEAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{504, 713}, {216, 23}} + {{427, 713}, {143, 23}} com.apple.InterfaceBuilder.CocoaPlugin {{596, 852}, {216, 23}} @@ -157942,7 +157943,7 @@ AAgAAQABAAEAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{87, 736}, {478, 20}} + {{87, 736}, {401, 20}} com.apple.InterfaceBuilder.CocoaPlugin {74, 862} @@ -157954,6 +157955,7 @@ AAgAAQABAAEAAQ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{240, 693}, {176, 43}} com.apple.InterfaceBuilder.CocoaPlugin {{606, 455}, {176, 43}} com.apple.InterfaceBuilder.CocoaPlugin @@ -157984,7 +157986,7 @@ AAgAAQABAAEAAQ com.apple.InterfaceBuilder.CocoaPlugin - {{99, 553}, {245, 183}} + {{99, 553}, {235, 183}} com.apple.InterfaceBuilder.CocoaPlugin {{453, 315}, {245, 183}} diff --git a/xcode/English.lproj/MainMenu.nib/keyedobjects.nib b/xcode/English.lproj/MainMenu.nib/keyedobjects.nib index 577d4d04fe07e0a298cce7416b8587b5aa73479c..9f25e61363336344a2b0fa358cb5aadf6f349783 100644 GIT binary patch delta 15193 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 - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - ipernav - CFBundleIdentifier - org.dyne.freej - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleSignature - dyne - CFBundleVersion - %OSX_VERSION%.%BUILD_NUMBER% - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/xcode/freej-Info.plist b/xcode/freej-Info.plist index 8f25857a..e40d51c6 100644 --- a/xcode/freej-Info.plist +++ b/xcode/freej-Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleExecutable - ${EXECUTABLE_NAME} + FreeJ CFBundleIconFile ipernav CFBundleIdentifier diff --git a/xcode/freej.xcodeproj/project.pbxproj b/xcode/freej.xcodeproj/project.pbxproj index 5c80b1b0..81b262d3 100644 --- a/xcode/freej.xcodeproj/project.pbxproj +++ b/xcode/freej.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ AA819B26104CFC0500FD1991 /* CVLayerController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA819B25104CFC0500FD1991 /* CVLayerController.mm */; }; AA819B80104E4C7B00FD1991 /* CVGrabberView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA819B7F104E4C7B00FD1991 /* CVGrabberView.mm */; }; AA819B88104E4D2700FD1991 /* CVFileInputView.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA819B87104E4D2700FD1991 /* CVFileInputView.mm */; }; - AA819D16104EF69800FD1991 /* CVF0rLayerController.mm in Resources */ = {isa = PBXBuildFile; fileRef = AA819D15104EF69800FD1991 /* CVF0rLayerController.mm */; }; AA8858810F631E3C00778C03 /* CVGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = AA8858800F631E3C00778C03 /* CVGenerator.m */; }; AA88592D0F633A7500778C03 /* CVF0rLayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA88592C0F633A7500778C03 /* CVF0rLayer.mm */; }; AA8A1BDA1056391B007D067B /* CVF0rLayerController.mm in Sources */ = {isa = PBXBuildFile; fileRef = AA819D15104EF69800FD1991 /* CVF0rLayerController.mm */; }; @@ -162,6 +161,18 @@ AAEE689F0FC893BC007FB46B /* frei0r.png in Resources */ = {isa = PBXBuildFile; fileRef = AAEE689E0FC893BC007FB46B /* frei0r.png */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + AA407868105D554000401BB3 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; @@ -170,7 +181,6 @@ 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; - 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; AA00100C0F77FD9200719D5B /* callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = callback.cpp; sourceTree = ""; }; AA00100E0F77FDA000719D5B /* callback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = callback.h; path = include/callback.h; sourceTree = ""; }; AA0E39800FBECC1E00123D3F /* CVPreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CVPreview.h; sourceTree = ""; }; @@ -597,7 +607,6 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */, 29B97317FDCFA39411CA2CEA /* Resources */, 19C28FACFE9D520D11CA2CBB /* Products */, - AAA7B6530F40494400056C44 /* freej-Info.plist */, 29B97316FDCFA39411CA2CEA /* main.m */, AAB843AA0F3EEEAF00AD479D /* config.h */, ); @@ -610,7 +619,7 @@ AADF79FF0FD7F84500167F57 /* ipernav.icns */, AAEE689E0FC893BC007FB46B /* frei0r.png */, AAEE68930FC8906B007FB46B /* webcam.png */, - 8D1107310486CEB800E47090 /* Info.plist */, + AAA7B6530F40494400056C44 /* freej-Info.plist */, AAA7B6F30F404B4C00056C44 /* freej.app */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, @@ -878,6 +887,7 @@ AAA7B6F00F404B4C00056C44 /* Sources */, AAA7B6F10F404B4C00056C44 /* Frameworks */, AA155AFF0F5E0A7A00234C8F /* PostBuildScript */, + AA407868105D554000401BB3 /* CopyFiles */, ); buildRules = ( ); @@ -916,7 +926,6 @@ AAEE68940FC8906B007FB46B /* webcam.png in Resources */, AAEE689F0FC893BC007FB46B /* frei0r.png in Resources */, AADF7A000FD7F84500167F57 /* ipernav.icns in Resources */, - AA819D16104EF69800FD1991 /* CVF0rLayerController.mm in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -935,7 +944,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export INSTALLED=\"\"\nexport LIBS_PATH=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\"\nmkdir -p $LIBS_PATH\nexport TARGET=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n\nfollow_dependencies () {\n\tlibname=$1\n\tcd \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\"\n\tdependencies=`otool -L \"$libname\" | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'`\n\tfor l in $dependencies; do\n\t\tdepname=`basename $l`\n\t\tdeppath=`dirname $l`\n\t\tif [ ! -f \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$depname\" ]; then\n\t\t\tdeploy_lib $depname \"$deppath\"\n\t\tfi\n\tdone\n}\n\nupdate_links () {\n\tlibname=$1\n\tlibpath=$2\n\tfor n in `ls $LIBS_PATH/*`; do\n\t\tinstall_name_tool \\\n\t\t\t-change \"$libpath/$libname\" \\\n\t\t\t@executable_path/../Frameworks/$libname \\\n\t\t\t\"$n\"\n\tdone\n}\n\ndeploy_lib () {\n\tlibname=$1\n\tlibpath=$2\n\tcheck=`echo $INSTALLED | grep $libname`\n\tif [ \"X$check\" = \"X\" ]; then\n\t\tif [ ! -f \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$libname\" ]; then\n\t\t\tcp -f \"$libpath/$libname\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$libname\"\n\t\t\tinstall_name_tool \\\n\t\t\t\t-id @executable_path/../Frameworks/$libname \\\n\t\t\t\t\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$libname\"\n\t\t\tfollow_dependencies $libname\n\t\tfi\n\t\texport INSTALLED=\"$INSTALLED $libname\"\n\tfi\n\tupdate_links $libname $libpath\n}\n\nupdate_executable() {\n\tLIBS=`otool -L \"$TARGET\" | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'`\n\tfor l in $LIBS; do\n\t\tlibname=`basename $l`\n\t\tlibpath=`dirname $l`\n\t\tdeploy_lib $libname $libpath\n\t\techo \"install_name_tool -change $libpath/$libname @executable_path/../Frameworks/$libname \\\"$TARGET\\\"\"\n\t\tinstall_name_tool \\\n\t\t\t-change $libpath/$libname \\\n\t\t\t@executable_path/../Frameworks/$libname \\\n\t\t\t\"$TARGET\"\n\tdone\n}\n\nupdate_executable\ncd $LIBS_PATH && MORELIBS=`otool -L * | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'` && cd -\nwhile [ \"X$MORELIBS\" != \"X\" ]; do\n\tfor l in $MORELIBS; do\n\t\tlibname=`basename $l`\n\t\tlibpath=`dirname $l`\n\t\tdeploy_lib \"$libname\" \"$libpath\"\n\tdone\n\tcd $LIBS_PATH && MORELIBS=`otool -L * | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'` && cd -\ndone\nupdate_executable\n\nif [ -d \"$TARGET_BUILD_DIR/Plugins\" ]; then\n\tcp -r \"$TARGET_BUILD_DIR/Plugins\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/\"\nfi\n\nif [ -d \"/opt/local/lib/frei0r-1/\" ]; then\n\tcp -r \"/opt/local/lib/frei0r-1\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Plugins\"\nfi"; + shellScript = "export INSTALLED=\"\"\nexport LIBS_PATH=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\"\nmkdir -p $LIBS_PATH\nexport TARGET=\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\"\n\nfollow_dependencies () {\n\tlibname=$1\n\tcd \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks\"\n\tdependencies=`otool -L \"$libname\" | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'`\n\tfor l in $dependencies; do\n\t\tdepname=`basename $l`\n\t\tdeppath=`dirname $l`\n\t\tif [ ! -f \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$depname\" ]; then\n\t\t\tdeploy_lib $depname \"$deppath\"\n\t\tfi\n\tdone\n}\n\nupdate_links () {\n\tlibname=$1\n\tlibpath=$2\n\tfor n in `ls $LIBS_PATH/*`; do\n\t\tinstall_name_tool \\\n\t\t\t-change \"$libpath/$libname\" \\\n\t\t\t@executable_path/../Frameworks/$libname \\\n\t\t\t\"$n\"\n\tdone\n}\n\ndeploy_lib () {\n\tlibname=$1\n\tlibpath=$2\n\tcheck=`echo $INSTALLED | grep $libname`\n\tif [ \"X$check\" = \"X\" ]; then\n\t\tif [ ! -f \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$libname\" ]; then\n\t\t\tcp -f \"$libpath/$libname\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$libname\"\n\t\t\tinstall_name_tool \\\n\t\t\t\t-id @executable_path/../Frameworks/$libname \\\n\t\t\t\t\"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/$libname\"\n\t\t\tfollow_dependencies $libname\n\t\tfi\n\t\texport INSTALLED=\"$INSTALLED $libname\"\n\tfi\n\tupdate_links $libname $libpath\n}\n\nupdate_executable() {\n\tLIBS=`otool -L \"$TARGET\" | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'`\n\tfor l in $LIBS; do\n\t\tlibname=`basename $l`\n\t\tlibpath=`dirname $l`\n\t\tdeploy_lib $libname $libpath\n\t\techo \"install_name_tool -change $libpath/$libname @executable_path/../Frameworks/$libname \\\"$TARGET\\\"\"\n\t\tinstall_name_tool \\\n\t\t\t-change $libpath/$libname \\\n\t\t\t@executable_path/../Frameworks/$libname \\\n\t\t\t\"$TARGET\"\n\tdone\n}\n\nupdate_executable\ncd $LIBS_PATH && MORELIBS=`otool -L * | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'` && cd -\nwhile [ \"X$MORELIBS\" != \"X\" ]; do\n\tfor l in $MORELIBS; do\n\t\tlibname=`basename $l`\n\t\tlibpath=`dirname $l`\n\t\tdeploy_lib \"$libname\" \"$libpath\"\n\tdone\n\tcd $LIBS_PATH && MORELIBS=`otool -L * | egrep '\\/(opt|usr)\\/local\\/lib' | awk '{print $1}'` && cd -\ndone\nupdate_executable\n\nif [ -d \"$TARGET_BUILD_DIR/Plugins\" ]; then\n\tcp -r \"$TARGET_BUILD_DIR/Plugins\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/\"\nfi\n\nif [ -d \"/opt/local/lib/frei0r-1/\" ]; then\n\tcp -r \"/opt/local/lib/frei0r-1\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Plugins\"\nfi\n\n# Update the Info.plist file with correct version and build numbers\nexport BUILD_NUMBER=`grep BUILD_NUMBER $TARGET_BUILD_DIR/../../config.h | awk '{print $3}'`\nexport OSX_VERSION=`grep OSX_VERSION $TARGET_BUILD_DIR/../../config.h | awk '{print $3}'`\nsed -i .bck -e \"s#%BUILD_NUMBER%#$BUILD_NUMBER#g\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Info.plist\"\nsed -i .bck -e \"s#%OSX_VERSION%#$OSX_VERSION#g\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Info.plist\"\nrm \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Info.plist\".bck"; }; AA4077DC105D471100401BB3 /* PreBuildScript */ = { isa = PBXShellScriptBuildPhase; @@ -949,7 +958,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "BUILD_NUMBER=`grep BUILD_NUMBER $TARGET_BUILD_DIR/../../config.h | awk '{print $3}'`\nOLD_BUILD_NUMBER=$BUILD_NUMBER\n((BUILD_NUMBER++))\nexport BUILD_NUMBER\nexport OSX_VERSION=`grep OSX_VERSION $TARGET_BUILD_DIR/../../config.h | awk '{print $3}'`\nsed -i -e \"s#BUILD_NUMBER $OLD_BUILD_NUMBER#BUILD_NUMBER $BUILD_NUMBER#\" $TARGET_BUILD_DIR/../../config.h\nsed -i -e \"s#%BUILD_NUMBER%#$BUILD_NUMBER#g\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Info.plist\"\nsed -i -e \"s#%OSX_VERSION%#$OSX_VERSION#g\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Info.plist\""; + shellScript = "if [ \"X$CONFIGURATION\" = \"XRelease\" ]; then\n\texport BUILD_NUMBER=`grep BUILD_NUMBER $TARGET_BUILD_DIR/../../config.h | awk '{print $3}'`\n\tOLD_BUILD_NUMBER=$BUILD_NUMBER\n\t((BUILD_NUMBER++))\n\tsed -i .bck -e \"s#BUILD_NUMBER $OLD_BUILD_NUMBER#BUILD_NUMBER $BUILD_NUMBER#\" $TARGET_BUILD_DIR/../../config.h\n\trm $TARGET_BUILD_DIR/../../config.h.bck\nfi"; }; /* End PBXShellScriptBuildPhase section */