mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Xcode will now preprocess the Info.plist for us; simplify the version script to avoid creating the unneeded (afaict) version.mk

This commit is contained in:
Mitchell Livingston 2008-10-12 23:31:20 +00:00
parent 2c0a39d7c6
commit 75a50cc057
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Transmission.xcodeproj/project.pbxproj
View File

@ -2242,6 +2242,10 @@
GCC_WARN_UNUSED_VARIABLE = NO;
IBC_FLATTEN_NIBS = YES;
IBC_NOTICES = NO;
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
INFOPLIST_PREPROCESS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
@ -2369,6 +2373,10 @@
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
IBC_NOTICES = NO;
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
INFOPLIST_PREPROCESS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = "";
PREBINDING = NO;
@ -2399,6 +2407,10 @@
GCC_WARN_UNUSED_PARAMETER = NO;
GCC_WARN_UNUSED_VARIABLE = NO;
IBC_NOTICES = NO;
INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist";
INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC";
INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h";
INFOPLIST_PREPROCESS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = "";
PREBINDING = NO;

4
macosx/Info.plist.in → macosx/Info.plist
View File

@ -40,11 +40,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>%%SHORT_VERSION_STRING%%</string>
<string>VERSION_STRING_INFOPLIST</string>
<key>CFBundleSignature</key>
<string>TR##</string>
<key>CFBundleVersion</key>
<string>%%BUNDLE_VERSION%%</string>
<string>BUNDLE_VERSION_INFOPLIST</string>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<key>NSMainNibFile</key>

34
macosx/version.sh
View File

@ -10,18 +10,10 @@
PEERID_PREFIX="-TR134Z-"
USERAGENT_PREFIX="1.34+"
SVN_REVISION=`find ./macosx ./libtransmission -name "*\.[chmp]" -o -name "*\.cpp" -o -name "*\.po" -o -name "*\.sh" | \
xargs grep "\$Id:" | \
grep -v third-party | \
cut -d"$Id:" -f3 | cut -d" " -f3 | sort -n | tail -n 1`
if [[ "x${PEERID_PREFIX//0-/}" != "x$PEERID_PREFIX" ]]
then
STABLE_RELEASE=yes
else
STABLE_RELEASE=no
fi
# Generate files to be included: only overwrite them if changed so make
# won't rebuild everything unless necessary
@ -34,27 +26,17 @@ replace_if_differs ()
fi
}
# Generate version.mk
cat > macosx/version.mk.new << EOF
VERSION_REVISION = "$SVN_REVISION"
VERSION_STRING = "$USERAGENT_PREFIX ($SVN_REVISION)"
STABLE_RELEASE = "$STABLE_RELEASE"
EOF
replace_if_differs macosx/version.mk.new macosx/version.mk
# Generate version.h
cat > libtransmission/version.h.new << EOF
#define PEERID_PREFIX "$PEERID_PREFIX"
#define USERAGENT_PREFIX "$USERAGENT_PREFIX"
#define SVN_REVISION "$SVN_REVISION"
#define SHORT_VERSION_STRING "$USERAGENT_PREFIX"
#define LONG_VERSION_STRING "$USERAGENT_PREFIX ($SVN_REVISION)"
#define PEERID_PREFIX "$PEERID_PREFIX"
#define USERAGENT_PREFIX "$USERAGENT_PREFIX"
#define SVN_REVISION "$SVN_REVISION"
#define SHORT_VERSION_STRING "$USERAGENT_PREFIX"
#define LONG_VERSION_STRING "$USERAGENT_PREFIX ($SVN_REVISION)"
#define VERSION_STRING_INFOPLIST $USERAGENT_PREFIX
#define BUNDLE_VERSION_INFOPLIST $SVN_REVISION
EOF
replace_if_differs libtransmission/version.h.new libtransmission/version.h
# Generate Info.plist from Info.plist.in
sed -e "s/%%BUNDLE_VERSION%%/$SVN_REVISION/" -e "s/%%SHORT_VERSION_STRING%%/$USERAGENT_PREFIX/" \
< macosx/Info.plist.in > macosx/Info.plist.new
replace_if_differs macosx/Info.plist.new macosx/Info.plist
exit 0