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>

1 files changed, 20 insertions, 19 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6dc55cb89..a7aeeaa201 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -781,17 +781,17 @@ link_directories(
 )
 
 ADD_CUSTOM_TARGET(
-	svnversion ALL
+	gitversion ALL
 	COMMAND ${PERL_EXECUTABLE}
 		${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 		${CMAKE_CURRENT_SOURCE_DIR}
 	DEPENDS
 		${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 )
-set_target_properties(svnversion PROPERTIES FOLDER "Auxiliary")
+set_target_properties(gitversion PROPERTIES FOLDER "Auxiliary")
 
 ADD_CUSTOM_COMMAND(
-	OUTPUT	svnversion.h
+	OUTPUT	version.h
 	COMMAND ${PERL_EXECUTABLE}
 		${CMAKE_CURRENT_SOURCE_DIR}/make-version.pl
 		${CMAKE_CURRENT_SOURCE_DIR}
@@ -826,7 +826,7 @@ set(SHARK_COMMON_SRC
 	cfutils.c
 	clopts_common.c
 	frame_tvbuff.c
-	svnversion.h
+	version.h
 	sync_pipe_write.c
 	version_info.c
 )
@@ -980,7 +980,7 @@ if(BUILD_wireshark AND GTK_FOUND)
 	# qtshark and wireshark share wireshark_FILES
 
 	add_executable(wireshark ${wireshark_FILES})
-	add_dependencies(wireshark svnversion)
+	add_dependencies(wireshark gitversion)
 	set_target_properties(wireshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(wireshark PROPERTIES FOLDER "Executables")
 	target_link_libraries(wireshark ${wireshark_LIBS})
@@ -1003,7 +1003,7 @@ if(BUILD_qtshark AND QT_FOUND)
 	# qtshark and wireshark share wireshark_FILES
 
 	add_executable(qtshark ${wireshark_FILES})
-	add_dependencies(qtshark svnversion)
+	add_dependencies(qtshark gitversion)
 	set_target_properties(qtshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(qtshark PROPERTIES FOLDER "Executables")
 	target_link_libraries(qtshark ${qtshark_LIBS})
@@ -1031,7 +1031,7 @@ if(BUILD_tshark)
 		${SHARK_COMMON_SRC}
 	)
 	add_executable(tshark ${tshark_FILES})
-	add_dependencies(tshark svnversion)
+	add_dependencies(tshark gitversion)
 	set_target_properties(tshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(tshark PROPERTIES FOLDER "Executables")
 	target_link_libraries(tshark ${tshark_LIBS})
@@ -1053,7 +1053,7 @@ if(BUILD_tfshark)
 		${SHARK_COMMON_SRC}
 	)
 	add_executable(tfshark ${tfshark_FILES})
-	add_dependencies(tfshark svnversion)
+	add_dependencies(tfshark gitversion)
 	set_target_properties(tfshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(tfshark PROPERTIES FOLDER "Executables")
 	target_link_libraries(tfshark ${tfshark_LIBS})
@@ -1072,7 +1072,7 @@ if(BUILD_rawshark AND PCAP_FOUND)
 		ui/util.c
 	)
 	add_executable(rawshark ${rawshark_FILES})
-	add_dependencies(rawshark svnversion)
+	add_dependencies(rawshark gitversion)
 	set_target_properties(rawshark PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(rawshark PROPERTIES FOLDER "Executables")
 	target_link_libraries(rawshark ${rawshark_LIBS})
@@ -1133,7 +1133,7 @@ if(BUILD_text2pcap)
 		text2pcap-scanner.l
 	)
 	add_executable(text2pcap ${text2pcap_FILES})
-	add_dependencies(text2pcap svnversion)
+	add_dependencies(text2pcap gitversion)
 	set_target_properties(text2pcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(text2pcap PROPERTIES FOLDER "Executables")
 	target_link_libraries(text2pcap ${text2pcap_LIBS})
@@ -1148,10 +1148,10 @@ if(BUILD_mergecap)
 	)
 	set(mergecap_FILES
 		mergecap.c
-		svnversion.h
+		version.h
 	)
 	add_executable(mergecap ${mergecap_FILES})
-	add_dependencies(mergecap svnversion)
+	add_dependencies(mergecap gitversion)
 	set_target_properties(mergecap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(mergecap PROPERTIES FOLDER "Executables")
 	target_link_libraries(mergecap ${mergecap_LIBS})
@@ -1166,10 +1166,10 @@ if(BUILD_reordercap)
 	)
 	set(reordercap_FILES
 		reordercap.c
-		svnversion.h
+		version.h
 	)
 	add_executable(reordercap ${reordercap_FILES})
-	add_dependencies(reordercap svnversion)
+	add_dependencies(reordercap gitversion)
 	set_target_properties(reordercap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(reordercap PROPERTIES FOLDER "Executables")
 	target_link_libraries(reordercap ${reordercap_LIBS})
@@ -1188,7 +1188,7 @@ if(BUILD_capinfos)
 		capinfos.c
 	)
 	add_executable(capinfos ${capinfos_FILES})
-	add_dependencies(capinfos svnversion)
+	add_dependencies(capinfos gitversion)
 	set_target_properties(capinfos PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(capinfos PROPERTIES FOLDER "Executables")
 	target_link_libraries(capinfos ${capinfos_LIBS})
@@ -1206,7 +1206,7 @@ if(BUILD_captype)
 		captype.c
 	)
 	add_executable(captype ${captype_FILES})
-	add_dependencies(captype svnversion)
+	add_dependencies(captype gitversion)
 	set_target_properties(captype PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(captype PROPERTIES FOLDER "Executables")
 	target_link_libraries(captype ${captype_LIBS})
@@ -1223,7 +1223,7 @@ if(BUILD_editcap)
 		editcap.c
 	)
 	add_executable(editcap ${editcap_FILES})
-	add_dependencies(editcap svnversion)
+	add_dependencies(editcap gitversion)
 	set_target_properties(editcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(editcap PROPERTIES FOLDER "Executables")
 	target_link_libraries(editcap ${editcap_LIBS})
@@ -1245,7 +1245,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		${NL_LIBRARIES}
 	)
 	set(dumpcap_FILES
-		svnversion.h
+		version.h
 		capture_opts.c
 		capture-pcap-util.c
 		capture_stop_conditions.c
@@ -1261,7 +1261,7 @@ if(BUILD_dumpcap AND PCAP_FOUND)
 		${PLATFORM_PCAP_SRC}
 	)
 	add_executable(dumpcap ${dumpcap_FILES})
-	add_dependencies(dumpcap svnversion)
+	add_dependencies(dumpcap gitversion)
 	set_target_properties(dumpcap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}")
 	set_target_properties(dumpcap PROPERTIES FOLDER "Executables")
 	target_link_libraries(dumpcap ${dumpcap_LIBS})
@@ -1432,6 +1432,7 @@ install(
 		WORLD_EXECUTE WORLD_READ
 	DESTINATION
 		${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}
+	PATTERN ".git" EXCLUDE
 	PATTERN ".svn" EXCLUDE
 	PATTERN "Makefile.*" EXCLUDE
 	PATTERN "faq.py" EXCLUDE