-
Notifications
You must be signed in to change notification settings - Fork 109
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.
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
glscopeclient: Check WIXPATH before creating MSI installer #388
Conversation
The CI build failed. Do you need to install additional software in the CI environment perhaps? (see the .github directory for the scripts) |
Done. @umarcor |
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ | ||
-DBUILD_TESTING=OFF \ | ||
../ | ||
cmake --build . | ||
|
||
${MINGW_PREFIX}/bin/cmake.exe --build ./ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cmake --build ./
should work, isn't it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, previous command works. The new one is just to play safely.
} | ||
|
||
package() { | ||
cd "${srcdir}"/../../build | ||
make DESTDIR="${pkgdir}" install | ||
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DESTDIR="${pkgdir}" cmake --build ./ --target install
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, previous command works. The new one is just to play safely.
src/glscopeclient/CMakeLists.txt
Outdated
COMMENT "Creating Windows x64 MSI..." | ||
DEPENDS dist_windows_x64 | ||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | ||
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/src/glscopeclient/wix/LICENSE.rtf ${CMAKE_BINARY_DIR} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems that indentation is not correct in this line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apart from the style issues (see comments), LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice work!
One litte question. Why does the CI compile the program twice? |
It should build once for Linux and once for Windows. If there's multiple builds, then we've got a bug in the scripts. |
@azonenberg, on Windows it is built twice:
I guess @Biswa96 is asking why don't we extract the |
As you are distributing the ZIP file to users, why not skip the msys2 package build or PKGBUILD entirely? |
The MSYS2/PKGBUILD build is executed for Continuous Integration/Testing purposes. That provides "nightly" artifacts for contributors to test enhancements/PRs, before the package is bumped in MSYS2 repositories. |
OK, all doubt cleared 😌 |
No description provided.