CMake build system for git

To make this a little less awkward, the Git for Windows project offers the vs/master branch which has a full Visual Studio solution generated and committed. This branch can therefore be used to tinker with Git in Visual Studio _without_ having to download the full Git for Windows SDK. Unfortunatly, that branch is auto-generated from Git for Windows' master. If a developer wants to tinker, say, with pu, they are out of luck.

CMake was invented to make this sort of problem go away, by providing a more standardized, cross-platform way to configure builds.

With a working support CMake, developers on Windows need only install CMake, configure their build, load the generated Visual Studio solution and immediately start modifying the code and build their own version of Git. Likewise, developers on other platforms can use the convenient GUI tools provided by CMake to configure their build.

So let's start building CMake support for Git.

This is only the first step, and to make it easier to review, it only allows for configuring builds on the platform that is easiest to configure for: Linux.

The CMake script checks whether the headers are present(eg. libgen.h), whether the functions are present(eg. memmem), whether the funtions work properly (eg. snprintf) and generate the required compile definitions for the platform. The script also searches for the required libraries, if it fails to find the required libraries the respective executables won't be built.(eg. If libcurl is not found then git-remote-http won't be built). This will help building Git easier.

With a CMake script an out of source build of git is possible resulting in a clean source tree.

Note: earlier endeavors on the Git mailing list to introduce CMake ended up in dead water. The primary reason for that was that reviewers _expected_ CMake support to fall out of maintenance, unless the contributor would promise to keep an eye on keeping CMake support up to date. However, in the meantime, support for automated testing has been introduced in Git's source code, and a later patch will modify the (still experimental) GitHub workflow to continually verify that CMake support is still complete. That will make maintenance reasonably easy.

Note: this patch asks for the minimum version v3.14 of CMake (which is not all that old as of time of writing) because that is the first

version to offer a platform-independent way to generate hardlinks as part of the build. This is needed to generate all those hardlinks for the built-in commands of Git.

Instructions to run CMake:

cmake relative-path-to-srcdir -DCMAKE_BUILD_TYPE=Release

Possible build configurations(-DCMAKE_BUILD_TYPE) with corresponding compiler flags
Debug : -g
Release: -O3

RelWithDebInfo : -O2 -g
MinSizeRel : -Os
empty(default) :

NOTE: -DCMAKE_BUILD_TYPE is optional

This process generates a Makefile.
Then run make to build Git.

NOTE: By default CMake uses Makefile as the build tool on Linux, to use another tool say ninja add this to the command line when configuring. -G Ninja

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 528 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 528 insertions(+)
 create mode 100644 CMakeLists.txt

CMakeLists.txt new file +0 -0

new file mode 100644
index 00000000000..73703bd321f

CMakeLists.txt new file +6 -0

+
+project(git
+	VERSION ${git_version}
+	LANGUAGES C)
+
+

CMakeLists.txt new file +6 -0

+
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+if(CURL_FOUND)
+	include_directories(SYSTEM ${CURL_INCLUDE_DIRS})
+endif()
+if(EXPAT_FOUND)

CMakeLists.txt new file +16 -0

+
+#default behaviour
+include_directories(${CMAKE_SOURCE_DIR})
+add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
+add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
+			SHA1DC_INIT_SAFE_HASH_DEFAULT=0
+			SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
+			SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
+list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
+
+
+add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
+			ETC_GITATTRIBUTES="etc/gitattributes"
+			ETC_GITCONFIG="etc/gitconfig"
+			GIT_EXEC_PATH="libexec/git-core"

CMakeLists.txt new file +12 -0

+list(APPEND compat_SOURCES unix-socket.c)
+
+#header checks
+check_include_file(libgen.h HAVE_LIBGEN_H)
+if(NOT HAVE_LIBGEN_H)
+	add_compile_definitions(NO_LIBGEN_H)
+	list(APPEND compat_SOURCES compat/basename.c)
+endif()
+
+check_include_file(sys/sysinfo.h HAVE_SYSINFO)
+if(HAVE_SYSINFO)
+	add_compile_definitions(HAVE_SYSINFO)

CMakeLists.txt new file +12 -0

+}"
+HAVE_ALLOCA_H)
+if(HAVE_ALLOCA_H)
+	add_compile_definitions(HAVE_ALLOCA_H)
+endif()
+
+check_include_file(strings.h HAVE_STRINGS_H)
+if(HAVE_STRINGS_H)
+	add_compile_definitions(HAVE_STRINGS_H)
+endif()
+
+check_include_file(sys/select.h HAVE_SYS_SELECT_H)

CMakeLists.txt new file +392 -0

+if(NOT HAVE_POLL_H)
+	add_compile_definitions(NO_POLL_H)
+endif()
+
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+if(NOT HAVE_INTTYPES_H)
+	add_compile_definitions(NO_INTTYPES_H)
+endif()
+
+check_include_file(paths.h HAVE_PATHS_H)
+if(HAVE_PATHS_H)
+	add_compile_definitions(HAVE_PATHS_H)
+endif()
+
+#function checks
+set(function_checks
+	strcasestr memmem strlcpy strtoimax strtoumax strtoull
+	setenv  mkdtemp poll pread  memmem unsetenv hstrerror)
+
+foreach(f ${function_checks})
+	string(TOUPPER ${f} uf)
+	check_function_exists(${f} HAVE_${uf})
+	if(NOT HAVE_${uf})
+		add_compile_definitions(NO_${uf})
+	endif()
+endforeach()
+
+if(NOT HAVE_POLL_H OR NOT HAVE_SYS_POLL_H OR NOT HAVE_POLL)
+	include_directories(compat/poll)
+	add_compile_definitions(NO_POLL)
+	list(APPEND compat_SOURCES compat/poll/poll.c)
+endif()
+
+if(NOT HAVE_STRCASESTR)
+	list(APPEND compat_SOURCES compat/strcasestr.c)
+endif()
+
+if(NOT HAVE_STRLCPY)
+	list(APPEND compat_SOURCES compat/strlcpy.c)
+endif()
+
+if(NOT HAVE_STRTOUMAX)
+	list(APPEND compat_SOURCES compat/strtoumax.c compat/strtoimax.c)
+endif()
+
+if(NOT HAVE_SETENV)
+	list(APPEND compat_SOURCES compat/setenv.c)
+endif()
+
+if(NOT HAVE_MKDTEMP)
+	list(APPEND compat_SOURCES compat/mkdtemp.c)
+endif()
+
+if(NOT HAVE_PREAD)
+	list(APPEND compat_SOURCES compat/pread.c)
+endif()
+
+if(NOT HAVE_MEMMEM)
+	list(APPEND compat_SOURCES compat/memmem.c)
+endif()
+
+if(NOT WIN32)
+	if(NOT HAVE_UNSETENV)
+		list(APPEND compat_SOURCES compat/unsetenv.c)
+	endif()
+
+	if(NOT HAVE_HSTRERROR)
+		list(APPEND compat_SOURCES compat/hstrerror.c)
+	endif()
+endif()
+
+check_function_exists(getdelim HAVE_GETDELIM)
+if(HAVE_GETDELIM)
+	add_compile_definitions(HAVE_GETDELIM)
+endif()
+
+check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+check_symbol_exists(CLOCK_MONOTONIC "time.h" HAVE_CLOCK_MONOTONIC)
+if(HAVE_CLOCK_GETTIME)
+	add_compile_definitions(HAVE_CLOCK_GETTIME)
+endif()
+if(HAVE_CLOCK_MONOTONIC)
+	add_compile_definitions(HAVE_CLOCK_MONOTONIC)
+endif()
+
+
+#compile checks
+check_c_source_runs("
+#include<stdio.h>
+#include<stdarg.h>
+#include<string.h>
+#include<stdlib.h>
+int test_vsnprintf(char *str, size_t maxsize, const char *format, ...)
+{
+	int ret;
+	va_list ap;
+
+	va_start(ap, format);
+	ret = vsnprintf(str, maxsize, format, ap);
+	va_end(ap);
+	return ret;
+}
+
+int
+main ()
+{
+	char buf[6];
+	if (test_vsnprintf(buf, 3, \"%s\", \"12345\") != 5
+		|| strcmp(buf, \"12\")) return 1;
+	if (snprintf(buf, 3, \"%s\", \"12345\") != 5
+		|| strcmp(buf, \"12\")) return 1;
+
+	return 0;
+}"
+SNPRINTF_OK)
+if(NOT SNPRINTF_OK)
+	add_compile_definitions(SNPRINTF_RETURNS_BOGUS)
+	list(APPEND compat_SOURCES compat/snprintf.c)
+endif()
+
+check_c_source_runs("
+#include<stdio.h>
+int
+main ()
+{
+	FILE *f = fopen(\".\", \"r\");
+	return f != NULL;
+
+	return 0;
+}"
+FREAD_READS_DIRECTORIES_NO)
+if(NOT FREAD_READS_DIRECTORIES_NO)
+	add_compile_definitions(FREAD_READS_DIRECTORIES)
+	list(APPEND compat_SOURCES compat/fopen.c)
+endif()
+
+check_c_source_compiles("
+#include <regex.h>
+#ifndef REG_STARTEND
+#error oops we dont have it
+#endif
+int main(){return 0;}"
+HAVE_REGEX)
+if(NOT HAVE_REGEX)
+	include_directories(compat/regex )
+	list(APPEND compat_SOURCES compat/regex/regex.c )
+	add_compile_definitions(NO_REGEX NO_MBSUPPORT GAWK)
+endif()
+
+
+check_c_source_compiles("
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+int
+main ()
+{
+	int val, mib[2];
+	size_t len;
+
+	mib[0] = CTL_HW;
+	mib[1] = 1;
+	len = sizeof(val);
+	return sysctl(mib, 2, &val, &len, NULL, 0) ? 1 : 0;
+
+	return 0;
+}"
+HAVE_BSD_SYSCTL)
+if(HAVE_BSD_SYSCTL)
+	add_compile_definitions(HAVE_BSD_SYSCTL)
+endif()
+
+#programs
+set(PROGRAMS_BUILT
+	git git-bugreport git-credential-store git-daemon git-fast-import git-http-backend git-sh-i18n--envsubst
+	git-shell git-remote-testsvn git-credential-cache git-credential-cache--daemon)
+
+if(NOT CURL_FOUND)
+	list(APPEND excluded_progs git-http-fetch git-http-push)
+	add_compile_definitions(NO_CURL)
+	message(WARNING "git-http-push and git-http-fetch will not be built")
+else()
+	list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http)
+	if(CURL_VERSION_STRING VERSION_GREATER_EQUAL 7.34.0)
+		add_compile_definitions(USE_CURL_FOR_IMAP_SEND)
+	endif()
+endif()
+
+if(NOT EXPAT_FOUND)
+	list(APPEND excluded_progs git-http-push)
+	add_compile_definitions(NO_EXPAT)
+else()
+	list(APPEND PROGRAMS_BUILT git-http-push)
+	if(EXPAT_VERSION_STRING VERSION_LESS_EQUAL 1.2)
+		add_compile_definitions(EXPAT_NEEDS_XMLPARSE_H)
+	endif()
+endif()
+
+list(REMOVE_DUPLICATES excluded_progs)
+list(REMOVE_DUPLICATES PROGRAMS_BUILT)
+
+
+foreach(p ${excluded_progs})
+	list(APPEND EXCLUSION_PROGS --exclude-program ${p} )
+endforeach()
+
+#for comparing null values
+list(APPEND EXCLUSION_PROGS empty)
+set(EXCLUSION_PROGS_CACHE ${EXCLUSION_PROGS} CACHE STRING "Programs not built" FORCE)
+
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/command-list.h OR NOT EXCLUSION_PROGS_CACHE STREQUAL EXCLUSION_PROGS)
+	list(REMOVE_ITEM EXCLUSION_PROGS empty)
+	message("Generating command-list.h")
+	execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-cmdlist.sh ${EXCLUSION_PROGS} command-list.txt
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			OUTPUT_FILE ${CMAKE_SOURCE_DIR}/command-list.h)
+endif()
+
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/config-list.h)
+	message("Generating config-list.h")
+	execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-configlist.sh
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			OUTPUT_FILE ${CMAKE_SOURCE_DIR}/config-list.h)
+endif()
+
+
+#build
+set(libgit_SOURCES
+	abspath.c add-interactive.c add-patch.c advice.c alias.c
+	alloc.c apply.c archive.c archive-tar.c archive-zip.c argv-array.c
+	attr.c base85.c bisect.c blame.c blob.c bloom.c branch.c bulk-checkin.c
+	bundle.c cache-tree.c chdir-notify.c checkout.c color.c column.c
+	combine-diff.c commit.c commit-graph.c commit-reach.c compat/obstack.c
+	compat/terminal.c config.c connect.c connected.c convert.c copy.c credential.c
+	csum-file.c ctype.c date.c decorate.c delta-islands.c diffcore-break.c
+	diffcore-delta.c diffcore-order.c diffcore-pickaxe.c diffcore-rename.c
+	diff-delta.c diff-lib.c diff-no-index.c diff.c dir.c dir-iterator.c editor.c
+	entry.c environment.c ewah/bitmap.c ewah/ewah_bitmap.c ewah/ewah_io.c
+	ewah/ewah_rlw.c exec-cmd.c fetch-negotiator.c fetch-pack.c fmt-merge-msg.c fsck.c fsmonitor.c
+	gettext.c gpg-interface.c graph.c grep.c hashmap.c linear-assignment.c help.c hex.c
+	ident.c interdiff.c json-writer.c kwset.c levenshtein.c line-log.c line-range.c list-objects.c
+	list-objects-filter.c list-objects-filter-options.c ll-merge.c lockfile.c
+	log-tree.c ls-refs.c mailinfo.c mailmap.c match-trees.c mem-pool.c merge.c merge-blobs.c
+	merge-recursive.c mergesort.c midx.c name-hash.c negotiator/default.c
+	negotiator/skipping.c notes.c notes-cache.c notes-merge.c notes-utils.c object.c oidmap.c
+	oidset.c oid-array.c packfile.c pack-bitmap.c pack-bitmap-write.c pack-check.c pack-objects.c
+	pack-revindex.c pack-write.c pager.c parse-options.c parse-options-cb.c patch-delta.c
+	patch-ids.c path.c pathspec.c pkt-line.c preload-index.c pretty.c prio-queue.c progress.c
+	promisor-remote.c prompt.c protocol.c prune-packed.c quote.c range-diff.c reachable.c read-cache.c rebase.c
+	rebase-interactive.c reflog-walk.c refs.c refs/files-backend.c refs/iterator.c
+	refs/packed-backend.c refs/ref-cache.c refspec.c ref-filter.c remote.c replace-object.c
+	repo-settings.c repository.c rerere.c reset.c resolve-undo.c revision.c run-command.c
+	send-pack.c sequencer.c serve.c server-info.c setup.c sha1-lookup.c
+	sha1-file.c sha1-name.c shallow.c sideband.c sigchain.c split-index.c
+	stable-qsort.c strbuf.c streaming.c string-list.c submodule.c submodule-config.c
+	sub-process.c symlinks.c tag.c tempfile.c thread-utils.c tmp-objdir.c
+	trace.c trace2.c trace2/tr2_cfg.c trace2/tr2_cmd_name.c trace2/tr2_dst.c
+	trace2/tr2_sid.c trace2/tr2_sysenv.c trace2/tr2_tbuf.c trace2/tr2_tgt_event.c
+	trace2/tr2_tgt_normal.c trace2/tr2_tgt_perf.c trace2/tr2_tls.c trailer.c transport.c
+	transport-helper.c tree-diff.c tree.c tree-walk.c unpack-trees.c upload-pack.c url.c
+	urlmatch.c usage.c userdiff.c utf8.c varint.c version.c versioncmp.c walker.c wildmatch.c
+	worktree.c wrapper.c write-or-die.c ws.c wt-status.c xdiff-interface.c
+	zlib.c)
+
+add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
+
+set(libxdiff_SOURCES
+	xdiff/xdiffi.c xdiff/xprepare.c xdiff/xutils.c xdiff/xemit.c
+	xdiff/xmerge.c xdiff/xpatience.c xdiff/xhistogram.c)
+add_library(xdiff STATIC ${libxdiff_SOURCES})
+
+set(libvcs-svn_SOURCES
+	vcs-svn/line_buffer.c vcs-svn/sliding_window.c vcs-svn/fast_export.c
+	vcs-svn/svndiff.c vcs-svn/svndump.c)
+add_library(vcs-svn STATIC ${libvcs-svn_SOURCES})
+
+#link all required libraries to common-main
+add_library(common-main OBJECT common-main.c)
+target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES} pthread rt)
+if(Intl_FOUND)
+	target_link_libraries(common-main ${Intl_LIBRARIES})
+endif()
+if(Iconv_FOUND)
+	target_link_libraries(common-main ${Iconv_LIBRARIES})
+endif()
+
+
+set(git_SOURCES
+	builtin/add.c builtin/am.c builtin/annotate.c builtin/apply.c
+	builtin/archive.c builtin/bisect--helper.c builtin/blame.c
+	builtin/branch.c builtin/bundle.c builtin/cat-file.c builtin/check-attr.c
+	builtin/check-ignore.c builtin/check-mailmap.c builtin/check-ref-format.c
+	builtin/checkout-index.c builtin/checkout.c builtin/clean.c
+	builtin/clone.c builtin/column.c builtin/commit-tree.c
+	builtin/commit.c builtin/commit-graph.c builtin/config.c
+	builtin/count-objects.c builtin/credential.c builtin/describe.c
+	builtin/diff-files.c builtin/diff-index.c builtin/diff-tree.c
+	builtin/diff.c builtin/difftool.c builtin/env--helper.c
+	builtin/fast-export.c builtin/fetch-pack.c builtin/fetch.c builtin/fmt-merge-msg.c
+	builtin/for-each-ref.c builtin/fsck.c builtin/gc.c
+	builtin/get-tar-commit-id.c builtin/grep.c builtin/hash-object.c
+	builtin/help.c builtin/index-pack.c builtin/init-db.c
+	builtin/interpret-trailers.c builtin/log.c builtin/ls-files.c
+	builtin/ls-remote.c builtin/ls-tree.c builtin/mailinfo.c builtin/mailsplit.c
+	builtin/merge.c builtin/merge-base.c builtin/merge-file.c builtin/merge-index.c
+	builtin/merge-ours.c builtin/merge-recursive.c builtin/merge-tree.c
+	builtin/mktag.c builtin/mktree.c builtin/multi-pack-index.c builtin/mv.c
+	builtin/name-rev.c builtin/notes.c builtin/pack-objects.c builtin/pack-redundant.c
+	builtin/pack-refs.c builtin/patch-id.c builtin/prune-packed.c builtin/prune.c
+	builtin/pull.c builtin/push.c builtin/range-diff.c builtin/read-tree.c
+	builtin/rebase.c builtin/receive-pack.c builtin/reflog.c builtin/remote.c
+	builtin/remote-ext.c builtin/remote-fd.c builtin/repack.c builtin/replace.c
+	builtin/rerere.c builtin/reset.c builtin/rev-list.c builtin/rev-parse.c
+	builtin/revert.c builtin/rm.c builtin/send-pack.c builtin/shortlog.c
+	builtin/show-branch.c builtin/show-index.c builtin/show-ref.c
+	builtin/sparse-checkout.c builtin/stash.c builtin/stripspace.c
+	builtin/submodule--helper.c builtin/symbolic-ref.c builtin/tag.c
+	builtin/unpack-file.c builtin/unpack-objects.c builtin/update-index.c
+	builtin/update-ref.c builtin/update-server-info.c builtin/upload-archive.c
+	builtin/upload-pack.c builtin/var.c builtin/verify-commit.c builtin/verify-pack.c
+	builtin/verify-tag.c builtin/worktree.c builtin/write-tree.c)
+
+add_executable(git git.c ${git_SOURCES})
+target_link_libraries(git common-main )
+
+add_executable(git-bugreport bugreport.c)
+target_link_libraries(git-bugreport common-main)
+
+add_executable(git-credential-store credential-store.c)
+target_link_libraries(git-credential-store common-main)
+
+add_executable(git-daemon daemon.c)
+target_link_libraries(git-daemon common-main)
+
+add_executable(git-fast-import fast-import.c)
+target_link_libraries(git-fast-import common-main)
+
+add_executable(git-http-backend http-backend.c)
+target_link_libraries(git-http-backend common-main)
+
+add_executable(git-sh-i18n--envsubst sh-i18n--envsubst.c)
+target_link_libraries(git-sh-i18n--envsubst common-main)
+
+add_executable(git-shell shell.c)
+target_link_libraries(git-shell common-main)
+
+if(CURL_FOUND)
+	add_library(http_obj OBJECT http.c)
+
+	add_executable(git-imap-send imap-send.c)
+	target_link_libraries(git-imap-send http_obj common-main ${CURL_LIBRARIES})
+
+	add_executable(git-http-fetch http-walker.c http-fetch.c)
+	target_link_libraries(git-http-fetch http_obj common-main ${CURL_LIBRARIES})
+
+	add_executable(git-remote-http http-walker.c remote-curl.c)
+	target_link_libraries(git-remote-http http_obj common-main ${CURL_LIBRARIES} )
+
+	if(EXPAT_FOUND)
+		add_executable(git-http-push http-push.c)
+		target_link_libraries(git-http-push http_obj common-main ${CURL_LIBRARIES} ${EXPAT_LIBRARIES})
+	endif()
+endif()
+
+add_executable(git-remote-testsvn remote-testsvn.c)
+target_link_libraries(git-remote-testsvn common-main vcs-svn)
+
+add_executable(git-credential-cache credential-cache.c)
+target_link_libraries(git-credential-cache common-main)
+
+add_executable(git-credential-cache--daemon credential-cache--daemon.c)
+target_link_libraries(git-credential-cache--daemon common-main)
+
+
+set(git_builtin_extra
+	cherry cherry-pick format-patch fsck-objects
+	init merge-subtree restore show
+	stage status switch whatchanged)
+
+#Creating hardlinks
+foreach(s ${git_SOURCES} ${git_builtin_extra})
+	string(REPLACE "builtin/" "" s ${s})
+	string(REPLACE ".c" "" s ${s})
+	file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git git-${s})\n")
+	list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s})
+endforeach()
+
+if(CURL_FOUND)
+	set(remote_exes
+		git-remote-https git-remote-ftp git-remote-ftps)
+	foreach(s ${remote_exes})

On 2020-04-24 04:01:30+0000, Sibi Siddharthan via GitGitGadget <[email protected]> wrote:

Please excuse my hatred for CMake.

I guess it's my own fault for not learning how to write CMake properly, or is it too hard to write correct CMake?

Quoted 7 lines

To make this a little less awkward, the Git for Windows project offers the vs/master branch which has a full Visual Studio solution generated and committed. This branch can therefore be used to tinker with Git in Visual Studio _without_ having to download the full Git for Windows SDK. Unfortunatly, that branch is auto-generated from Git for Windows' master. If a developer wants to tinker, say, with pu, they are out of luck.

I thought:
make NDEBUG=1 DEVELOPER=1 vcxproj

was invented for this use case?

Quoted 2 lines

CMake was invented to make this sort of problem go away, by providing a more standardized, cross-platform way to configure builds.

There is something fun with that *cross* Is cmake able to cross-compile cmake by cmake now?

Quoted 5 lines

With a working support CMake, developers on Windows need only install CMake, configure their build, load the generated Visual Studio solution and immediately start modifying the code and build their own version of Git. Likewise, developers on other platforms can use the convenient GUI tools provided by CMake to configure their build.

OK, that's fine if it works for you.
Please don't drop support for autoconf and Makefile, though. (I haven't look into other patches)

Quoted 26 lines

So let's start building CMake support for Git.

This is only the first step, and to make it easier to review, it only allows for configuring builds on the platform that is easiest to configure for: Linux.

The CMake script checks whether the headers are present(eg. libgen.h), whether the functions are present(eg. memmem), whether the funtions work properly (eg. snprintf) and generate the required compile definitions for the platform. The script also searches for the required libraries, if it fails to find the required libraries the respective executables won't be built.(eg. If libcurl is not found then git-remote-http won't be built). This will help building Git easier.

With a CMake script an out of source build of git is possible resulting in a clean source tree.

Note: earlier endeavors on the Git mailing list to introduce CMake ended up in dead water. The primary reason for that was that reviewers _expected_ CMake support to fall out of maintenance, unless the contributor would promise to keep an eye on keeping CMake support up to date. However, in the meantime, support for automated testing has been introduced in Git's source code, and a later patch will modify the (still experimental) GitHub workflow to continually verify that CMake support is still complete. That will make maintenance reasonably easy.

Quoted 2 lines

Note: this patch asks for the minimum version v3.14 of CMake (which is not all that old as of time of writing) because that is the first

Debian Buster (current stable) ships v3.13.4, I think I don't need to mention old-stable of Debian (Stretch or Jessie).

Quoted 6 lines

version to offer a platform-independent way to generate hardlinks as part of the build. This is needed to generate all those hardlinks for the built-in commands of Git.

Instructions to run CMake:

Quoted 6 lines

cmake relative-path-to-srcdir -DCMAKE_BUILD_TYPE=Release

Possible build configurations(-DCMAKE_BUILD_TYPE) with corresponding compiler flags
Debug : -g
Release: -O3

IIRC, Linus and Junio used to said noone ever needs "-03"

Quoted 29 lines

RelWithDebInfo : -O2 -g
MinSizeRel : -Os
empty(default) :

NOTE: -DCMAKE_BUILD_TYPE is optional

This process generates a Makefile.
Then run make to build Git.

NOTE: By default CMake uses Makefile as the build tool on Linux, to use another tool say ninja add this to the command line when configuring. -G Ninja

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 528 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 528 insertions(+)
 create mode 100644 CMakeLists.txt

CMakeLists.txt new file +4 -0

new file mode 100644
index 00000000000..73703bd321f
@@ -0,0 +1,528 @@
+#
+#    Copyright (c) 2020 Sibi Siddharthan
+#
+

CMakeLists.txt line 10

Quoted 6 lines

CMakeLists.txt new file +6 -0

+cmake_minimum_required(VERSION 3.14)
+
+#Parse GIT-VERSION-GEN to get the version
+file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN git_version REGEX "DEF_VER=v(.*)")
+string(REPLACE "DEF_VER=v" "" git_version ${git_version})
+string(REPLACE ".GIT" ".0" git_version ${git_version})#for building from a snapshot

Does it work with e.g. 2.26.1?

Quoted 11 lines

CMakeLists.txt new file +11 -0

+
+project(git
+     VERSION ${git_version}
+     LANGUAGES C)
+
+
+include(CheckTypeSize)
+include(CheckCSourceRuns)
+include(CheckCSourceCompiles)
+include(CheckIncludeFile)
+include(CheckFunctionExists)

CMakeLists.txt line 26

Quoted 5 lines

CMakeLists.txt new file +5 -0

+include(CheckSymbolExists)
+include(CheckStructHasMember)
+
+find_package(ZLIB REQUIRED)
+find_package(CURL)

Right now, we should --with-zlib=/path/to/zlib/root Does this find_package support it?

CMakeLists.txt line 32

Quoted 7 lines

CMakeLists.txt new file +6 -0

+find_package(EXPAT)
+find_package(Iconv)
+find_package(Intl)
+
 
+if(NOT Intl_FOUND)
+     add_compile_definitions(NO_GETTEXT)

find_package(Gettext)?

CMakeLists.txt line 36

Quoted 4 lines

CMakeLists.txt new file +4 -0

+     if(NOT Iconv_FOUND)
+             add_compile_definitions(NO_ICONV)
+     endif()
+endif()

ICONV_OMITS_BOM?

Quoted 6 lines

CMakeLists.txt new file +6 -0

+
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+if(CURL_FOUND)
+     include_directories(SYSTEM ${CURL_INCLUDE_DIRS})
+endif()
+if(EXPAT_FOUND)

CMakeLists.txt line 52

Quoted 10 lines

CMakeLists.txt new file +10 -0

+     include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS})
+endif()
+if(Iconv_FOUND)
+     include_directories(SYSTEM ${Iconv_INCLUDE_DIRS})
+endif()
+if(Intl_FOUND)
+     include_directories(SYSTEM ${Intl_INCLUDE_DIRS})
+endif()
+
+find_program(SH_EXE sh)

We want to find usable sh, not just sh, no?

It's matter on Solaris, HP-UX

Quoted 22 lines

CMakeLists.txt new file +22 -0

+
+#default behaviour
+include_directories(${CMAKE_SOURCE_DIR})
+add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
+add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
+                     SHA1DC_INIT_SAFE_HASH_DEFAULT=0
+                     SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
+                     SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
+list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
+
+
+add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
+                     ETC_GITATTRIBUTES="etc/gitattributes"
+                     ETC_GITCONFIG="etc/gitconfig"
+                     GIT_EXEC_PATH="libexec/git-core"
+                     GIT_LOCALE_PATH="share/locale"
+                     GIT_MAN_PATH="share/man"
+                     GIT_INFO_PATH="share/info"
+                     GIT_HTML_PATH="share/doc/git-doc"
+                     DEFAULT_HELP_FORMAT="html"
+                     DEFAULT_GIT_TEMPLATE_DIR="share/git-core/templates"

CMakeLists.txt line 78

Quoted 4 lines

CMakeLists.txt new file +4 -0

+                     GIT_VERSION="${PROJECT_VERSION}.GIT"
+                     GIT_USER_AGENT="git/${PROJECT_VERSION}.GIT"
+                     BINDIR="bin"
+                     GIT_BUILT_FROM_COMMIT="")

I wish I could verify this.
Have you check this part on a default build system for a Linux distro, FreeBSD? For things started with "etc/"

CMakeLists.txt line 83

Quoted 5 lines

CMakeLists.txt new file +5 -0

+
+set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
+add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+
+add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )

/proc/self/exe is Linux only, no?

Quoted 16 lines

CMakeLists.txt new file +16 -0

+list(APPEND compat_SOURCES unix-socket.c)
+
+#header checks
+check_include_file(libgen.h HAVE_LIBGEN_H)
+if(NOT HAVE_LIBGEN_H)
+     add_compile_definitions(NO_LIBGEN_H)
+     list(APPEND compat_SOURCES compat/basename.c)
+endif()
+
+check_include_file(sys/sysinfo.h HAVE_SYSINFO)
+if(HAVE_SYSINFO)
+     add_compile_definitions(HAVE_SYSINFO)
+endif()
+
+check_c_source_compiles("
+#include <alloca.h>

CMakeLists.txt line 105

Quoted 6 lines

CMakeLists.txt new file +6 -0

+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+     if (p) return 0;
+     return 0;

All code path will return 0?

Quoted 12 lines

CMakeLists.txt new file +12 -0

+}"
+HAVE_ALLOCA_H)
+if(HAVE_ALLOCA_H)
+     add_compile_definitions(HAVE_ALLOCA_H)
+endif()
+
+check_include_file(strings.h HAVE_STRINGS_H)
+if(HAVE_STRINGS_H)
+     add_compile_definitions(HAVE_STRINGS_H)
+endif()
+
+check_include_file(sys/select.h HAVE_SYS_SELECT_H)

CMakeLists.txt line 127

Quoted 10 lines

CMakeLists.txt new file +10 -0

+if(NOT HAVE_SYS_SELECT_H)
+     add_compile_definitions(NO_SYS_SELECT_H)
+endif()
+
+check_include_file(sys/poll.h HAVE_SYS_POLL_H)
+if(NOT HAVE_SYS_POLL_H)
+     add_compile_definitions(NO_SYS_POLL_H)
+endif()
+
+check_include_file(poll.h HAVE_POLL_H)

POSIX defined poll.h instead of sys/poll.h

Quoted 392 lines

CMakeLists.txt new file +392 -0

+if(NOT HAVE_POLL_H)
+     add_compile_definitions(NO_POLL_H)
+endif()
+
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+if(NOT HAVE_INTTYPES_H)
+     add_compile_definitions(NO_INTTYPES_H)
+endif()
+
+check_include_file(paths.h HAVE_PATHS_H)
+if(HAVE_PATHS_H)
+     add_compile_definitions(HAVE_PATHS_H)
+endif()
+
+#function checks
+set(function_checks
+     strcasestr memmem strlcpy strtoimax strtoumax strtoull
+     setenv  mkdtemp poll pread  memmem unsetenv hstrerror)
+
+foreach(f ${function_checks})
+     string(TOUPPER ${f} uf)
+     check_function_exists(${f} HAVE_${uf})
+     if(NOT HAVE_${uf})
+             add_compile_definitions(NO_${uf})
+     endif()
+endforeach()
+
+if(NOT HAVE_POLL_H OR NOT HAVE_SYS_POLL_H OR NOT HAVE_POLL)
+     include_directories(compat/poll)
+     add_compile_definitions(NO_POLL)
+     list(APPEND compat_SOURCES compat/poll/poll.c)
+endif()
+
+if(NOT HAVE_STRCASESTR)
+     list(APPEND compat_SOURCES compat/strcasestr.c)
+endif()
+
+if(NOT HAVE_STRLCPY)
+     list(APPEND compat_SOURCES compat/strlcpy.c)
+endif()
+
+if(NOT HAVE_STRTOUMAX)
+     list(APPEND compat_SOURCES compat/strtoumax.c compat/strtoimax.c)
+endif()
+
+if(NOT HAVE_SETENV)
+     list(APPEND compat_SOURCES compat/setenv.c)
+endif()
+
+if(NOT HAVE_MKDTEMP)
+     list(APPEND compat_SOURCES compat/mkdtemp.c)
+endif()
+
+if(NOT HAVE_PREAD)
+     list(APPEND compat_SOURCES compat/pread.c)
+endif()
+
+if(NOT HAVE_MEMMEM)
+     list(APPEND compat_SOURCES compat/memmem.c)
+endif()
+
+if(NOT WIN32)
+     if(NOT HAVE_UNSETENV)
+             list(APPEND compat_SOURCES compat/unsetenv.c)
+     endif()
+
+     if(NOT HAVE_HSTRERROR)
+             list(APPEND compat_SOURCES compat/hstrerror.c)
+     endif()
+endif()
+
+check_function_exists(getdelim HAVE_GETDELIM)
+if(HAVE_GETDELIM)
+     add_compile_definitions(HAVE_GETDELIM)
+endif()
+
+check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+check_symbol_exists(CLOCK_MONOTONIC "time.h" HAVE_CLOCK_MONOTONIC)
+if(HAVE_CLOCK_GETTIME)
+     add_compile_definitions(HAVE_CLOCK_GETTIME)
+endif()
+if(HAVE_CLOCK_MONOTONIC)
+     add_compile_definitions(HAVE_CLOCK_MONOTONIC)
+endif()
+
+
+#compile checks
+check_c_source_runs("
+#include<stdio.h>
+#include<stdarg.h>
+#include<string.h>
+#include<stdlib.h>
+int test_vsnprintf(char *str, size_t maxsize, const char *format, ...)
+{
+     int ret;
+     va_list ap;
+
+     va_start(ap, format);
+     ret = vsnprintf(str, maxsize, format, ap);
+     va_end(ap);
+     return ret;
+}
+
+int
+main ()
+{
+     char buf[6];
+     if (test_vsnprintf(buf, 3, \"%s\", \"12345\") != 5
+             || strcmp(buf, \"12\")) return 1;
+     if (snprintf(buf, 3, \"%s\", \"12345\") != 5
+             || strcmp(buf, \"12\")) return 1;
+
+     return 0;
+}"
+SNPRINTF_OK)
+if(NOT SNPRINTF_OK)
+     add_compile_definitions(SNPRINTF_RETURNS_BOGUS)
+     list(APPEND compat_SOURCES compat/snprintf.c)
+endif()
+
+check_c_source_runs("
+#include<stdio.h>
+int
+main ()
+{
+     FILE *f = fopen(\".\", \"r\");
+     return f != NULL;
+
+     return 0;
+}"
+FREAD_READS_DIRECTORIES_NO)
+if(NOT FREAD_READS_DIRECTORIES_NO)
+     add_compile_definitions(FREAD_READS_DIRECTORIES)
+     list(APPEND compat_SOURCES compat/fopen.c)
+endif()
+
+check_c_source_compiles("
+#include <regex.h>
+#ifndef REG_STARTEND
+#error oops we dont have it
+#endif
+int main(){return 0;}"
+HAVE_REGEX)
+if(NOT HAVE_REGEX)
+     include_directories(compat/regex )
+     list(APPEND compat_SOURCES compat/regex/regex.c )
+     add_compile_definitions(NO_REGEX NO_MBSUPPORT GAWK)
+endif()
+
+
+check_c_source_compiles("
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+int
+main ()
+{
+     int val, mib[2];
+     size_t len;
+
+     mib[0] = CTL_HW;
+     mib[1] = 1;
+     len = sizeof(val);
+     return sysctl(mib, 2, &val, &len, NULL, 0) ? 1 : 0;
+
+     return 0;
+}"
+HAVE_BSD_SYSCTL)
+if(HAVE_BSD_SYSCTL)
+     add_compile_definitions(HAVE_BSD_SYSCTL)
+endif()
+
+#programs
+set(PROGRAMS_BUILT
+     git git-bugreport git-credential-store git-daemon git-fast-import git-http-backend git-sh-i18n--envsubst
+     git-shell git-remote-testsvn git-credential-cache git-credential-cache--daemon)
+
+if(NOT CURL_FOUND)
+     list(APPEND excluded_progs git-http-fetch git-http-push)
+     add_compile_definitions(NO_CURL)
+     message(WARNING "git-http-push and git-http-fetch will not be built")
+else()
+     list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http)
+     if(CURL_VERSION_STRING VERSION_GREATER_EQUAL 7.34.0)
+             add_compile_definitions(USE_CURL_FOR_IMAP_SEND)
+     endif()
+endif()
+
+if(NOT EXPAT_FOUND)
+     list(APPEND excluded_progs git-http-push)
+     add_compile_definitions(NO_EXPAT)
+else()
+     list(APPEND PROGRAMS_BUILT git-http-push)
+     if(EXPAT_VERSION_STRING VERSION_LESS_EQUAL 1.2)
+             add_compile_definitions(EXPAT_NEEDS_XMLPARSE_H)
+     endif()
+endif()
+
+list(REMOVE_DUPLICATES excluded_progs)
+list(REMOVE_DUPLICATES PROGRAMS_BUILT)
+
+
+foreach(p ${excluded_progs})
+     list(APPEND EXCLUSION_PROGS --exclude-program ${p} )
+endforeach()
+
+#for comparing null values
+list(APPEND EXCLUSION_PROGS empty)
+set(EXCLUSION_PROGS_CACHE ${EXCLUSION_PROGS} CACHE STRING "Programs not built" FORCE)
+
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/command-list.h OR NOT EXCLUSION_PROGS_CACHE STREQUAL EXCLUSION_PROGS)
+     list(REMOVE_ITEM EXCLUSION_PROGS empty)
+     message("Generating command-list.h")
+     execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-cmdlist.sh ${EXCLUSION_PROGS} command-list.txt
+                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                     OUTPUT_FILE ${CMAKE_SOURCE_DIR}/command-list.h)
+endif()
+
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/config-list.h)
+     message("Generating config-list.h")
+     execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-configlist.sh
+                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                     OUTPUT_FILE ${CMAKE_SOURCE_DIR}/config-list.h)
+endif()
+
+
+#build
+set(libgit_SOURCES
+     abspath.c add-interactive.c add-patch.c advice.c alias.c
+     alloc.c apply.c archive.c archive-tar.c archive-zip.c argv-array.c
+     attr.c base85.c bisect.c blame.c blob.c bloom.c branch.c bulk-checkin.c
+     bundle.c cache-tree.c chdir-notify.c checkout.c color.c column.c
+     combine-diff.c commit.c commit-graph.c commit-reach.c compat/obstack.c
+     compat/terminal.c config.c connect.c connected.c convert.c copy.c credential.c
+     csum-file.c ctype.c date.c decorate.c delta-islands.c diffcore-break.c
+     diffcore-delta.c diffcore-order.c diffcore-pickaxe.c diffcore-rename.c
+     diff-delta.c diff-lib.c diff-no-index.c diff.c dir.c dir-iterator.c editor.c
+     entry.c environment.c ewah/bitmap.c ewah/ewah_bitmap.c ewah/ewah_io.c
+     ewah/ewah_rlw.c exec-cmd.c fetch-negotiator.c fetch-pack.c fmt-merge-msg.c fsck.c fsmonitor.c
+     gettext.c gpg-interface.c graph.c grep.c hashmap.c linear-assignment.c help.c hex.c
+     ident.c interdiff.c json-writer.c kwset.c levenshtein.c line-log.c line-range.c list-objects.c
+     list-objects-filter.c list-objects-filter-options.c ll-merge.c lockfile.c
+     log-tree.c ls-refs.c mailinfo.c mailmap.c match-trees.c mem-pool.c merge.c merge-blobs.c
+     merge-recursive.c mergesort.c midx.c name-hash.c negotiator/default.c
+     negotiator/skipping.c notes.c notes-cache.c notes-merge.c notes-utils.c object.c oidmap.c
+     oidset.c oid-array.c packfile.c pack-bitmap.c pack-bitmap-write.c pack-check.c pack-objects.c
+     pack-revindex.c pack-write.c pager.c parse-options.c parse-options-cb.c patch-delta.c
+     patch-ids.c path.c pathspec.c pkt-line.c preload-index.c pretty.c prio-queue.c progress.c
+     promisor-remote.c prompt.c protocol.c prune-packed.c quote.c range-diff.c reachable.c read-cache.c rebase.c
+     rebase-interactive.c reflog-walk.c refs.c refs/files-backend.c refs/iterator.c
+     refs/packed-backend.c refs/ref-cache.c refspec.c ref-filter.c remote.c replace-object.c
+     repo-settings.c repository.c rerere.c reset.c resolve-undo.c revision.c run-command.c
+     send-pack.c sequencer.c serve.c server-info.c setup.c sha1-lookup.c
+     sha1-file.c sha1-name.c shallow.c sideband.c sigchain.c split-index.c
+     stable-qsort.c strbuf.c streaming.c string-list.c submodule.c submodule-config.c
+     sub-process.c symlinks.c tag.c tempfile.c thread-utils.c tmp-objdir.c
+     trace.c trace2.c trace2/tr2_cfg.c trace2/tr2_cmd_name.c trace2/tr2_dst.c
+     trace2/tr2_sid.c trace2/tr2_sysenv.c trace2/tr2_tbuf.c trace2/tr2_tgt_event.c
+     trace2/tr2_tgt_normal.c trace2/tr2_tgt_perf.c trace2/tr2_tls.c trailer.c transport.c
+     transport-helper.c tree-diff.c tree.c tree-walk.c unpack-trees.c upload-pack.c url.c
+     urlmatch.c usage.c userdiff.c utf8.c varint.c version.c versioncmp.c walker.c wildmatch.c
+     worktree.c wrapper.c write-or-die.c ws.c wt-status.c xdiff-interface.c
+     zlib.c)
+
+add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
+
+set(libxdiff_SOURCES
+     xdiff/xdiffi.c xdiff/xprepare.c xdiff/xutils.c xdiff/xemit.c
+     xdiff/xmerge.c xdiff/xpatience.c xdiff/xhistogram.c)
+add_library(xdiff STATIC ${libxdiff_SOURCES})
+
+set(libvcs-svn_SOURCES
+     vcs-svn/line_buffer.c vcs-svn/sliding_window.c vcs-svn/fast_export.c
+     vcs-svn/svndiff.c vcs-svn/svndump.c)
+add_library(vcs-svn STATIC ${libvcs-svn_SOURCES})
+
+#link all required libraries to common-main
+add_library(common-main OBJECT common-main.c)
+target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES} pthread rt)
+if(Intl_FOUND)
+     target_link_libraries(common-main ${Intl_LIBRARIES})
+endif()
+if(Iconv_FOUND)
+     target_link_libraries(common-main ${Iconv_LIBRARIES})
+endif()
+
+
+set(git_SOURCES
+     builtin/add.c builtin/am.c builtin/annotate.c builtin/apply.c
+     builtin/archive.c builtin/bisect--helper.c builtin/blame.c
+     builtin/branch.c builtin/bundle.c builtin/cat-file.c builtin/check-attr.c
+     builtin/check-ignore.c builtin/check-mailmap.c builtin/check-ref-format.c
+     builtin/checkout-index.c builtin/checkout.c builtin/clean.c
+     builtin/clone.c builtin/column.c builtin/commit-tree.c
+     builtin/commit.c builtin/commit-graph.c builtin/config.c
+     builtin/count-objects.c builtin/credential.c builtin/describe.c
+     builtin/diff-files.c builtin/diff-index.c builtin/diff-tree.c
+     builtin/diff.c builtin/difftool.c builtin/env--helper.c
+     builtin/fast-export.c builtin/fetch-pack.c builtin/fetch.c builtin/fmt-merge-msg.c
+     builtin/for-each-ref.c builtin/fsck.c builtin/gc.c
+     builtin/get-tar-commit-id.c builtin/grep.c builtin/hash-object.c
+     builtin/help.c builtin/index-pack.c builtin/init-db.c
+     builtin/interpret-trailers.c builtin/log.c builtin/ls-files.c
+     builtin/ls-remote.c builtin/ls-tree.c builtin/mailinfo.c builtin/mailsplit.c
+     builtin/merge.c builtin/merge-base.c builtin/merge-file.c builtin/merge-index.c
+     builtin/merge-ours.c builtin/merge-recursive.c builtin/merge-tree.c
+     builtin/mktag.c builtin/mktree.c builtin/multi-pack-index.c builtin/mv.c
+     builtin/name-rev.c builtin/notes.c builtin/pack-objects.c builtin/pack-redundant.c
+     builtin/pack-refs.c builtin/patch-id.c builtin/prune-packed.c builtin/prune.c
+     builtin/pull.c builtin/push.c builtin/range-diff.c builtin/read-tree.c
+     builtin/rebase.c builtin/receive-pack.c builtin/reflog.c builtin/remote.c
+     builtin/remote-ext.c builtin/remote-fd.c builtin/repack.c builtin/replace.c
+     builtin/rerere.c builtin/reset.c builtin/rev-list.c builtin/rev-parse.c
+     builtin/revert.c builtin/rm.c builtin/send-pack.c builtin/shortlog.c
+     builtin/show-branch.c builtin/show-index.c builtin/show-ref.c
+     builtin/sparse-checkout.c builtin/stash.c builtin/stripspace.c
+     builtin/submodule--helper.c builtin/symbolic-ref.c builtin/tag.c
+     builtin/unpack-file.c builtin/unpack-objects.c builtin/update-index.c
+     builtin/update-ref.c builtin/update-server-info.c builtin/upload-archive.c
+     builtin/upload-pack.c builtin/var.c builtin/verify-commit.c builtin/verify-pack.c
+     builtin/verify-tag.c builtin/worktree.c builtin/write-tree.c)
+
+add_executable(git git.c ${git_SOURCES})
+target_link_libraries(git common-main )
+
+add_executable(git-bugreport bugreport.c)
+target_link_libraries(git-bugreport common-main)
+
+add_executable(git-credential-store credential-store.c)
+target_link_libraries(git-credential-store common-main)
+
+add_executable(git-daemon daemon.c)
+target_link_libraries(git-daemon common-main)
+
+add_executable(git-fast-import fast-import.c)
+target_link_libraries(git-fast-import common-main)
+
+add_executable(git-http-backend http-backend.c)
+target_link_libraries(git-http-backend common-main)
+
+add_executable(git-sh-i18n--envsubst sh-i18n--envsubst.c)
+target_link_libraries(git-sh-i18n--envsubst common-main)
+
+add_executable(git-shell shell.c)
+target_link_libraries(git-shell common-main)
+
+if(CURL_FOUND)
+     add_library(http_obj OBJECT http.c)
+
+     add_executable(git-imap-send imap-send.c)
+     target_link_libraries(git-imap-send http_obj common-main ${CURL_LIBRARIES})
+
+     add_executable(git-http-fetch http-walker.c http-fetch.c)
+     target_link_libraries(git-http-fetch http_obj common-main ${CURL_LIBRARIES})
+
+     add_executable(git-remote-http http-walker.c remote-curl.c)
+     target_link_libraries(git-remote-http http_obj common-main ${CURL_LIBRARIES} )
+
+     if(EXPAT_FOUND)
+             add_executable(git-http-push http-push.c)
+             target_link_libraries(git-http-push http_obj common-main ${CURL_LIBRARIES} ${EXPAT_LIBRARIES})
+     endif()
+endif()
+
+add_executable(git-remote-testsvn remote-testsvn.c)
+target_link_libraries(git-remote-testsvn common-main vcs-svn)
+
+add_executable(git-credential-cache credential-cache.c)
+target_link_libraries(git-credential-cache common-main)
+
+add_executable(git-credential-cache--daemon credential-cache--daemon.c)
+target_link_libraries(git-credential-cache--daemon common-main)
+
+
+set(git_builtin_extra
+     cherry cherry-pick format-patch fsck-objects
+     init merge-subtree restore show
+     stage status switch whatchanged)
+
+#Creating hardlinks
+foreach(s ${git_SOURCES} ${git_builtin_extra})
+     string(REPLACE "builtin/" "" s ${s})
+     string(REPLACE ".c" "" s ${s})
+     file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git git-${s})\n")
+     list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s})
+endforeach()
+
+if(CURL_FOUND)
+     set(remote_exes
+             git-remote-https git-remote-ftp git-remote-ftps)
+     foreach(s ${remote_exes})

CMakeLists.txt line 528

Quoted 10 lines

CMakeLists.txt new file +9 -0

+             file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http ${s})\n")
+             list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s})
+     endforeach()
+endif()
+
+add_custom_command(OUTPUT ${git_links} ${git_http_links}
+             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CreateLinks.cmake
+             DEPENDS git git-remote-http)
+add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links})
\ No newline at end of file

No new line at end of line always leave a bad taste in my mount!

--
Danh

Yes it does,
all you have to do is -DZLIB_ROOT=/path/to/zlib/root

Quoted 8 lines

Quoted 7 lines

CMakeLists.txt new file +6 -0

+find_package(EXPAT)
+find_package(Iconv)
+find_package(Intl)
+
 
+if(NOT Intl_FOUND)
+     add_compile_definitions(NO_GETTEXT)

Quoted 2 lines

find_package(Gettext)?

find_package(Gettext) does not define libintl and libintl.h. If NO_GETTEXT is not defined, it means that libintl.h is present. So, we use find_package(Intl) for libintl

Quoted 8 lines

CMakeLists.txt line 36

Quoted 5 lines

CMakeLists.txt new file +4 -0

+     if(NOT Iconv_FOUND)
+             add_compile_definitions(NO_ICONV)
+     endif()
+endif()

ICONV_OMITS_BOM?

Forgot about this, will add it.

Quoted 19 lines

Quoted 6 lines

CMakeLists.txt new file +6 -0

+
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+if(CURL_FOUND)
+     include_directories(SYSTEM ${CURL_INCLUDE_DIRS})
+endif()
+if(EXPAT_FOUND)

CMakeLists.txt line 52

Quoted 10 lines

CMakeLists.txt new file +10 -0

+     include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS})
+endif()
+if(Iconv_FOUND)
+     include_directories(SYSTEM ${Iconv_INCLUDE_DIRS})
+endif()
+if(Intl_FOUND)
+     include_directories(SYSTEM ${Intl_INCLUDE_DIRS})
+endif()
+
+find_program(SH_EXE sh)

We want to find usable sh, not just sh, no?

Quoted 2 lines

It's matter on Solaris, HP-UX

How do I check for this, can you help?

Also, the script is not supported on Solaris and HP-UX.

Quoted 23 lines

Quoted 23 lines

CMakeLists.txt new file +22 -0

+
+#default behaviour
+include_directories(${CMAKE_SOURCE_DIR})
+add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
+add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
+                     SHA1DC_INIT_SAFE_HASH_DEFAULT=0
+                     SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
+                     SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
+list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
+
+
+add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
+                     ETC_GITATTRIBUTES="etc/gitattributes"
+                     ETC_GITCONFIG="etc/gitconfig"
+                     GIT_EXEC_PATH="libexec/git-core"
+                     GIT_LOCALE_PATH="share/locale"
+                     GIT_MAN_PATH="share/man"
+                     GIT_INFO_PATH="share/info"
+                     GIT_HTML_PATH="share/doc/git-doc"
+                     DEFAULT_HELP_FORMAT="html"
+                     DEFAULT_GIT_TEMPLATE_DIR="share/git-core/templates"

Quoted 9 lines

CMakeLists.txt line 78

Quoted 4 lines

CMakeLists.txt new file +4 -0

+                     GIT_VERSION="${PROJECT_VERSION}.GIT"
+                     GIT_USER_AGENT="git/${PROJECT_VERSION}.GIT"
+                     BINDIR="bin"
+                     GIT_BUILT_FROM_COMMIT="")

I wish I could verify this.
Have you check this part on a default build system for a Linux distro, FreeBSD? For things started with "etc/"

These are the values I got when I looked at the build logs from the Makefile (make -n) in Linux and Windows.
Don't know about FreeBSD

Quoted 9 lines

CMakeLists.txt line 83

Quoted 6 lines

CMakeLists.txt new file +5 -0

+
+set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
+add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+
+add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )

/proc/self/exe is Linux only, no?

Yes, it is. This first patch only supports Linux build.

Quoted 16 lines

Quoted 16 lines

CMakeLists.txt new file +16 -0

+list(APPEND compat_SOURCES unix-socket.c)
+
+#header checks
+check_include_file(libgen.h HAVE_LIBGEN_H)
+if(NOT HAVE_LIBGEN_H)
+     add_compile_definitions(NO_LIBGEN_H)
+     list(APPEND compat_SOURCES compat/basename.c)
+endif()
+
+check_include_file(sys/sysinfo.h HAVE_SYSINFO)
+if(HAVE_SYSINFO)
+     add_compile_definitions(HAVE_SYSINFO)
+endif()
+
+check_c_source_compiles("
+#include <alloca.h>

Quoted 9 lines

CMakeLists.txt line 105

Quoted 6 lines

CMakeLists.txt new file +6 -0

+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+     if (p) return 0;
+     return 0;

All code path will return 0?

This check is for a working alloca.h.
Some systems define alloca in malloc.h (Windows)

Quoted 13 lines

CMakeLists.txt line 520

Quoted 13 lines

CMakeLists.txt new file +12 -0

+}"
+HAVE_ALLOCA_H)
+if(HAVE_ALLOCA_H)
+     add_compile_definitions(HAVE_ALLOCA_H)
+endif()
+
+
+if(CURL_FOUND)
+     set(remote_exes
+             git-remote-https git-remote-ftp git-remote-ftps)
+     foreach(s ${remote_exes})
+             file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http ${s})\n")

Quoted 12 lines

CMakeLists.txt line 528

Quoted 9 lines

CMakeLists.txt new file +8 -0

+             list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s})
+     endforeach()
+endif()
+
+add_custom_command(OUTPUT ${git_links} ${git_http_links}
+             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CreateLinks.cmake
+             DEPENDS git git-remote-http)
+add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links})
\ No newline at end of file

No new line at end of line always leave a bad taste in my mount!

Quoted 2 lines · Sibi Siddharthan

Yes it does,
all you have to do is -DZLIB_ROOT=/path/to/zlib/root

OK, I need to learn this syntax

Quoted 8 lines

Quoted 8 lines

Quoted 7 lines

CMakeLists.txt new file +6 -0

+find_package(EXPAT)
+find_package(Iconv)
+find_package(Intl)
+
 
+if(NOT Intl_FOUND)
+     add_compile_definitions(NO_GETTEXT)

Quoted 6 lines

Quoted 2 lines

find_package(Gettext)?

find_package(Gettext) does not define libintl and libintl.h. If NO_GETTEXT is not defined, it means that libintl.h is present. So, we use find_package(Intl) for libintl

People do weird things.

But, I bet that a lot of people have system that have libintl.h installed, but they don't install gettext tools. ;-)

Anyway, can I override NO_GETTEXT from command line?

Let's say, I want to bootstrap a new distro?
In the boostrap step, I don't want to build any i18n things, because the bootstrap package will be thrown away and rebuild again. I don't want to waste time on building such translation things.

Quoted 10 lines

Quoted 8 lines

CMakeLists.txt line 36

Quoted 5 lines

CMakeLists.txt new file +4 -0

+     if(NOT Iconv_FOUND)
+             add_compile_definitions(NO_ICONV)
+     endif()
+endif()

ICONV_OMITS_BOM?

Forgot about this, will add it.

Thanks, my platform relies on this definition!

Quoted 19 lines

Quoted 19 lines

Quoted 6 lines

CMakeLists.txt new file +6 -0

+
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+if(CURL_FOUND)
+     include_directories(SYSTEM ${CURL_INCLUDE_DIRS})
+endif()
+if(EXPAT_FOUND)

CMakeLists.txt line 52

Quoted 10 lines

CMakeLists.txt new file +10 -0

+     include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS})
+endif()
+if(Iconv_FOUND)
+     include_directories(SYSTEM ${Iconv_INCLUDE_DIRS})
+endif()
+if(Intl_FOUND)
+     include_directories(SYSTEM ${Intl_INCLUDE_DIRS})
+endif()
+
+find_program(SH_EXE sh)

We want to find usable sh, not just sh, no?

Quoted 4 lines

Quoted 2 lines

It's matter on Solaris, HP-UX

How do I check for this, can you help?

Sorry, Please ask someone else, check Makefile to see who fixed build for Solaris and HP-UX.

Quoted 1 line

Also, the script is not supported on Solaris and HP-UX.

If Solaris or HP-UX is out of equation,
I'll just write: SH_EXE=/bin/sh ;-)

Quoted 33 lines

Quoted 23 lines

Quoted 23 lines

CMakeLists.txt new file +22 -0

+
+#default behaviour
+include_directories(${CMAKE_SOURCE_DIR})
+add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
+add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
+                     SHA1DC_INIT_SAFE_HASH_DEFAULT=0
+                     SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
+                     SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
+list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
+
+
+add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
+                     ETC_GITATTRIBUTES="etc/gitattributes"
+                     ETC_GITCONFIG="etc/gitconfig"
+                     GIT_EXEC_PATH="libexec/git-core"
+                     GIT_LOCALE_PATH="share/locale"
+                     GIT_MAN_PATH="share/man"
+                     GIT_INFO_PATH="share/info"
+                     GIT_HTML_PATH="share/doc/git-doc"
+                     DEFAULT_HELP_FORMAT="html"
+                     DEFAULT_GIT_TEMPLATE_DIR="share/git-core/templates"

Quoted 9 lines

CMakeLists.txt line 78

Quoted 4 lines

CMakeLists.txt new file +4 -0

+                     GIT_VERSION="${PROJECT_VERSION}.GIT"
+                     GIT_USER_AGENT="git/${PROJECT_VERSION}.GIT"
+                     BINDIR="bin"
+                     GIT_BUILT_FROM_COMMIT="")

I wish I could verify this.
Have you check this part on a default build system for a Linux distro, FreeBSD? For things started with "etc/"

Quoted 3 lines

These are the values I got when I looked at the build logs from the Makefile (make -n) in Linux and Windows.
Don't know about FreeBSD

Linux will install configuration to /etc, Windows (by using msys), will also do that.

*BSD port installs git with /usr/local prefix, and install configuration to /usr/local/etc

Quoted 38 lines

Quoted 9 lines

CMakeLists.txt line 83

Quoted 6 lines

CMakeLists.txt new file +5 -0

+
+set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
+add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+
+add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )

/proc/self/exe is Linux only, no?

Yes, it is. This first patch only supports Linux build.

Quoted 25 lines

Quoted 12 lines

CMakeLists.txt new file +12 -0

+list(APPEND compat_SOURCES unix-socket.c)
+
+#header checks
+check_include_file(libgen.h HAVE_LIBGEN_H)
+if(NOT HAVE_LIBGEN_H)
+     add_compile_definitions(NO_LIBGEN_H)
+     list(APPEND compat_SOURCES compat/basename.c)
+endif()
+
+check_include_file(sys/sysinfo.h HAVE_SYSINFO)
+if(HAVE_SYSINFO)
+     add_compile_definitions(HAVE_SYSINFO)

CMakeLists.txt line 105

Quoted 10 lines

CMakeLists.txt new file +10 -0

+endif()
+
+check_c_source_compiles("
+#include <alloca.h>
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+     if (p) return 0;
+     return 0;

All code path will return 0?

Quoted 2 lines

This check is for a working alloca.h.
Some systems define alloca in malloc.h (Windows)

Does CMake have a macro for check function in which include files?

Quoted 13 lines

Quoted 13 lines

CMakeLists.txt line 520

Quoted 13 lines

CMakeLists.txt new file +12 -0

+}"
+HAVE_ALLOCA_H)
+if(HAVE_ALLOCA_H)
+     add_compile_definitions(HAVE_ALLOCA_H)
+endif()
+
+
+if(CURL_FOUND)
+     set(remote_exes
+             git-remote-https git-remote-ftp git-remote-ftps)
+     foreach(s ${remote_exes})
+             file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http ${s})\n")

Now, I looked at this again.
I didn't see the creatation of CreateLinks.cmake anywhere!

Quoted 4 lines

Quoted 4 lines

Quoted 4 lines

CMakeLists.txt new file +4 -0

+             list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s})
+     endforeach()
+endif()
+

Quoted 8 lines

Quoted 8 lines

CMakeLists.txt line 528

Quoted 5 lines

CMakeLists.txt new file +4 -0

+add_custom_command(OUTPUT ${git_links} ${git_http_links}
+             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CreateLinks.cmake
+             DEPENDS git git-remote-http)
+add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links})
\ No newline at end of file

No new line at end of line always leave a bad taste in my mount!

--
Danh

Please excuse my hatred for CMake.

Quoted 6 lines

CMakeLists.txt new file +1 -0

index 00000000000..73703bd321f
@@ -0,0 +1,528 @@
+#

CMakeLists.txt line 5

Quoted 4 lines

CMakeLists.txt new file +4 -0

+#	Copyright (c) 2020 Sibi Siddharthan
+#
+
+cmake_minimum_required(VERSION 3.14)

I don't plan a full review of this series, but I wanted to point out that this version is newer than what's in Debian 10, so this isn't practically buildable on many systems.

On April 25, 2020 1:08 PM, brian m. carlson Wrote:

Quoted 6 lines · Sibi Siddharthan via GitGitGadget

Quoted 5 lines

CMakeLists.txt new file +0 -0

index 00000000000..73703bd321f
@@ -0,0 +1,528 @@

Quoted 8 lines

CMakeLists.txt line 5

Quoted 5 lines

CMakeLists.txt new file +5 -0

+#
+#	Copyright (c) 2020 Sibi Siddharthan
+#
+
+cmake_minimum_required(VERSION 3.14)

I don't plan a full review of this series, but I wanted to point out that this version is newer than what's in Debian 10, so this isn't practically buildable on many systems.

I am unsure about this, but are non-git-foundation copyrights consistent GPL v2? Just asking for curiosity.

CMakeLists.txt line 5

Quoted 11 lines · Sibi Siddharthan via GitGitGadget

CMakeLists.txt new file +5 -0

new file mode 100644
index 00000000000..73703bd321f
@@ -0,0 +1,528 @@
+#
+#    Copyright (c) 2020 Sibi Siddharthan
+#
+
+cmake_minimum_required(VERSION 3.14)

I don't plan a full review of this series, but I wanted to point out that this version is newer than what's in Debian 10, so this isn't practically buildable on many systems.

If we wanted to add CMake support, even just for Linux and Windows, I'd want to see it functional on the latest versions of the major distros, at the very least. Ideally it would function using the system packages on all security-supported versions of the major distros, since our Makefile does right now.

--
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204

From: Sibi Siddharthan <[email protected]>

This patch implements the placeholder substitution to generate, say, git-request-pull from git-request-pull.sh.

The shell/perl/python scripts and template are generated using CMake (very similar to what sed does).

The text translations are only build if msgfmt is found in your path.

NOTE: The scripts and templates are generated during configuration.

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

CMakeLists.txt +0 -0

index 73703bd321f..788b53be873 100644

CMakeLists.txt +17 -0

+set(LOCALEDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale)
+set(GITWEBDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale)
+set(INSTLIBDIR ${FALLBACK_RUNTIME_PREFIX}/share/perl5)
+
+#shell scripts
+set(git_shell_scripts
+	git-bisect git-difftool--helper git-filter-branch
+	git-merge-octopus git-merge-one-file git-merge-resolve
+	git-mergetool git-quiltimport
+	git-request-pull git-submodule git-web--browse
+	git-mergetool--lib git-parse-remote git-rebase--preserve-merges
+	git-sh-setup git-sh-i18n git-instaweb)
+
+foreach(script ${git_shell_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
+	string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
+	string(REPLACE "@@DIFF@@" "diff" content "${content}")

CMakeLists.txt +4 -0

+
+#perl scripts
+set(git_perl_scripts
+	git-add--interactive git-archimport git-cvsexportcommit

CMakeLists.txt +4 -0

+	string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
+endforeach()
+

CMakeLists.txt +5 -0

+	file(STRINGS ${pm} content NEWLINE_CONSUME)
+	string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}")
+	string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content})
+#test-lib.sh requires perl/build/lib to be the build directory of perl modules

CMakeLists.txt +4 -0

+		list(APPEND po_gen ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo)
+	endforeach()
+	add_custom_target(po-gen ALL DEPENDS ${po_gen})
+endif()

Signature · 1 line

gitgitgadget

Quoted 23 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch implements the placeholder substitution to generate, say, git-request-pull from git-request-pull.sh.

The shell/perl/python scripts and template are generated using CMake (very similar to what sed does).

The text translations are only build if msgfmt is found in your path.

NOTE: The scripts and templates are generated during configuration.

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

CMakeLists.txt +0 -0

index 73703bd321f..788b53be873 100644
@@ -51,6 +51,11 @@ endif()
 

CMakeLists.txt endif() · line 54

Quoted 3 lines

CMakeLists.txt +1 -0

 find_program(SH_EXE sh)
 
+find_program(MSGFMT_EXE msgfmt)

I suppose find_package(Gettext) can do most of this work?

CMakeLists.txt endif() · line 528

Quoted 13 lines

CMakeLists.txt +4 -1

+if(NOT MSGFMT_EXE)
+     message(WARNING "Text Translations won't be build")
+endif()
+
 #default behaviour
 include_directories(${CMAKE_SOURCE_DIR})
 add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")

@@ -525,4 +530,104 @@ endif()
 add_custom_command(OUTPUT ${git_links} ${git_http_links}
              COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CreateLinks.cmake
              DEPENDS git git-remote-http)
-add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links})
\ No newline at end of file

No newline at end of file?

CMakeLists.txt endif() · line 538

Quoted 6 lines

CMakeLists.txt +6 -0

+add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links})
+
+
+#creating required scripts
+set(SHELL_PATH /bin/sh)
+set(PERL_PATH /usr/bin/perl)

Really?
Have you tried on, let's say FreeBSD?

Quoted 21 lines

CMakeLists.txt +21 -0

+set(LOCALEDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale)
+set(GITWEBDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale)
+set(INSTLIBDIR ${FALLBACK_RUNTIME_PREFIX}/share/perl5)
+
+#shell scripts
+set(git_shell_scripts
+     git-bisect git-difftool--helper git-filter-branch
+     git-merge-octopus git-merge-one-file git-merge-resolve
+     git-mergetool git-quiltimport
+     git-request-pull git-submodule git-web--browse
+     git-mergetool--lib git-parse-remote git-rebase--preserve-merges
+     git-sh-setup git-sh-i18n git-instaweb)
+
+foreach(script ${git_shell_scripts})
+     file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
+     string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
+     string(REPLACE "@@DIFF@@" "diff" content "${content}")
+     string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
+     string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}")
+     string(REPLACE "@@NO_CURL@@" "" content "${content}")
+     string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}")

CMakeLists.txt endif() · line 565

Quoted 6 lines

CMakeLists.txt +6 -0

+     string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}")
+     string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}")
+     string(REPLACE "@@SANE_TEXT_GREP@@" "-a" content "${content}")
+     string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
+     file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
+endforeach()

I assume this do most of sed magic?

Quoted 4 lines

CMakeLists.txt +4 -0

+
+#perl scripts
+set(git_perl_scripts
+     git-add--interactive git-archimport git-cvsexportcommit

CMakeLists.txt endif() · line 579

Quoted 10 lines

CMakeLists.txt +10 -0

+     git-cvsimport git-cvsserver git-send-email git-svn)
+
+#create perl header
+file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header )
+string(REPLACE "@@PATHSEP@@" ":" perl_header "${perl_header}")
+string(REPLACE "@@INSTLIBDIR@@" "${INSTLIBDIR}" perl_header "${perl_header}")
+
+foreach(script ${git_perl_scripts})
+     file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.perl content NEWLINE_CONSUME)
+     string(REPLACE "#!/usr/bin/perl" "#!/usr/bin/perl\n${perl_header}\n" content "${content}")

Hoped that this is tried on BSD?

Quoted 11 lines

CMakeLists.txt +11 -0

+     string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}")
+     file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
+endforeach()
+
+#python script
+file(STRINGS ${CMAKE_SOURCE_DIR}/git-p4.py content NEWLINE_CONSUME)
+string(REPLACE "#!/usr/bin/env python" "#!/usr/bin/python" content "${content}")
+file(WRITE ${CMAKE_BINARY_DIR}/git-p4 ${content})
+
+#perl modules
+file(GLOB_RECURSE perl_modules "${CMAKE_SOURCE_DIR}/perl/*.pm")

CMakeLists.txt endif() · line 593

Quoted 3 lines

CMakeLists.txt +3 -0

+
+foreach(pm ${perl_modules})
+     string(REPLACE "${CMAKE_SOURCE_DIR}/perl/" "" file_path ${pm})

So, the real source code have reference to CMAKE_SOURCE_DIR? I don't think so? It's purely my guess from previous patch, this function will do
string(REPLACE from to file something_I_have_not_checked)

Quoted 9 lines

CMakeLists.txt +9 -0

+     file(STRINGS ${pm} content NEWLINE_CONSUME)
+     string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}")
+     string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}")
+     file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content})
+#test-lib.sh requires perl/build/lib to be the build directory of perl modules
+endforeach()
+
+
+#templates

CMakeLists.txt endif() · line 608

Quoted 6 lines

CMakeLists.txt +6 -0

+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/branches) #create branches
+set(hooks_templates
+     applypatch-msg.sample pre-applypatch.sample pre-push.sample
+     commit-msg.sample pre-commit.sample pre-rebase.sample
+     fsmonitor-watchman.sample pre-merge-commit.sample pre-receive.sample
+     post-update.sample prepare-commit-msg.sample update.sample)

Too much things merged into one line, I hate it.

CMakeLists.txt endif() · line 614

Quoted 6 lines

CMakeLists.txt +6 -0

+
+#templates have @.*@ replacement so use configure_file instead
+#hooks
+foreach(tm ${hooks_templates})
+     configure_file(${CMAKE_SOURCE_DIR}/templates/hooks--${tm} ${CMAKE_BINARY_DIR}/templates/blt/hooks/${tm} @ONLY)
+endforeach()

What does this really means?

CMakeLists.txt endif() · line 625

Quoted 11 lines

CMakeLists.txt +11 -0

+
+#info
+configure_file(${CMAKE_SOURCE_DIR}/templates/info--exclude ${CMAKE_BINARY_DIR}/templates/blt/info/exclude @ONLY)
+
+#this
+configure_file(${CMAKE_SOURCE_DIR}/templates/this--description ${CMAKE_BINARY_DIR}/templates/blt/description @ONLY)
+
+
+#translations
+if(MSGFMT_EXE)
+     set(po_files bg  ca  de  el  es  fr  is  it  ko  pt_PT  ru  sv  tr  vi  zh_CN  zh_TW)

hard coded, so this is a regression, compared to old Makefile?

CMakeLists.txt endif() · line 629

Quoted 4 lines

CMakeLists.txt +4 -0

+     foreach(po ${po_files})
+             file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES)
+             add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo
+                             COMMAND ${MSGFMT_EXE} --check --statistics -o ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo ${CMAKE_SOURCE_DIR}/po/${po}.po)

find_package(Gettext) defines MSGFMT_EXECUTABLE, I think. Have you check Solaris option?
Or is this tranlated from current Makefile?
I haven't checked current source code!

Quoted 7 lines

CMakeLists.txt +4 -1

+             list(APPEND po_gen ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo)
+     endforeach()
+     add_custom_target(po-gen ALL DEPENDS ${po_gen})
+endif()
--

gitgitgadget

--
Danh

From: Sibi Siddharthan <[email protected]>

This patch provides the facility to install the built binaries and scripts.

This is very similar to make install.
By default the destination directory(DESTDIR) is /usr/local/ on Linux To set a custom installation path do this:
cmake relative-path-to-srcdir
-DCMAKE_INSTALL_PREFIX=preferred-install-path

Then run make install

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

CMakeLists.txt +2 -0

index 788b53be873..25de5b5bc35 100644
@@ -13,6 +13,8 @@ project(git
 	VERSION ${git_version}
 	LANGUAGES C)
 
+#TODO gitk git-gui gitweb
+#TODO Add pcre support
 
 include(CheckTypeSize)
 include(CheckCSourceRuns)

@@ -631,3 +633,50 @@ if(MSGFMT_EXE)
 	endforeach()
 	add_custom_target(po-gen ALL DEPENDS ${po_gen})
 endif()

CMakeLists.txt +17 -0

+
+set(bin_links
+	git-receive-pack git-upload-archive git-upload-pack)
+
+foreach(b ${bin_links})
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/bin/${b})")
+endforeach()
+
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git)")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell)")
+
+foreach(b ${git_links})
+	string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
+	install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+endforeach()
+
+foreach(b ${git_http_links})

Quoted 39 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch provides the facility to install the built binaries and scripts.

This is very similar to make install.
By default the destination directory(DESTDIR) is /usr/local/ on Linux To set a custom installation path do this:
cmake relative-path-to-srcdir
-DCMAKE_INSTALL_PREFIX=preferred-install-path

Then run make install

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

CMakeLists.txt +6 -0

index 788b53be873..25de5b5bc35 100644
@@ -13,6 +13,8 @@ project(git
      VERSION ${git_version}
      LANGUAGES C)
 
+#TODO gitk git-gui gitweb
+#TODO Add pcre support
 
 include(CheckTypeSize)
 include(CheckCSourceRuns)

@@ -631,3 +633,50 @@ if(MSGFMT_EXE)
      endforeach()
      add_custom_target(po-gen ALL DEPENDS ${po_gen})
 endif()
+
+
+#to help with the install
+list(TRANSFORM git_shell_scripts PREPEND "${CMAKE_BINARY_DIR}/")

CMakeLists.txt if(MSGFMT_EXE) · line 645

Quoted 6 lines

CMakeLists.txt +6 -0

+list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/")
+
+#install
+install(TARGETS git git-shell
+     RUNTIME DESTINATION bin)
+install(PROGRAMS ${CMAKE_BINARY_DIR}/git-cvsserver  #${CMAKE_SOURCE_DIR}/gitk-git/gitk check

check? What does it mean?

CMakeLists.txt if(MSGFMT_EXE) · line 650

Quoted 5 lines

CMakeLists.txt +5 -0

+     DESTINATION bin)
+
+list(REMOVE_ITEM PROGRAMS_BUILT git git-shell)
+install(TARGETS ${PROGRAMS_BUILT}
+     RUNTIME DESTINATION libexec/git-core)

Ubuntu install exec file to /usr/lib/git-core?

Quoted 21 lines

CMakeLists.txt +21 -0

+
+set(bin_links
+     git-receive-pack git-upload-archive git-upload-pack)
+
+foreach(b ${bin_links})
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/bin/${b})")
+endforeach()
+
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git)")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell)")
+
+foreach(b ${git_links})
+     string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
+     install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+endforeach()
+
+foreach(b ${git_http_links})
+     string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
+     install(CODE "file(CREATE_LINK  ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+endforeach()
+

CMakeLists.txt if(MSGFMT_EXE) · line 677

Quoted 6 lines

CMakeLists.txt +6 -0

+install(PROGRAMS ${git_shell_scripts} ${git_perl_scripts} ${CMAKE_BINARY_DIR}/git-p4
+     DESTINATION libexec/git-core)
+
+install(DIRECTORY mergetools DESTINATION libexec/git-core)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/perl/build/lib/ DESTINATION share/perl5
+     FILES_MATCHING PATTERN "*.pm")

I think distro gonna complans about this pattern!

CMakeLists.txt if(MSGFMT_EXE) · line 682

Quoted 5 lines

CMakeLists.txt +5 -0

+install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/templates)
+
+if(MSGFMT_EXE)
+     install(DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale DESTINATION share)
+endif()

I thought we want to check for NO_GETTEXT?

--
Danh

From: Sibi Siddharthan <[email protected]>

This patch provides an alternate way to test git using ctest. CTest ships with CMake, so there is no additional dependency being introduced.

To perform the tests with ctest do this after building:
ctest -j[number of jobs]

NOTE: -j is optional, the default number of jobs is 1

Each of the jobs does this:
cd t/ && sh t[something].sh

The reason for using CTest is that it logs the output of the tests in a neat way, which can be helpful during diagnosis of failures.

After the tests have run ctest generates three log files located in build-directory/Testing/Temporary/

These log files are:

CTestCostData.txt:
This file contains the time taken to complete each test.

LastTestsFailed.log:
This log file contains the names of the tests that have failed in the run.

LastTest.log:
This log file contains the log of all the tests that have run. A snippet of the file is given below.

10/901 Testing: D:/my/git-master/t/t0009-prio-queue.sh 10/901 Test: D:/my/git-master/t/t0009-prio-queue.sh
Command: "sh.exe" "D:/my/git-master/t/t0009-prio-queue.sh"
Directory: D:/my/git-master/t "D:/my/git-master/t/t0009-prio-queue.sh"
Output:
----------------------------------------------------------
ok 1 - basic ordering
ok 2 - mixed put and get
ok 3 - notice empty queue
ok 4 - stack order
passed all 4 test(s)
1..4
<end of output>
Test time = 1.11 sec

NOTE: Testing only works when building in source for now.

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 142 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

CMakeLists.txt +73 -0

index 25de5b5bc35..141ccefa559 100644
@@ -23,6 +23,7 @@ include(CheckIncludeFile)
 include(CheckFunctionExists)
 include(CheckSymbolExists)
 include(CheckStructHasMember)
+include(CTest)
 
 find_package(ZLIB REQUIRED)
 find_package(CURL)

@@ -680,3 +681,144 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/
 if(MSGFMT_EXE)
 	install(DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale DESTINATION share)
 endif()
+
+
+if(BUILD_TESTING)
+
+#tests-helpers
+add_executable(test-fake-ssh t/helper/test-fake-ssh.c)
+target_link_libraries(test-fake-ssh common-main)
+
+add_executable(test-line-buffer t/helper/test-line-buffer.c)
+target_link_libraries(test-line-buffer common-main vcs-svn)
+
+add_executable(test-svn-fe t/helper/test-svn-fe.c)
+target_link_libraries(test-svn-fe common-main vcs-svn)
+
+set(test_helper_sources
+	t/helper/test-tool.c t/helper/test-advise.c t/helper/test-bloom.c t/helper/test-chmtime.c
+	t/helper/test-config.c t/helper/test-ctype.c t/helper/test-date.c t/helper/test-delta.c
+	t/helper/test-dir-iterator.c t/helper/test-drop-caches.c t/helper/test-dump-cache-tree.c
+	t/helper/test-dump-fsmonitor.c t/helper/test-dump-split-index.c
+	t/helper/test-dump-untracked-cache.c t/helper/test-example-decorate.c
+	t/helper/test-genrandom.c t/helper/test-genzeros.c t/helper/test-hash.c
+	t/helper/test-hashmap.c t/helper/test-hash-speed.c t/helper/test-index-version.c
+	t/helper/test-json-writer.c t/helper/test-lazy-init-name-hash.c
+	t/helper/test-match-trees.c t/helper/test-mergesort.c t/helper/test-mktemp.c
+	t/helper/test-oidmap.c t/helper/test-online-cpus.c t/helper/test-parse-options.c
+	t/helper/test-parse-pathspec-file.c t/helper/test-path-utils.c t/helper/test-pkt-line.c
+	t/helper/test-prio-queue.c t/helper/test-progress.c t/helper/test-reach.c
+	t/helper/test-read-cache.c t/helper/test-read-graph.c t/helper/test-read-midx.c
+	t/helper/test-ref-store.c t/helper/test-regex.c t/helper/test-repository.c
+	t/helper/test-revision-walking.c t/helper/test-run-command.c t/helper/test-scrap-cache-tree.c
+	t/helper/test-serve-v2.c t/helper/test-sha1.c t/helper/test-oid-array.c t/helper/test-sha256.c
+	t/helper/test-sigchain.c t/helper/test-strcmp-offset.c t/helper/test-string-list.c
+	t/helper/test-submodule-config.c t/helper/test-submodule-nested-repo-config.c t/helper/test-subprocess.c
+	t/helper/test-trace2.c t/helper/test-urlmatch-normalization.c t/helper/test-xml-encode.c
+	t/helper/test-wildmatch.c t/helper/test-windows-named-pipe.c t/helper/test-write-cache.c)
+
+add_executable(test-tool ${test_helper_sources})
+target_link_libraries(test-tool common-main)
+
+set_target_properties(test-fake-ssh test-line-buffer test-svn-fe test-tool
+			PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/helper)
+
+#wrapper scripts
+set(wrapper_scripts
+	git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext)
+
+set(wrapper_test_scripts
+	test-fake-ssh test-line-buffer test-svn-fe test-tool)
+
+
+foreach(script ${wrapper_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+	string(REPLACE "@@PROG@@" "${script}" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
+endforeach()
+
+foreach(script ${wrapper_test_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+	string(REPLACE "@@PROG@@" "t/helper/${script}" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
+endforeach()
+
+file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}")
+file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content})
+
+#options for configuring test options
+option(PERL_TESTS "Perform tests that use perl" ON)
+option(PYTHON_TESTS "Perform tests that use python" ON)

CMakeLists.txt +18 -0

+set(NO_LIBPCRE1_JIT )
+set(NO_PERL )
+set(NO_PTHREADS )
+set(NO_PYTHON )
+set(PAGER_ENV "LESS=FRX LV=-c")
+set(DC_SHA1 YesPlease)
+set(RUNTIME_PREFIX true)
+set(NO_GETTEXT )
+
+if(NOT CURL_FOUND)
+	set(NO_CURL 1)
+endif()
+
+if(NOT EXPAT_FOUND)
+	set(NO_EXPAT 1)
+endif()
+
+if(NOT Intl_FOUND)

CMakeLists.txt +12 -0

+
+file(WRITE ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SHELL_PATH='${SHELL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TEST_SHELL_PATH='${TEST_SHELL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PERL_PATH='${PERL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DIFF='${DIFF}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PYTHON_PATH='${PYTHON_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TAR='${TAR}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_CURL='${NO_CURL}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_EXPAT='${NO_EXPAT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "USE_LIBPCRE1='${USE_LIBPCRE1}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_LIBPCRE1_JIT='${NO_LIBPCRE1_JIT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PERL='${NO_PERL}'\n")

Quoted 148 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch provides an alternate way to test git using ctest. CTest ships with CMake, so there is no additional dependency being introduced.

To perform the tests with ctest do this after building:
ctest -j[number of jobs]

NOTE: -j is optional, the default number of jobs is 1

Each of the jobs does this:
cd t/ && sh t[something].sh

The reason for using CTest is that it logs the output of the tests in a neat way, which can be helpful during diagnosis of failures.

After the tests have run ctest generates three log files located in build-directory/Testing/Temporary/

These log files are:

CTestCostData.txt:
This file contains the time taken to complete each test.

LastTestsFailed.log:
This log file contains the names of the tests that have failed in the run.

LastTest.log:
This log file contains the log of all the tests that have run. A snippet of the file is given below.

10/901 Testing: D:/my/git-master/t/t0009-prio-queue.sh 10/901 Test: D:/my/git-master/t/t0009-prio-queue.sh
Command: "sh.exe" "D:/my/git-master/t/t0009-prio-queue.sh"
Directory: D:/my/git-master/t "D:/my/git-master/t/t0009-prio-queue.sh"
Output:
----------------------------------------------------------
ok 1 - basic ordering
ok 2 - mixed put and get
ok 3 - notice empty queue
ok 4 - stack order
passed all 4 test(s)
1..4
<end of output>
Test time = 1.11 sec

NOTE: Testing only works when building in source for now.

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 142 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 142 insertions(+)

CMakeLists.txt +77 -0

index 25de5b5bc35..141ccefa559 100644
@@ -23,6 +23,7 @@ include(CheckIncludeFile)
 include(CheckFunctionExists)
 include(CheckSymbolExists)
 include(CheckStructHasMember)
+include(CTest)
 
 find_package(ZLIB REQUIRED)
 find_package(CURL)

@@ -680,3 +681,144 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/
 if(MSGFMT_EXE)
      install(DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale DESTINATION share)
 endif()
+
+
+if(BUILD_TESTING)
+
+#tests-helpers
+add_executable(test-fake-ssh t/helper/test-fake-ssh.c)
+target_link_libraries(test-fake-ssh common-main)
+
+add_executable(test-line-buffer t/helper/test-line-buffer.c)
+target_link_libraries(test-line-buffer common-main vcs-svn)
+
+add_executable(test-svn-fe t/helper/test-svn-fe.c)
+target_link_libraries(test-svn-fe common-main vcs-svn)
+
+set(test_helper_sources
+     t/helper/test-tool.c t/helper/test-advise.c t/helper/test-bloom.c t/helper/test-chmtime.c
+     t/helper/test-config.c t/helper/test-ctype.c t/helper/test-date.c t/helper/test-delta.c
+     t/helper/test-dir-iterator.c t/helper/test-drop-caches.c t/helper/test-dump-cache-tree.c
+     t/helper/test-dump-fsmonitor.c t/helper/test-dump-split-index.c
+     t/helper/test-dump-untracked-cache.c t/helper/test-example-decorate.c
+     t/helper/test-genrandom.c t/helper/test-genzeros.c t/helper/test-hash.c
+     t/helper/test-hashmap.c t/helper/test-hash-speed.c t/helper/test-index-version.c
+     t/helper/test-json-writer.c t/helper/test-lazy-init-name-hash.c
+     t/helper/test-match-trees.c t/helper/test-mergesort.c t/helper/test-mktemp.c
+     t/helper/test-oidmap.c t/helper/test-online-cpus.c t/helper/test-parse-options.c
+     t/helper/test-parse-pathspec-file.c t/helper/test-path-utils.c t/helper/test-pkt-line.c
+     t/helper/test-prio-queue.c t/helper/test-progress.c t/helper/test-reach.c
+     t/helper/test-read-cache.c t/helper/test-read-graph.c t/helper/test-read-midx.c
+     t/helper/test-ref-store.c t/helper/test-regex.c t/helper/test-repository.c
+     t/helper/test-revision-walking.c t/helper/test-run-command.c t/helper/test-scrap-cache-tree.c
+     t/helper/test-serve-v2.c t/helper/test-sha1.c t/helper/test-oid-array.c t/helper/test-sha256.c
+     t/helper/test-sigchain.c t/helper/test-strcmp-offset.c t/helper/test-string-list.c
+     t/helper/test-submodule-config.c t/helper/test-submodule-nested-repo-config.c t/helper/test-subprocess.c
+     t/helper/test-trace2.c t/helper/test-urlmatch-normalization.c t/helper/test-xml-encode.c
+     t/helper/test-wildmatch.c t/helper/test-windows-named-pipe.c t/helper/test-write-cache.c)
+
+add_executable(test-tool ${test_helper_sources})
+target_link_libraries(test-tool common-main)
+
+set_target_properties(test-fake-ssh test-line-buffer test-svn-fe test-tool
+                     PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/helper)
+
+#wrapper scripts
+set(wrapper_scripts
+     git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext)
+
+set(wrapper_test_scripts
+     test-fake-ssh test-line-buffer test-svn-fe test-tool)
+
+
+foreach(script ${wrapper_scripts})
+     file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+     string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+     string(REPLACE "@@PROG@@" "${script}" content "${content}")
+     file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
+endforeach()
+
+foreach(script ${wrapper_test_scripts})
+     file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+     string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+     string(REPLACE "@@PROG@@" "t/helper/${script}" content "${content}")
+     file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
+endforeach()
+
+file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}")
+file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content})
+
+#options for configuring test options
+option(PERL_TESTS "Perform tests that use perl" ON)
+option(PYTHON_TESTS "Perform tests that use python" ON)
+
+#GIT-BUILD-OPTIONS
+set(TEST_SHELL_PATH ${SHELL_PATH})
+set(DIFF diff)

CMakeLists.txt install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/ · line 765

Quoted 6 lines

CMakeLists.txt +6 -0

+set(PYTHON_PATH /usr/bin/python)
+set(TAR tar)
+set(NO_CURL )
+set(NO_EXPAT )
+set(USE_LIBPCRE1 )
+set(USE_LIBPCRE2 )

Hm, really?

Quoted 18 lines

CMakeLists.txt +18 -0

+set(NO_LIBPCRE1_JIT )
+set(NO_PERL )
+set(NO_PTHREADS )
+set(NO_PYTHON )
+set(PAGER_ENV "LESS=FRX LV=-c")
+set(DC_SHA1 YesPlease)
+set(RUNTIME_PREFIX true)
+set(NO_GETTEXT )
+
+if(NOT CURL_FOUND)
+     set(NO_CURL 1)
+endif()
+
+if(NOT EXPAT_FOUND)
+     set(NO_EXPAT 1)
+endif()
+
+if(NOT Intl_FOUND)

CMakeLists.txt install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/ · line 793

Quoted 10 lines

CMakeLists.txt +10 -0

+     set(NO_GETTEXT 1)
+endif()
+
+if(NOT PERL_TESTS)
+     set(NO_PERL 1)
+endif()
+
+if(NOT PYTHON_TESTS)
+     set(NO_PYTHON 1)
+endif()

I hope we have something like:

PYTHON_PATH=/path/to/my/yet/to/release/python/to/check/if/it/works/with/current/git

If it's ready, thanks.
If it isn't, no, I'm stressed enough by CMake.

Quoted 12 lines

CMakeLists.txt +12 -0

+
+file(WRITE ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SHELL_PATH='${SHELL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TEST_SHELL_PATH='${TEST_SHELL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PERL_PATH='${PERL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DIFF='${DIFF}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PYTHON_PATH='${PYTHON_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TAR='${TAR}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_CURL='${NO_CURL}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_EXPAT='${NO_EXPAT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "USE_LIBPCRE1='${USE_LIBPCRE1}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_LIBPCRE1_JIT='${NO_LIBPCRE1_JIT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PERL='${NO_PERL}'\n")

CMakeLists.txt install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/ · line 815

Quoted 10 lines

CMakeLists.txt +10 -0

+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_UNIX_SOCKETS='${NO_UNIX_SOCKETS}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PAGER_ENV='${PAGER_ENV}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DC_SHA1='${DC_SHA1}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X=''\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")
+
+file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh")

CMake recommends to not use GLOB for this kind of things, themselves, no?

CMakeLists.txt install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/ · line 824

Quoted 10 lines

CMakeLists.txt +9 -0

+
+#test
+foreach(tsh ${test_scipts})
+     add_test(NAME ${tsh}
+             COMMAND ${SH_EXE} ${tsh}
+             WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t)
+endforeach()
+
+endif()#BUILD_TESTING
\ No newline at end of file

Please fix your editor!

--
Danh

From: Sibi Siddharthan <[email protected]>

This patch allows git to be tested when performin out of source builds.

This involves changing GIT_BUILD_DIR in t/test-lib.sh to point to the build directory. Also some miscellaneous copies from the source directory to the build directory.
The copies are:
t/chainlint.sed needed by a bunch of test scripts
po/is.po needed by t0204-gettext-rencode-sanity mergetools/tkdiff needed by t7800-difftool contrib/completion/git-prompt.sh needed by t9903-bash-prompt contrib/completion/git-completion.bash needed by t9902-completion contrib/svn-fe/svnrdump_sim.py needed by t9020-remote-svn

NOTE: t/test-lib.sh is only modified when tests are run not during the build or configure.
The trash directory is still srcdir/t

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

CMakeLists.txt +0 -0

index 141ccefa559..29a23eb11f7 100644

Quoted 32 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch allows git to be tested when performin out of source builds.

This involves changing GIT_BUILD_DIR in t/test-lib.sh to point to the build directory. Also some miscellaneous copies from the source directory to the build directory.
The copies are:
t/chainlint.sed needed by a bunch of test scripts
po/is.po needed by t0204-gettext-rencode-sanity mergetools/tkdiff needed by t7800-difftool contrib/completion/git-prompt.sh needed by t9903-bash-prompt contrib/completion/git-completion.bash needed by t9902-completion contrib/svn-fe/svnrdump_sim.py needed by t9020-remote-svn

NOTE: t/test-lib.sh is only modified when tests are run not during the build or configure.
The trash directory is still srcdir/t

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

CMakeLists.txt +0 -0

index 141ccefa559..29a23eb11f7 100644
@@ -812,6 +812,25 @@ file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n"
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")
 

CMakeLists.txt file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n" · line 816

Quoted 2 lines

CMakeLists.txt +2 -0

+#Make the tests work when building out of the source tree
+if(NOT ${CMAKE_BINARY_DIR} STREQUAL ${CMAKE_SOURCE_DIR})

IIRC, CMake recommends _NOT_ expand variable inside if() This very inconsistent recommendation of CMake (when should I use ${var} and when should I use var?) is one of reason I hate CMake

CMakeLists.txt file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n" · line 818

Quoted 2 lines

CMakeLists.txt +2 -0

+     file(RELATIVE_PATH BUILD_DIR_RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/CMakeCache.txt)
+     string(REPLACE "/CMakeCache.txt" "" BUILD_DIR_RELATIVE ${BUILD_DIR_RELATIVE})

I don't know what is going on here!

CMakeLists.txt file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n" · line 826

Quoted 8 lines

CMakeLists.txt +8 -0

+     #Setting the build directory in test-lib.sh before running tests
+     file(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.cmake
+             "file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh GIT_BUILD_DIR_REPL REGEX \"GIT_BUILD_DIR=(.*)\")\n"
+             "file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh content NEWLINE_CONSUME)\n"
+             "string(REPLACE \"\${GIT_BUILD_DIR_REPL}\" \"GIT_BUILD_DIR=\\\"$TEST_DIRECTORY\\\"/../${BUILD_DIR_RELATIVE}\" content \"\${content}\")\n"
+             "file(WRITE ${CMAKE_SOURCE_DIR}/t/test-lib.sh \${content})")
+     #misc copies
+     file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed DESTINATION ${CMAKE_BINARY_DIR}/t/)

So, some sed will be used in Windows without POSIX-like system, interesting!

CMakeLists.txt file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n" · line 834

Quoted 8 lines

CMakeLists.txt +7 -0

+     file(COPY ${CMAKE_SOURCE_DIR}/po/is.po DESTINATION ${CMAKE_BINARY_DIR}/po/)
+     file(COPY ${CMAKE_SOURCE_DIR}/mergetools/tkdiff DESTINATION ${CMAKE_BINARY_DIR}/mergetools/)
+     file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-prompt.sh DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
+     file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-completion.bash DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
+     file(COPY ${CMAKE_SOURCE_DIR}/contrib/svn-fe/svnrdump_sim.py DESTINATION ${CMAKE_BINARY_DIR}/contrib/svn-fe/)
+endif()
+
 file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh")

Remember cmake won't be re-run if nothing was changed in CMakeList.txt If I only change some code, and I decided the change I make should be tested by a-new-and-independent-test-script.
I need to re-run cmake manually! I don't like it, at all.

--
Danh

Quoted 7 lines

Quoted 1 line

file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh")

Remember cmake won't be re-run if nothing was changed in CMakeList.txt If I only change some code, and I decided the change I make should be tested by a-new-and-independent-test-script.
I need to re-run cmake manually! I don't like it, at all.

No you don't have re-run CMake.

Note

We do not recommend using GLOB to collect a list of source files from your source tree. If no CMakeLists.txt file changes when a source is added or removed then the generated build system cannot know when to ask CMake to regenerate. The CONFIGURE_DEPENDS flag may not work reliably on all generators, or if a new generator is added in the future that cannot support it, projects using it will be stuck. Even if CONFIGURE_DEPENDS works reliably, there is still a cost to perform the check on every rebuild.

Quoted 9 lines · Sibi Siddharthan

Quoted 7 lines

Quoted 1 line

file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh")

Remember cmake won't be re-run if nothing was changed in CMakeList.txt If I only change some code, and I decided the change I make should be tested by a-new-and-independent-test-script.
I need to re-run cmake manually! I don't like it, at all.

No you don't have re-run CMake.

Yes, you have to re-run CMake.
https://cmake.org/cmake/help/v3.14/command/file.html#glob

Quoted 10 lines

Note

We do not recommend using GLOB to collect a list of source files from your source tree. If no CMakeLists.txt file changes when a source is added or removed then the generated build system cannot know when to ask CMake to regenerate. The CONFIGURE_DEPENDS flag may not work reliably on all generators, or if a new generator is added in the future that cannot support it, projects using it will be stuck. Even if CONFIGURE_DEPENDS works reliably, there is still a cost to perform the check on every rebuild.

* Run CMake now.
* Don't touch anything
* Create new test-script, let's say t9904-just-for-cmake.sh

* Check if it's run or not, I bet the answer is not

Anyway, Junio said NO, I don't need to be a CMake hater here, anymore.

--
Danh

From: Sibi Siddharthan <[email protected]>

This patch facilitates building git on Windows with CMake using MinGW

NOTE: The funtions unsetenv and hstrerror are not checked in Windows builds.
Reasons
NO_UNSETENV is not compatible with Windows builds.
lines 262-264 compat/mingw.h

compat/mingw.h(line 25) provides a definition of hstrerror which conflicts with the definition provided in git-compat-util.h(lines 733-736).

To use CMake on Windows with MinGW do this:
cmake relative-path-to-srcdir -G "MinGW Makefiles"

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 120 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 97 insertions(+), 23 deletions(-)

CMakeLists.txt +4 -0

index 29a23eb11f7..d9eb1060390 100644
@@ -13,9 +13,12 @@ project(git
 	VERSION ${git_version}
 	LANGUAGES C)
 
+
 #TODO gitk git-gui gitweb
+#TODO Enable NLS on windows natively
 #TODO Add pcre support
 
+
 include(CheckTypeSize)
 include(CheckCSourceRuns)
 include(CheckCSourceCompiles)

@@ -31,6 +34,7 @@ find_package(EXPAT)
 find_package(Iconv)
 find_package(Intl)
 
+
 if(NOT Intl_FOUND)
 	add_compile_definitions(NO_GETTEXT)
 	if(NOT Iconv_FOUND)

CMakeLists.txt +91 -23

+endif()
+
+if(WIN32)
+	find_program(WINDRES_EXE windres)
+	if(NOT WINDRES_EXE)
+		message(FATAL_ERROR "Install windres on Windows for resource files")
+	endif()
+endif()
 
 find_program(MSGFMT_EXE msgfmt)
 if(NOT MSGFMT_EXE)

@@ -85,11 +99,39 @@ add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
 			BINDIR="bin"
 			GIT_BUILT_FROM_COMMIT="")
 
-set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
-add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+if(WIN32)
+	set(FALLBACK_RUNTIME_PREFIX /mingw64)
+	add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+else()
+	set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
+	add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+endif()
 
-add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
-list(APPEND compat_SOURCES unix-socket.c)
+
+#Platform Specific
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+	include_directories(compat/win32)
+	add_compile_definitions(HAVE_ALLOCA_H NO_POSIX_GOODIES NATIVE_CRLF NO_UNIX_SOCKETS WIN32
+				_CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe"  NO_SYMLINK_HEAD UNRELIABLE_FSTAT
+				NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0 NO_ST_BLOCKS_IN_STRUCT_STAT
+				USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
+				UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET)
+	list(APPEND compat_SOURCES compat/mingw.c compat/winansi.c compat/win32/path-utils.c
+		compat/win32/pthread.c compat/win32mmap.c compat/win32/syslog.c
+		compat/win32/trace2_win32_process_info.c compat/win32/dirent.c
+		compat/nedmalloc/nedmalloc.c compat/strdup.c)
+	set(NO_UNIX_SOCKETS 1)
+
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
+	list(APPEND compat_SOURCES unix-socket.c)
+endif()
+
+if(WIN32)
+	set(EXE_EXTENSION .exe)
+else()
+	set(EXE_EXTENSION)
+endif()
 
 #header checks
 check_include_file(libgen.h HAVE_LIBGEN_H)

@@ -150,7 +192,12 @@ endif()
 #function checks
 set(function_checks
 	strcasestr memmem strlcpy strtoimax strtoumax strtoull
-	setenv  mkdtemp poll pread  memmem unsetenv hstrerror)
+	setenv  mkdtemp poll pread  memmem)
+
+#unsetenv,hstrerror are incompatible with windows build
+if(NOT WIN32)
+	list(APPEND function_checks unsetenv hstrerror)
+endif()
 
 foreach(f ${function_checks})
 	string(TOUPPER ${f} uf)

@@ -309,7 +356,13 @@ endif()
 #programs
 set(PROGRAMS_BUILT
 	git git-bugreport git-credential-store git-daemon git-fast-import git-http-backend git-sh-i18n--envsubst
-	git-shell git-remote-testsvn git-credential-cache git-credential-cache--daemon)
+	git-shell git-remote-testsvn)
+
+if(NO_UNIX_SOCKETS)
+	list(APPEND excluded_progs git-credential-cache git-credential-cache--daemon)
+else()
+	list(APPEND PROGRAMS_BUILT git-credential-cache git-credential-cache--daemon)
+endif()
 
 if(NOT CURL_FOUND)
 	list(APPEND excluded_progs git-http-fetch git-http-push)

@@ -410,15 +463,34 @@ set(libvcs-svn_SOURCES
 	vcs-svn/svndiff.c vcs-svn/svndump.c)
 add_library(vcs-svn STATIC ${libvcs-svn_SOURCES})
 
+#add git.rc for gcc
+if(WIN32)
+	add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res
+			COMMAND ${WINDRES_EXE} -O coff -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR}
+				-DMICRO=${PROJECT_VERSION_PATCH} -DPATCHLEVEL=0 -DGIT_VERSION="\\\"${PROJECT_VERSION}.GIT\\\""
+				-i ${CMAKE_SOURCE_DIR}/git.rc -o ${CMAKE_BINARY_DIR}/git.res
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			VERBATIM)
+	add_custom_target(git-rc DEPENDS ${CMAKE_BINARY_DIR}/git.res)
+endif()
+
 #link all required libraries to common-main
 add_library(common-main OBJECT common-main.c)
-target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES} pthread rt)
+
+target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES})
 if(Intl_FOUND)
 	target_link_libraries(common-main ${Intl_LIBRARIES})
 endif()
 if(Iconv_FOUND)
 	target_link_libraries(common-main ${Iconv_LIBRARIES})
 endif()
+if(WIN32)
+	target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res)
+	add_dependencies(common-main git-rc)
+	target_link_options(common-main PUBLIC -municode -Wl,--nxcompat -Wl,--dynamicbase -Wl,--pic-executable,-e,mainCRTStartup)
+elseif(UNIX)
+	target_link_libraries(common-main pthread rt)
+endif()
 
 
 set(git_SOURCES

@@ -501,11 +573,13 @@ endif()
 add_executable(git-remote-testsvn remote-testsvn.c)
 target_link_libraries(git-remote-testsvn common-main vcs-svn)
 
-add_executable(git-credential-cache credential-cache.c)
-target_link_libraries(git-credential-cache common-main)
+if(NOT NO_UNIX_SOCKETS)
+	add_executable(git-credential-cache credential-cache.c)
+	target_link_libraries(git-credential-cache common-main)
 
-add_executable(git-credential-cache--daemon credential-cache--daemon.c)
-target_link_libraries(git-credential-cache--daemon common-main)
+	add_executable(git-credential-cache--daemon credential-cache--daemon.c)
+	target_link_libraries(git-credential-cache--daemon common-main)
+endif()
 
 
 set(git_builtin_extra

@@ -517,16 +591,16 @@ set(git_builtin_extra
 foreach(s ${git_SOURCES} ${git_builtin_extra})
 	string(REPLACE "builtin/" "" s ${s})
 	string(REPLACE ".c" "" s ${s})
-	file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git git-${s})\n")
-	list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s})
+	file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git${EXE_EXTENSION} git-${s}${EXE_EXTENSION})\n")
+	list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s}${EXE_EXTENSION})
 endforeach()
 
 if(CURL_FOUND)
 	set(remote_exes
 		git-remote-https git-remote-ftp git-remote-ftps)
 	foreach(s ${remote_exes})
-		file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http ${s})\n")
-		list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s})
+		file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http${EXE_EXTENSION} ${s}${EXE_EXTENSION})\n")
+		list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s}${EXE_EXTENSION})
 	endforeach()
 endif()
 

@@ -654,20 +728,20 @@ set(bin_links
 	git-receive-pack git-upload-archive git-upload-pack)
 
 foreach(b ${bin_links})
-install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/bin/${b})")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/bin/${b}${EXE_EXTENSION})")
 endforeach()
 
-install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git)")
-install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell)")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git${EXE_EXTENSION})")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell${EXE_EXTENSION})")
 
 foreach(b ${git_links})
 	string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
-	install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+	install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})")
 endforeach()
 
 foreach(b ${git_http_links})
 	string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
-	install(CODE "file(CREATE_LINK  ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+	install(CODE "file(CREATE_LINK  ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})")
 endforeach()
 
 install(PROGRAMS ${git_shell_scripts} ${git_perl_scripts} ${CMAKE_BINARY_DIR}/git-p4

@@ -734,14 +808,14 @@ set(wrapper_test_scripts
 foreach(script ${wrapper_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
 	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-	string(REPLACE "@@PROG@@" "${script}" content "${content}")
+	string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
 endforeach()
 
 foreach(script ${wrapper_test_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
 	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-	string(REPLACE "@@PROG@@" "t/helper/${script}" content "${content}")
+	string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
 endforeach()
 

@@ -807,7 +881,7 @@ file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_UNIX_SOCKETS='${NO_UNIX_SOCKETS}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PAGER_ENV='${PAGER_ENV}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DC_SHA1='${DC_SHA1}'\n")
-file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X=''\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X='${EXE_EXTENSION}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")

Hi Sibi,

Quoted 50 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch facilitates building git on Windows with CMake using MinGW

NOTE: The funtions unsetenv and hstrerror are not checked in Windows builds.
Reasons
NO_UNSETENV is not compatible with Windows builds.
lines 262-264 compat/mingw.h

compat/mingw.h(line 25) provides a definition of hstrerror which conflicts with the definition provided in git-compat-util.h(lines 733-736).

To use CMake on Windows with MinGW do this:
cmake relative-path-to-srcdir -G "MinGW Makefiles"

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 120 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 97 insertions(+), 23 deletions(-)

CMakeLists.txt +4 -0

index 29a23eb11f7..d9eb1060390 100644
@@ -13,9 +13,12 @@ project(git
      VERSION ${git_version}
      LANGUAGES C)
 
+
 #TODO gitk git-gui gitweb
+#TODO Enable NLS on windows natively
 #TODO Add pcre support
 
+
 include(CheckTypeSize)
 include(CheckCSourceRuns)
 include(CheckCSourceCompiles)

@@ -31,6 +34,7 @@ find_package(EXPAT)
 find_package(Iconv)
 find_package(Intl)
 
+
 if(NOT Intl_FOUND)
      add_compile_definitions(NO_GETTEXT)
      if(NOT Iconv_FOUND)

@@ -53,6 +57,16 @@ if(Intl_FOUND)
 endif()
 

CMakeLists.txt if(Intl_FOUND) · line 61

Quoted 3 lines

CMakeLists.txt +2 -0

 find_program(SH_EXE sh)
+if(NOT SH_EXE)
+     message(FATAL_ERROR "sh interpreter was not found in your path, please install one. On Windows you can get it from here https://gitforwindows.org/")

Either the error message or the web page it points to need to coordinate on the 'sh interpreter' reference to help the script kiddies follow the thread. At the moment there is no 'interp..' on the gitforwindows web page. Would someone attempting to use cmake need to use the Download or the Contribute buttons, or some other route to acquire the missing SH_EXE?

(this is also a context line in the next patch)

Quoted 202 lines

CMakeLists.txt +90 -22

+endif()
+
+if(WIN32)
+     find_program(WINDRES_EXE windres)
+     if(NOT WINDRES_EXE)
+             message(FATAL_ERROR "Install windres on Windows for resource files")
+     endif()
+endif()
 
 find_program(MSGFMT_EXE msgfmt)
 if(NOT MSGFMT_EXE)

@@ -85,11 +99,39 @@ add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
                      BINDIR="bin"
                      GIT_BUILT_FROM_COMMIT="")
 
-set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
-add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+if(WIN32)
+     set(FALLBACK_RUNTIME_PREFIX /mingw64)
+     add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+else()
+     set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
+     add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}")
+endif()
 
-add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
-list(APPEND compat_SOURCES unix-socket.c)
+
+#Platform Specific
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+     include_directories(compat/win32)
+     add_compile_definitions(HAVE_ALLOCA_H NO_POSIX_GOODIES NATIVE_CRLF NO_UNIX_SOCKETS WIN32
+                             _CONSOLE DETECT_MSYS_TTY STRIP_EXTENSION=".exe"  NO_SYMLINK_HEAD UNRELIABLE_FSTAT
+                             NOGDI OBJECT_CREATION_MODE=1 __USE_MINGW_ANSI_STDIO=0 NO_ST_BLOCKS_IN_STRUCT_STAT
+                             USE_NED_ALLOCATOR OVERRIDE_STRDUP MMAP_PREVENTS_DELETE USE_WIN32_MMAP
+                             UNICODE _UNICODE HAVE_WPGMPTR ENSURE_MSYSTEM_IS_SET)
+     list(APPEND compat_SOURCES compat/mingw.c compat/winansi.c compat/win32/path-utils.c
+             compat/win32/pthread.c compat/win32mmap.c compat/win32/syslog.c
+             compat/win32/trace2_win32_process_info.c compat/win32/dirent.c
+             compat/nedmalloc/nedmalloc.c compat/strdup.c)
+     set(NO_UNIX_SOCKETS 1)
+
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
+     list(APPEND compat_SOURCES unix-socket.c)
+endif()
+
+if(WIN32)
+     set(EXE_EXTENSION .exe)
+else()
+     set(EXE_EXTENSION)
+endif()
 
 #header checks
 check_include_file(libgen.h HAVE_LIBGEN_H)

@@ -150,7 +192,12 @@ endif()
 #function checks
 set(function_checks
      strcasestr memmem strlcpy strtoimax strtoumax strtoull
-     setenv  mkdtemp poll pread  memmem unsetenv hstrerror)
+     setenv  mkdtemp poll pread  memmem)
+
+#unsetenv,hstrerror are incompatible with windows build
+if(NOT WIN32)
+     list(APPEND function_checks unsetenv hstrerror)
+endif()
 
 foreach(f ${function_checks})
      string(TOUPPER ${f} uf)

@@ -309,7 +356,13 @@ endif()
 #programs
 set(PROGRAMS_BUILT
      git git-bugreport git-credential-store git-daemon git-fast-import git-http-backend git-sh-i18n--envsubst
-     git-shell git-remote-testsvn git-credential-cache git-credential-cache--daemon)
+     git-shell git-remote-testsvn)
+
+if(NO_UNIX_SOCKETS)
+     list(APPEND excluded_progs git-credential-cache git-credential-cache--daemon)
+else()
+     list(APPEND PROGRAMS_BUILT git-credential-cache git-credential-cache--daemon)
+endif()
 
 if(NOT CURL_FOUND)
      list(APPEND excluded_progs git-http-fetch git-http-push)

@@ -410,15 +463,34 @@ set(libvcs-svn_SOURCES
      vcs-svn/svndiff.c vcs-svn/svndump.c)
 add_library(vcs-svn STATIC ${libvcs-svn_SOURCES})
 
+#add git.rc for gcc
+if(WIN32)
+     add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res
+                     COMMAND ${WINDRES_EXE} -O coff -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR}
+                             -DMICRO=${PROJECT_VERSION_PATCH} -DPATCHLEVEL=0 -DGIT_VERSION="\\\"${PROJECT_VERSION}.GIT\\\""
+                             -i ${CMAKE_SOURCE_DIR}/git.rc -o ${CMAKE_BINARY_DIR}/git.res
+                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                     VERBATIM)
+     add_custom_target(git-rc DEPENDS ${CMAKE_BINARY_DIR}/git.res)
+endif()
+
 #link all required libraries to common-main
 add_library(common-main OBJECT common-main.c)
-target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES} pthread rt)
+
+target_link_libraries(common-main libgit xdiff ${ZLIB_LIBRARIES})
 if(Intl_FOUND)
      target_link_libraries(common-main ${Intl_LIBRARIES})
 endif()
 if(Iconv_FOUND)
      target_link_libraries(common-main ${Iconv_LIBRARIES})
 endif()
+if(WIN32)
+     target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res)
+     add_dependencies(common-main git-rc)
+     target_link_options(common-main PUBLIC -municode -Wl,--nxcompat -Wl,--dynamicbase -Wl,--pic-executable,-e,mainCRTStartup)
+elseif(UNIX)
+     target_link_libraries(common-main pthread rt)
+endif()
 
 
 set(git_SOURCES

@@ -501,11 +573,13 @@ endif()
 add_executable(git-remote-testsvn remote-testsvn.c)
 target_link_libraries(git-remote-testsvn common-main vcs-svn)
 
-add_executable(git-credential-cache credential-cache.c)
-target_link_libraries(git-credential-cache common-main)
+if(NOT NO_UNIX_SOCKETS)
+     add_executable(git-credential-cache credential-cache.c)
+     target_link_libraries(git-credential-cache common-main)
 
-add_executable(git-credential-cache--daemon credential-cache--daemon.c)
-target_link_libraries(git-credential-cache--daemon common-main)
+     add_executable(git-credential-cache--daemon credential-cache--daemon.c)
+     target_link_libraries(git-credential-cache--daemon common-main)
+endif()
 
 
 set(git_builtin_extra

@@ -517,16 +591,16 @@ set(git_builtin_extra
 foreach(s ${git_SOURCES} ${git_builtin_extra})
      string(REPLACE "builtin/" "" s ${s})
      string(REPLACE ".c" "" s ${s})
-     file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git git-${s})\n")
-     list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s})
+     file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git${EXE_EXTENSION} git-${s}${EXE_EXTENSION})\n")
+     list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s}${EXE_EXTENSION})
 endforeach()
 
 if(CURL_FOUND)
      set(remote_exes
              git-remote-https git-remote-ftp git-remote-ftps)
      foreach(s ${remote_exes})
-             file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http ${s})\n")
-             list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s})
+             file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http${EXE_EXTENSION} ${s}${EXE_EXTENSION})\n")
+             list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s}${EXE_EXTENSION})
      endforeach()
 endif()
 

@@ -654,20 +728,20 @@ set(bin_links
      git-receive-pack git-upload-archive git-upload-pack)
 
 foreach(b ${bin_links})
-install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/bin/${b})")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/bin/${b}${EXE_EXTENSION})")
 endforeach()
 
-install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git)")
-install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell)")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git${EXE_EXTENSION})")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell${EXE_EXTENSION})")
 
 foreach(b ${git_links})
      string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
-     install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+     install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})")
 endforeach()
 
 foreach(b ${git_http_links})
      string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
-     install(CODE "file(CREATE_LINK  ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+     install(CODE "file(CREATE_LINK  ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b}${EXE_EXTENSION})")
 endforeach()
 
 install(PROGRAMS ${git_shell_scripts} ${git_perl_scripts} ${CMAKE_BINARY_DIR}/git-p4

@@ -734,14 +808,14 @@ set(wrapper_test_scripts
 foreach(script ${wrapper_scripts})
      file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
      string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-     string(REPLACE "@@PROG@@" "${script}" content "${content}")
+     string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}")
      file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
 endforeach()
 
 foreach(script ${wrapper_test_scripts})
      file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
      string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-     string(REPLACE "@@PROG@@" "t/helper/${script}" content "${content}")
+     string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
      file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
 endforeach()
 

CMakeLists.txt file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\ · line 887

Quoted 9 lines

CMakeLists.txt +1 -1

@@ -807,7 +881,7 @@ file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_UNIX_SOCKETS='${NO_UNIX_SOCKETS}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PAGER_ENV='${PAGER_ENV}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DC_SHA1='${DC_SHA1}'\n")
-file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X=''\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X='${EXE_EXTENSION}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")

Hi Philip,

Quoted 25 lines · Philip Oakley

Hi Sibi,

Quoted 22 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch facilitates building git on Windows with CMake using MinGW

NOTE: The funtions unsetenv and hstrerror are not checked in Windows builds.
Reasons
NO_UNSETENV is not compatible with Windows builds.
lines 262-264 compat/mingw.h

compat/mingw.h(line 25) provides a definition of hstrerror which conflicts with the definition provided in git-compat-util.h(lines 733-736).

To use CMake on Windows with MinGW do this:
cmake relative-path-to-srcdir -G "MinGW Makefiles"

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 120 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 97 insertions(+), 23 deletions(-)

Quoted 12 lines

CMakeLists.txt if(Intl_FOUND) · line 61

Quoted 6 lines

CMakeLists.txt +2 -0

index 29a23eb11f7..d9eb1060390 100644
[snip..]
 find_program(SH_EXE sh)
+if(NOT SH_EXE)
+     message(FATAL_ERROR "sh interpreter was not found in your path, please install one. On Windows you can get it from here https://gitforwindows.org/")

Either the error message or the web page it points to need to coordinate on the 'sh interpreter' reference to help the script kiddies follow the thread. At the moment there is no 'interp..' on the gitforwindows web page. Would someone attempting to use cmake need to use the Download or the Contribute buttons, or some other route to acquire the missing SH_EXE?

On Windows, if you are using Git Bash, then you don't have a problem. This message was for people trying to Git on Windows without a bash shell.

I can rephrase the message saying
"On Windows go to https://gitforwindows.org/ and download the Git installer which ships with a sh interpreter(bash)."

Would you suggest something else?

Quoted 3 lines

(this is also a context line in the next patch)

Hi Sibi,

Quoted 40 lines · Sibi Siddharthan

Hi Philip,

Quoted 25 lines · Philip Oakley

Hi Sibi,

Quoted 22 lines · Sibi Siddharthan via GitGitGadget

From: Sibi Siddharthan <[email protected]>

This patch facilitates building git on Windows with CMake using MinGW

NOTE: The funtions unsetenv and hstrerror are not checked in Windows builds.
Reasons
NO_UNSETENV is not compatible with Windows builds.
lines 262-264 compat/mingw.h

compat/mingw.h(line 25) provides a definition of hstrerror which conflicts with the definition provided in git-compat-util.h(lines 733-736).

To use CMake on Windows with MinGW do this:
cmake relative-path-to-srcdir -G "MinGW Makefiles"

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 120 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 97 insertions(+), 23 deletions(-)

Quoted 12 lines

CMakeLists.txt if(Intl_FOUND) · line 61

Quoted 6 lines

CMakeLists.txt +2 -0

index 29a23eb11f7..d9eb1060390 100644
[snip..]
 find_program(SH_EXE sh)
+if(NOT SH_EXE)
+     message(FATAL_ERROR "sh interpreter was not found in your path, please install one. On Windows you can get it from here https://gitforwindows.org/")

Either the error message or the web page it points to need to coordinate on the 'sh interpreter' reference to help the script kiddies follow the thread. At the moment there is no 'interp..' on the gitforwindows web page. Would someone attempting to use cmake need to use the Download or the Contribute buttons, or some other route to acquire the missing SH_EXE?

Quoted 8 lines

On Windows, if you are using Git Bash, then you don't have a problem. This message was for people trying to Git on Windows without a bash shell.

I can rephrase the message saying
"On Windows go to https://gitforwindows.org/ and download the Git installer which ships with a sh interpreter(bash)."

Would you suggest something else?

Filling the message out a little, I'm thinking of:

"sh: shell interpreter was not found in your path, please install one. On Windows, you can get it as part of 'Git for Windows' install at
https://gitforwindows.org/"

The second 'install' could be dropped, but may be needed to fully qualify the instructions for some readers.

The key feature I was checking was the clarity of the 'install' action, as opposed to the way sh is integrated within Git for Windows (which is a whole new topic of conversation for some users!)

Quoted 3 lines

Quoted 3 lines

(this is also a context line in the next patch)

[snip..]

--
Philip

From: Sibi Siddharthan <[email protected]>

This patch adds support for Visual Studio and Clang builds

The minimum required version of CMake is upgraded to 3.15 because this version offers proper support for Clang builds on Windows.

Libintl is not searched for when building with Visual Studio or Clang because there is no binary compatible version available yet.

NOTE: In the link options invalidcontinue.obj has to be included. The reason for this is because by default, Windows calls abort()'s instead of setting errno=EINVAL when invalid arguments are passed to standard functions.
This commit explains it in detail:
4b623d80f73528a632576990ca51e34c333d5dd6

On Windows the default generator is Visual Studio,so for Visual Studio builds do this:

cmake relative-path-to-srcdir

NOTE: Visual Studio generator is a multi config generator, which means that Debug and Release builds can be done on the same build directory.

For Clang builds do this:

On bash
CC=Clang cmake relative-path-to-srcdir -G Ninja
-DCMAKE_BUILD_TYPE=[Debug or Release]

On cmd
set CC=Clang
cmake relative-path-to-srcdir -G Ninja
-DCMAKE_BUILD_TYPE=[Debug or Release]

Signed-off-by Sibi Siddharthan <[email protected]>

---
 CMakeLists.txt | 57 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 11 deletions(-)

CMakeLists.txt +0 -0

index d9eb1060390..5ad3a2557f7 100644

CMakeLists.txt +12 -2

 #Parse GIT-VERSION-GEN to get the version
 file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN git_version REGEX "DEF_VER=v(.*)")

@@ -32,8 +32,11 @@ find_package(ZLIB REQUIRED)
 find_package(CURL)
 find_package(EXPAT)
 find_package(Iconv)
-find_package(Intl)
 
+#Don't use libintl on Windows Visual Studio and Clang builds
+if(NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")))
+	find_package(Intl)
+endif()
 
 if(NOT Intl_FOUND)
 	add_compile_definitions(NO_GETTEXT)

@@ -61,7 +64,7 @@ if(NOT SH_EXE)
 	message(FATAL_ERROR "sh interpreter was not found in your path, please install one. On Windows you can get it from here https://gitforwindows.org/")
 endif()
 
-if(WIN32)
+if(WIN32 AND NOT MSVC)#not required for visual studio builds
 	find_program(WINDRES_EXE windres)
 	if(NOT WINDRES_EXE)
 		message(FATAL_ERROR "Install windres on Windows for resource files")

@@ -73,6 +76,13 @@ if(NOT MSGFMT_EXE)
 	message(WARNING "Text Translations won't be build")
 endif()
 
+#Force all visual studio outputs to CMAKE_BINARY_DIR
+if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
+	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR})
+	add_compile_options(/MP)
+endif()
+
 #default behaviour
 include_directories(${CMAKE_SOURCE_DIR})
 add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")