Splits VERSION_STRING and VERSION_REVISION, removes duplication of flags
in the Xcode project file
This commit is contained in:
parent
36a006b6ce
commit
a3d3d1f33d
|
@ -14,6 +14,7 @@ gtk/po/*.mo
|
|||
gtk/transmission-gtk
|
||||
libtransmission/*.a
|
||||
libtransmission/.depend
|
||||
libtransmission/version.h
|
||||
macosx/English.lproj/*~.nib
|
||||
macosx/Info.plist
|
||||
macosx/Transmission.app
|
||||
|
|
14
Makefile
14
Makefile
|
@ -99,8 +99,18 @@ package-release:
|
|||
|
||||
endif
|
||||
|
||||
Makefile.version: .version
|
||||
.version: .version1 .version2
|
||||
|
||||
.version:
|
||||
.version1:
|
||||
@echo "Checking SVN revision..."
|
||||
@./version.sh
|
||||
|
||||
.version2:
|
||||
@$(RM) libtransmission/version.h
|
||||
@( echo "#define VERSION_MAJOR $(VERSION_MAJOR)" && \
|
||||
echo "#define VERSION_MINOR $(VERSION_MINOR)" && \
|
||||
echo "#define VERSION_STRING \"$(VERSION_STRING)\"" && \
|
||||
echo "#define VERSION_REVISION $(VERSION_REVISION)" ) > \
|
||||
libtransmission/version.h
|
||||
|
||||
Makefile.version: .version1
|
||||
|
|
|
@ -2,13 +2,10 @@
|
|||
|
||||
VERSION_MAJOR = 0
|
||||
VERSION_MINOR = 5
|
||||
VERSION_STRING = 0.6-svn-r$(SVN_REVISION)
|
||||
VERSION_STRING = 0.6-svn
|
||||
|
||||
TMPCFLAGS = -g -Wall -W -O3 -funroll-loops -D_FILE_OFFSET_BITS=64 \
|
||||
-D_LARGEFILE_SOURCE -D_GNU_SOURCE \
|
||||
-DVERSION_MAJOR=$(VERSION_MAJOR) \
|
||||
-DVERSION_MINOR=$(VERSION_MINOR) \
|
||||
-DVERSION_STRING=\"$(VERSION_STRING)\" \
|
||||
-DSYS_$(shell echo $(SYSTEM) | tr a-z A-Z)
|
||||
TMPCXXFLAGS = $(TMPCFLAGS)
|
||||
TMPLDFLAGS =
|
||||
|
|
|
@ -637,14 +637,10 @@
|
|||
"-D_FILE_OFFSET_BITS=64",
|
||||
"-D_LARGEFILE_SOURCE",
|
||||
"-D_GNU_SOURCE",
|
||||
"-DVERSION_MAJOR=0",
|
||||
"-DVERSION_MINOR=5",
|
||||
"$(OTHER_CFLAGS_QUOTED_1)",
|
||||
"-DSYS_DARWIN",
|
||||
"-DHAVE_OPENSSL",
|
||||
"-D__TRANSMISSION__",
|
||||
);
|
||||
OTHER_CFLAGS_QUOTED_1 = "-DVERSION_STRING=\\\"0.6-svn\\\"";
|
||||
PRODUCT_NAME = transmission;
|
||||
};
|
||||
name = Debug;
|
||||
|
@ -658,14 +654,10 @@
|
|||
"-D_FILE_OFFSET_BITS=64",
|
||||
"-D_LARGEFILE_SOURCE",
|
||||
"-D_GNU_SOURCE",
|
||||
"-DVERSION_MAJOR=0",
|
||||
"-DVERSION_MINOR=5",
|
||||
"$(OTHER_CFLAGS_QUOTED_1)",
|
||||
"-DSYS_DARWIN",
|
||||
"-DHAVE_OPENSSL",
|
||||
"-D__TRANSMISSION__",
|
||||
);
|
||||
OTHER_CFLAGS_QUOTED_1 = "-DVERSION_STRING=\\\"0.6-svn\\\"";
|
||||
PRODUCT_NAME = transmissioncli;
|
||||
};
|
||||
name = Debug;
|
||||
|
|
|
@ -68,8 +68,8 @@ int main( int argc, char ** argv )
|
|||
tr_torrent_t * tor;
|
||||
tr_stat_t * s;
|
||||
|
||||
printf( "Transmission %s - http://transmission.m0k.org/\n\n",
|
||||
VERSION_STRING );
|
||||
printf( "Transmission %s (%d) - http://transmission.m0k.org/\n\n",
|
||||
VERSION_STRING, VERSION_REVISION );
|
||||
|
||||
/* Get options */
|
||||
if( parseCommandLine( argc, argv ) )
|
||||
|
|
|
@ -29,6 +29,8 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "version.h"
|
||||
|
||||
#include <inttypes.h>
|
||||
#ifndef PRIu64
|
||||
# define PRIu64 "lld"
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
<key>CFBundleSignature</key>
|
||||
<string>TR##</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>%%VERSION%%</string>
|
||||
<string>%%BUNDLE_VERSION%%</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>%%VERSION%%</string>
|
||||
<string>%%SHORT_VERSION_STRING%%</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainMenu</string>
|
||||
<key>NSPrincipalClass</key>
|
||||
|
|
|
@ -6,7 +6,8 @@ include ../Makefile.common
|
|||
|
||||
Info.plist: Info.plist.in ../Makefile.version ../Makefile.common
|
||||
$(RM) $@
|
||||
sed "s/%%VERSION%%/$(VERSION_STRING)/g" < $< > $@
|
||||
sed -e "s/%%BUNDLE_VERSION%%/$(VERSION_REVISION)/g" \
|
||||
-e "s/%%SHORT_VERSION_STRING%%/$(VERSION_STRING)/g" < $< > $@
|
||||
|
||||
clean:
|
||||
$(RM) Info.plist
|
||||
|
|
|
@ -16,6 +16,6 @@ for pattern in '*.[chm]' '*.cpp' '*.po' 'Makefile*' 'configure'; do
|
|||
done
|
||||
|
||||
rm -f Makefile.version
|
||||
echo "SVN_REVISION = $REVMAX" > Makefile.version
|
||||
echo "VERSION_REVISION = $REVMAX" > Makefile.version
|
||||
|
||||
exit 0
|
||||
|
|
Loading…
Reference in New Issue