Skip to content

Build with VS2015 #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Oct 25, 2016
Merged

Build with VS2015 #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2103fc6
msvc: fix dependencies of compat/msvc.c
dscho Oct 20, 2016
eb37e16
msvc: ignore VS2015 trash files
jeffhostetler Jun 3, 2016
0e3819a
msvc: add NuGet scripts for building with VS2015
jeffhostetler Jun 3, 2016
657fbde
msvc: update compile helper for VS2015
jeffhostetler Jun 3, 2016
7388541
msvc: update Makefile and compiler settings for VS2015
jeffhostetler Jun 3, 2016
a29a15d
msvc: include sigset_t definition
Apr 21, 2016
9062230
msvc: define O_ACCMODE
Apr 21, 2016
077e076
msvc: fix the declaration of the _REPARSE_DATA_BUFFER structure
Apr 22, 2016
e9fe955
msvc: convert environment from/to UTF-16 on the fly
jeffhostetler Jun 3, 2016
b9eaf91
msvc: mark a variable as non-const
jeffhostetler Jun 3, 2016
07db451
msvc: do not pretend to support all signals
jeffhostetler Jun 3, 2016
1e5cef4
msvc: provide a main() wrapper similar to mingw_main()
jeffhostetler Jun 3, 2016
8a1aac4
msvc: do not re-declare the timespec struct
jeffhostetler Jun 3, 2016
69b6ea1
msvc: define ftello()
jeffhostetler Jun 3, 2016
b9a0f8e
msvc: fix isatty()
jeffhostetler Jun 3, 2016
46d84bb
cache-tree.c: avoid reusing the DEBUG constant
jeffhostetler Jun 3, 2016
4f0579e
msvc: fix setvbuf() call
jeffhostetler Jun 6, 2016
ace8bd6
msvc: release mode PDBs and library DLLs
jeffhostetler Jun 9, 2016
1af1417
msvc: respect the quiet-by-default output
dscho Oct 14, 2016
026e29f
msvc: use OpenSSL's SHA-1 routines
jeffhostetler Oct 12, 2016
b24dff6
msvc: use libiconv
dscho Oct 20, 2016
be11f2d
msvc: work around iconv() not setting errno
dscho Oct 21, 2016
c0abeba
t7800: fix quoting
dscho Oct 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@
*.user
*.idb
*.pdb
*.ilk
.vs/
/Debug/
/Release/
/.vagrant/
Expand Down
24 changes: 23 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ endif

ifdef SANE_TOOL_PATH
SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix $(SANE_TOOL_PATH_SQ)|'
BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
PATH := $(SANE_TOOL_PATH):${PATH}
else
BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
Expand Down Expand Up @@ -2353,6 +2353,28 @@ install: all
$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) $(install_bindir_programs) '$(DESTDIR_SQ)$(bindir_SQ)'
ifdef MSVC
$(INSTALL) compat/vcbuild/GEN.DEPS/bin/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) compat/vcbuild/GEN.DEPS/bin/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
# We DO NOT install the individual foo.o.pdb files because they
# have already been rolled up into the exe's pdb file.
# We DO NOT have pdb files for the builtin commands (like git-status.exe)
# because it is just a copy/hardlink of git.exe, rather than a unique binary.
$(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
$(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

endif
$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
$(INSTALL) -m 644 mergetools/* '$(DESTDIR_SQ)$(mergetools_instdir_SQ)'
Expand Down
14 changes: 7 additions & 7 deletions cache-tree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include "tree-walk.h"
#include "cache-tree.h"

#ifndef DEBUG
#define DEBUG 0
#ifndef DEBUG_CACHE_TREE
#define DEBUG_CACHE_TREE 0
#endif

struct cache_tree *cache_tree(void)
Expand Down Expand Up @@ -110,7 +110,7 @@ static int do_invalidate_path(struct cache_tree *it, const char *path)
int namelen;
struct cache_tree_sub *down;

#if DEBUG
#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree invalidate <%s>\n", path);
#endif

Expand Down Expand Up @@ -392,7 +392,7 @@ static int update_one(struct cache_tree *it,
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
strbuf_add(&buffer, sha1, 20);

#if DEBUG
#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one %o %.*s\n",
mode, entlen, path + baselen);
#endif
Expand All @@ -414,7 +414,7 @@ static int update_one(struct cache_tree *it,

strbuf_release(&buffer);
it->entry_count = to_invalidate ? -1 : i - *skip_count;
#if DEBUG
#if DEBUG_CACHE_TREE
fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
it->entry_count, it->subtree_nr,
sha1_to_hex(it->sha1));
Expand Down Expand Up @@ -453,7 +453,7 @@ static void write_one(struct strbuf *buffer, struct cache_tree *it,
strbuf_add(buffer, path, pathlen);
strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);

#if DEBUG
#if DEBUG_CACHE_TREE
if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%.*s> (%d ent, %d subtree) %s\n",
pathlen, path, it->entry_count, it->subtree_nr,
Expand Down Expand Up @@ -526,7 +526,7 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
size -= 20;
}

#if DEBUG
#if DEBUG_CACHE_TREE
if (0 <= it->entry_count)
fprintf(stderr, "cache-tree <%s> (%d ent, %d subtree) %s\n",
*buffer, it->entry_count, subtree_nr,
Expand Down
Loading