Skip to content

Commit 1551145

Browse files
committed
Merge branch 'js/ci-buildsystems-cleanup'
Code clean-up around stale CI elements and building with Visual Studio. * js/ci-buildsystems-cleanup: config.mak.uname: drop the `vcxproj` target contrib/buildsystems: drop support for building . vcproj/.vcxproj files ci: stop linking the `prove` cache
2 parents 0328471 + a7b060f commit 1551145

File tree

10 files changed

+0
-1950
lines changed

10 files changed

+0
-1950
lines changed

ci/run-build-and-tests.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
. ${0%/*}/lib.sh
77

8-
case "$CI_OS_NAME" in
9-
windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
10-
*) ln -s "$cache_dir/.prove" t/.prove;;
11-
esac
12-
138
run_tests=t
149

1510
case "$jobname" in

ci/run-test-slice.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55

66
. ${0%/*}/lib.sh
77

8-
case "$CI_OS_NAME" in
9-
windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
10-
*) ln -s "$cache_dir/.prove" t/.prove;;
11-
esac
12-
138
group "Run tests" make --quiet -C t T="$(cd t &&
149
./helper/test-tool path-utils slice-tests "$1" "$2" t[0-9]*.sh |
1510
tr '\n' ' ')" ||

config.mak.uname

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

contrib/buildsystems/Generators.pm

Lines changed: 0 additions & 42 deletions
This file was deleted.

contrib/buildsystems/Generators/QMake.pm

Lines changed: 0 additions & 189 deletions
This file was deleted.

0 commit comments

Comments
 (0)