Skip to content

Commit 5732514

Browse files
committed
fixup! vcxproj: unclash project directories with build outputs
Now that we dropped `contrib/buildsystems/generate` to generate Visual Studio Solution files, it is time to also drop the `vcxproj` Makefile target that depended on that script. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e6e5b99 commit 5732514

File tree

1 file changed

+0
-78
lines changed

1 file changed

+0
-78
lines changed

config.mak.uname

-78
Original file line numberDiff line numberDiff line change
@@ -825,81 +825,3 @@ ifeq ($(uname_S),QNX)
825825
NO_STRCASESTR = YesPlease
826826
NO_STRLCPY = YesPlease
827827
endif
828-
829-
vcxproj:
830-
# Require clean work tree
831-
git update-index -q --refresh && \
832-
git diff-files --quiet && \
833-
git diff-index --cached --quiet HEAD --
834-
835-
# Make .vcxproj files and add them
836-
perl contrib/buildsystems/generate -g Vcxproj
837-
git add -f git.sln {*,*/lib.proj,t/helper/*,reftable/libreftable{,_test}.proj}/*.vcxproj
838-
839-
# Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
840-
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
841-
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
842-
for name in $(BUILT_INS);\
843-
do \
844-
echo ' <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
845-
done && \
846-
echo ' </Target>' && \
847-
echo '</Project>') >git.proj/LinkOrCopyBuiltins.targets
848-
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
849-
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
850-
for name in $(REMOTE_CURL_ALIASES); \
851-
do \
852-
echo ' <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
853-
done && \
854-
echo ' </Target>' && \
855-
echo '</Project>') >git-remote-http.proj/LinkOrCopyRemoteHttp.targets
856-
git add -f git.proj/LinkOrCopyBuiltins.targets git-remote-http.proj/LinkOrCopyRemoteHttp.targets
857-
858-
# Add generated headers
859-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
860-
git add -f $(GENERATED_H)
861-
862-
# Add scripts
863-
rm -f perl/perl.mak
864-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(SCRIPT_LIB) $(SCRIPTS)
865-
# Strip out the sane tool path, needed only for building
866-
sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
867-
git add -f $(SCRIPT_LIB) $(SCRIPTS)
868-
869-
ifndef NO_PERL
870-
# Add Perl module
871-
$(MAKE) $(LIB_PERL_GEN)
872-
git add -f perl/build
873-
endif
874-
875-
# Add bin-wrappers, for testing
876-
rm -rf bin-wrappers/
877-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(test_bindir_programs)
878-
# Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute
879-
# path of the repository is not hard-coded (GIT_EXEC_PATH will be set
880-
# by test-lib.sh according to the current setup)
881-
sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\
882-
\1="$$(cygpath -u "$$\1")"/' \
883-
-e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/*
884-
# Ensure that test-* helpers find the .dll files copied to top-level
885-
sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-*
886-
# We do not want to force hard-linking builtins
887-
sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
888-
bin-wrappers/git-{receive-pack,upload-archive}
889-
git add -f $(test_bindir_programs)
890-
891-
# Add templates
892-
$(MAKE) -C templates
893-
git add -f templates/boilerplates.made templates/blt/
894-
895-
# Add the translated messages
896-
make MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(MOFILES)
897-
git add -f $(MOFILES)
898-
899-
# Add build options
900-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS
901-
git add -f GIT-BUILD-OPTIONS
902-
903-
# Commit the whole shebang
904-
git commit -m "Generate Visual Studio solution" \
905-
-m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`"

0 commit comments

Comments
 (0)