Skip to content

Commit

Permalink
[windows] Tests 10 11 17 on MSVC with updated patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ileanadumitrescu95 committed Dec 30, 2024
1 parent f645d03 commit acd3c8f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ jobs:
export STRIP=":"
export AR="`pwd`/ar-lib lib"
export RANLIB=":"
./build-on.sh '${{ env.package }}' '--host=${{ matrix.bitness == 32 && 'i686' || 'x86_64' }}-w64-mingw32' 'make' 'LIBTOOLFLAGS=--verbose' '${{ github.event.head_commit.message }}'
./build-on.sh '${{ env.package }}' '--host=${{ matrix.bitness == 32 && 'i686' || 'x86_64' }}-w64-mingw32' 'make' '' '${{ github.event.head_commit.message }}'
- if: ${{ always() && !contains(github.event.head_commit.message, '[pre-release]') }}
run: tar czf ${{ env.package }}-build.tar.gz ${{ env.package }}-*/
# Doc: https://docs.github.com/en/actions/using-workflows/storing-workflow-data-as-artifacts
Expand Down
2 changes: 1 addition & 1 deletion build-on.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ case "$commit_message" in
;;
*)
# Run the tests.
$make check $make_options TESTSUITEFLAGS="--debug" > log3 2>&1; rc=$?; cat log3; test $rc = 0 || exit 1
$make check $make_options TESTSUITEFLAGS="--debug 10 11 17" > log3 2>&1; rc=$?; cat log3; test $rc = 0 || exit 1
;;
esac

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,38 @@ diff --git a/libtoolize.in b/libtoolize.in
index 6c15aa57..c70b0b8e 100644
--- a/libtoolize.in
+++ b/libtoolize.in
@@ -437,6 +437,23 @@ func_copy ()
else
@@ -438,8 +438,29 @@ func_copy ()
my_copycmd=$LN_S
my_copy_type=linking
fi
- my_copy_msg="$my_copy_type file '$my_destfile'"
- $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
+
+ # The Windows linker, mklink, swaps link_name and target.
+ case $my_copycmd in
+ *mklink*)
+ my_temp=$my_destfile
+ my_destfile=$my_srcfile
+ my_srcfile=$my_temp
+ # The Windows linker, mklink, swaps link_name and target.
+ case $my_copycmd in
+ *mklink*)
+ my_temp=$my_destfile
+ my_destfile=$my_srcfile
+ my_srcfile=$my_temp
+
+ my_destfile=`cygpath -aw "$my_destfile"`
+ my_srcfile=`cygpath -aw "$my_srcfile"`
+ my_copy_msg="$my_copy_type file '$my_destfile'"
+ $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
+
+ if test -d "$my_destfile"; then
+ my_copycmd="$my_copycmd /d"
+ fi
+ ;;
+ *) ;;
+ esac
fi
my_copy_msg="$my_copy_type file '$my_destfile'"
$opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
+ my_destfile=`cygpath -aw "$my_destfile"`
+ my_srcfile=`cygpath -aw "$my_srcfile"`
+
+ if test -d "$my_destfile"; then
+ my_copycmd="$my_copycmd /d"
+ fi
+ ;;
+ *)
+ my_copy_msg="$my_copy_type file '$my_destfile'"
+ $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
+ ;;
+ esac

if $opt_dry_run || $my_copycmd "$my_srcfile" "$my_destfile" 2>/dev/null
then
--
2.45.2

0 comments on commit acd3c8f

Please sign in to comment.