freshlybakedca.ke / git
Git fork
fork atom

Merge branch 'js/win-2.49-build-fixes'

Hotfix to help building Git-for-Windows.

* js/win-2.49-build-fixes:
cmake: generalize the handling of the `CLAR_TEST_OBJS` list
meson: fix sorting
ident: stop assuming that `gw_gecos` is writable

Junio C Hamano a36e024e bc86ef10

+10 -6
unified split
+8 -4
contrib/buildsystems/CMakeLists.txt
··· 1001 1001 list(TRANSFORM unit-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/") 1002 1002 add_library(unit-test-lib STATIC ${unit-test_SOURCES}) 1003 1003 1004 + parse_makefile_for_sources(clar-test_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "CLAR_TEST_OBJS") 1005 + list(TRANSFORM clar-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/") 1006 + add_library(clar-test-lib STATIC ${clar-test_SOURCES}) 1007 + 1004 1008 parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "") 1005 1009 foreach(unit_test ${unit_test_PROGRAMS}) 1006 1010 add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c") 1007 - target_link_libraries("${unit_test}" unit-test-lib common-main) 1011 + target_link_libraries("${unit_test}" unit-test-lib clar-test-lib common-main) 1008 1012 set_target_properties("${unit_test}" 1009 1013 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) 1010 1014 if(MSVC) ··· 1046 1050 VERBATIM) 1047 1051 1048 1052 add_library(unit-tests-lib ${clar_test_SUITES} 1049 - "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c" 1050 1053 "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" 1051 1054 "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" 1052 1055 ) 1056 + target_include_directories(clar-test-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests") 1053 1057 target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests") 1054 - add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c") 1055 - target_link_libraries(unit-tests unit-tests-lib common-main) 1058 + add_executable(unit-tests) 1059 + target_link_libraries(unit-tests unit-tests-lib clar-test-lib common-main) 1056 1060 set_target_properties(unit-tests 1057 1061 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin) 1058 1062 if(MSVC)
+1 -1
ident.c
··· 59 59 60 60 static void copy_gecos(const struct passwd *w, struct strbuf *name) 61 61 { 62 - char *src; 62 + const char *src; 63 63 64 64 /* Traditionally GECOS field had office phone numbers etc, separated 65 65 * with commas. Also & stands for capitalized form of the login name.
+1 -1
meson.build
··· 1109 1109 libgit_sources += [ 1110 1110 'compat/mingw.c', 1111 1111 'compat/winansi.c', 1112 + 'compat/win32/dirent.c', 1112 1113 'compat/win32/flush.c', 1113 1114 'compat/win32/path-utils.c', 1114 1115 'compat/win32/pthread.c', 1115 1116 'compat/win32/syslog.c', 1116 - 'compat/win32/dirent.c', 1117 1117 'compat/win32mmap.c', 1118 1118 'compat/nedmalloc/nedmalloc.c', 1119 1119 ]