Skip to content
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

Jump to bottom

add win32 travis build #870

Merged
merged 8 commits into from
Mar 11, 2020
Merged

add win32 travis build #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
156871d
Add support for STM32G031 and STM32G041 chips. Including the 8-pin ST…
Aug 12, 2019
03ef7bd
Added support for G031/G041 chips (#825)
Nightwalker-87 Feb 20, 2020
94f557e
Merge branch 'develop' of https://github.com/texane/stlink into develop
slyshykO Feb 21, 2020
5a5c3d7
---
slyshykO Feb 21, 2020
fb77766
Merge branch 'develop' of https://github.com/texane/stlink into develop
slyshykO Feb 24, 2020
465cd68
Merge branch 'develop' of https://github.com/texane/stlink into develop
slyshykO Feb 25, 2020
43def93
Merge branch 'develop' of https://github.com/texane/stlink into develop
slyshykO Feb 29, 2020
83a31a0
Add win32 travis build (#2)
slyshykO Feb 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 14 additions & 0 deletions .travis-lin-mingw.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

DIR=$PWD

if [ "$TRAVIS_OS_NAME" == "linux" ]; then
echo "WORK DIR:$DIR"
mkdir -p $DIR/build/linux-mingw32-release
cd $DIR/build/linux-mingw32-release
echo "cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR"
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw32.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
echo "make"
make
fi

3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ addons:
- g++-6
- gcc-6
- libusb-1.0.0-dev
- p7zip
- mingw-w64

script:
- git fetch --tags
- printenv
- cmake --version
- ./.travis.sh
- ./.travis-lin-mingw.sh
3 changes: 2 additions & 1 deletion cmake/modules/FindLibUSB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ if(NOT LIBUSB_FOUND)
file(MAKE_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER})

if(${ZIP_EXECUTABLE} MATCHES "p7zip")
execute_process(COMMAND ${ZIP_EXECUTABLE} -d --keep -f ${LIBUSB_WIN_ARCHIVE_PATH} WORKING_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER})
#execute_process(COMMAND ${ZIP_EXECUTABLE} -d --keep -f ${LIBUSB_WIN_ARCHIVE_PATH} WORKING_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER})
execute_process(COMMAND ${ZIP_EXECUTABLE} -d ${LIBUSB_WIN_ARCHIVE_PATH} WORKING_DIRECTORY ${LIBUSB_WIN_OUTPUT_FOLDER})
else()
execute_process(COMMAND ${ZIP_EXECUTABLE} x -y ${LIBUSB_WIN_ARCHIVE_PATH} -o${LIBUSB_WIN_OUTPUT_FOLDER})
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ int _stlink_usb_version(stlink_t *sl) {
cmd[i++] = STLINK_APIV3_GET_VERSION_EX;

size = send_recv(slu, 1, cmd, slu->cmd_len, data, rep_len);
if (size != rep_len) {
if (size != (ssize_t)rep_len) {
printf("[!] send_recv STLINK_APIV3_GET_VERSION_EX\n");
return (int) size;
}
Expand Down