diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-02-07 11:14:52 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-02-07 23:03:03 +0000 |
| commit | f966980937abd4899a9c43329041bb00798ab18e (patch) | |
| tree | e31210350fa778765b6d2d4711fc5cc6c27f2aae /Makefile.nmake | |
| parent | 217f9fd0d9f2d6a9084da3fc945cce001414eea3 (diff) | |
Replace "svn" with "git" all over the place.
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate.
Rename "svnversion.h" to "version.h" as Evan suggested. Update some
URLs. In make-version.pl, make sure we don't set an improper upstream
branch name. Use the number of commits + short hash from `git describe`
for package names by default.
Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96
Reviewed-on: https://code.wireshark.org/review/139
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 99ce773981..09662e9cd8 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -537,15 +537,18 @@ QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS) # # Build the version string # -!IF EXIST(".svn/wc.db") -SVNENTRIES = .svn/wc.db +# XXX - Makefile.am uses FORCE for this. +!IF EXIST(".git/index") +GITINDEX = .git/index +!ELSE IF EXIST(".svn/wc.db") +GITINDEX = .svn/wc.db !ELSE IF EXIST(".svn/entries") -SVNENTRIES = .svn/entries +GITINDEX = .svn/entries !ELSE -SVNENTRIES = +GITINDEX = !ENDIF -svnversion.h: $(SVNENTRIES) - rm -f svnversion.h +version.h: $(GITINDEX) + rm -f version.h $(PERL) make-version.pl @@ -557,9 +560,9 @@ text2pcap-scanner.obj : text2pcap-scanner.c # # The following targets will rebuild their respective objs -# if and when svnversion.h should change. +# if and when version.h should change. # -text2pcap.obj mergecap.obj capinfos.obj captype.obj editcap.obj reordercap.obj version_info.obj: svnversion.h +text2pcap.obj mergecap.obj capinfos.obj captype.obj editcap.obj reordercap.obj version_info.obj: version.h clean-local: @@ -808,12 +811,12 @@ codecs:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. -ui:: help config.h svnversion.h doxygen +ui:: help config.h version.h doxygen cd ui $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib cd .. -gtk:: help config.h svnversion.h doxygen +gtk:: help config.h version.h doxygen cd ui/gtk $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib cd ../.. @@ -821,7 +824,7 @@ gtk:: help config.h svnversion.h doxygen # The Visual C++ static analyzer currently fails with error C2171 # when compiling summary_dialog.cpp. If/when this ever gets fixed # we can remove the ENABLE_CODE_ANALYSIS check. -qt:: help config.h svnversion.h doxygen +qt:: help config.h version.h doxygen !IFDEF QT5_BASE_DIR cd ui/qt $(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro @@ -838,7 +841,7 @@ win32:: $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib cd ../.. -cli:: help config.h svnversion.h doxygen +cli:: help config.h version.h doxygen cd ui/cli $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libcliui.lib cd ../.. @@ -935,7 +938,7 @@ check_libs: # If $(CHECK_TAG) is non-null then checktag failed; Exit with an error message. (See beginning of this Makefile). # Otherwise do detailed library package files verification only if Makefile.nmake or config.make have been updated # (or dummy file doesn't exist because of 'make clean' or whatever). -# Note that the creation/modification time of a file after an svn update of that file +# Note that the creation/modification time of a file after a git pull of that file # is the time of the update (not the time of the file in the repository). # touch is only called if libverify succeeds. $(LIBS_CHECK): $(CHECK_TAG) config.nmake Makefile.nmake |