Skip to content

Commit e74c948

Browse files
committed
config.mak.uname: drop the vcxproj target
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 <johannes.schindelin@gmx.de>
1 parent a8339b0 commit e74c948

File tree

1 file changed

+0
-76
lines changed

1 file changed

+0
-76
lines changed

config.mak.uname

-76
Original file line numberDiff line numberDiff line change
@@ -759,79 +759,3 @@ ifeq ($(uname_S),QNX)
759759
NO_STRCASESTR = YesPlease
760760
NO_STRLCPY = YesPlease
761761
endif
762-
763-
vcxproj:
764-
# Require clean work tree
765-
git update-index -q --refresh && \
766-
git diff-files --quiet && \
767-
git diff-index --cached --quiet HEAD --
768-
769-
# Make .vcxproj files and add them
770-
perl contrib/buildsystems/generate -g Vcxproj
771-
git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
772-
773-
# Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
774-
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
775-
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
776-
for name in $(BUILT_INS);\
777-
do \
778-
echo ' <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
779-
done && \
780-
echo ' </Target>' && \
781-
echo '</Project>') >git/LinkOrCopyBuiltins.targets
782-
(echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
783-
echo ' <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
784-
for name in $(REMOTE_CURL_ALIASES); \
785-
do \
786-
echo ' <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
787-
done && \
788-
echo ' </Target>' && \
789-
echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
790-
git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
791-
792-
# Add generated headers
793-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(GENERATED_H)
794-
git add -f $(GENERATED_H)
795-
796-
# Add scripts
797-
rm -f perl/perl.mak
798-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(SCRIPT_LIB) $(SCRIPTS)
799-
# Strip out the sane tool path, needed only for building
800-
sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
801-
git add -f $(SCRIPT_LIB) $(SCRIPTS)
802-
803-
# Add Perl module
804-
$(MAKE) $(LIB_PERL_GEN)
805-
git add -f perl/build
806-
807-
# Add bin-wrappers, for testing
808-
rm -rf bin-wrappers/
809-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(test_bindir_programs)
810-
# Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute
811-
# path of the repository is not hard-coded (GIT_EXEC_PATH will be set
812-
# by test-lib.sh according to the current setup)
813-
sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\
814-
\1="$$(cygpath -u "$$\1")"/' \
815-
-e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/*
816-
# Ensure that test-* helpers find the .dll files copied to top-level
817-
sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-*
818-
# We do not want to force hard-linking builtins
819-
sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
820-
bin-wrappers/git-{receive-pack,upload-archive}
821-
git add -f $(test_bindir_programs)
822-
823-
# Add templates
824-
$(MAKE) -C templates
825-
git add -f templates/boilerplates.made templates/blt/
826-
827-
# Add the translated messages
828-
make MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(MOFILES)
829-
git add -f $(MOFILES)
830-
831-
# Add build options
832-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS
833-
git add -f GIT-BUILD-OPTIONS
834-
835-
# Commit the whole shebang
836-
git commit -m "Generate Visual Studio solution" \
837-
-m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`"

0 commit comments

Comments
 (0)