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

Windows: Create 64bit installer and uninstaller #1402

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Windows: Create 64bit installer and uninstaller #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/ci_mingw64_geany_plugins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ install_geany() {
echo "No Geany installer found"
exit 1
fi
mingw-w64-i686-wine ${GEANY_INSTALLER_EXECUTABLE} /S /D=${GEANY_INSTALLATION_DIR_WIN}
mingw-w64-x86_64-wine ${GEANY_INSTALLER_EXECUTABLE} /S /D=${GEANY_INSTALLATION_DIR_WIN}

# TODO the following steps are way too hacky: installing Geany from the installer is basically
# what we want for CI tests but the installed "geany.pc" file isn't really suitable
Expand Down Expand Up @@ -282,7 +282,7 @@ test_installer() {
# perform a silent install and check for installed files
exiftool -FileName -FileType -FileVersion -FileVersionNumber ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME}
# install Geany-Plugins
mingw-w64-i686-wine ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME} /S /D=${GEANY_PLUGINS_INSTALLATION_DIR_WIN}
mingw-w64-x86_64-wine ${GEANY_PLUGINS_BUILD_DIR}/build/${GEANY_PLUGINS_INSTALLER_FILENAME} /S /D=${GEANY_PLUGINS_INSTALLATION_DIR_WIN}
# check if we have something installed
ls -l ${GEANY_PLUGINS_INSTALLATION_DIR}/uninst-plugins.exe || exit 1
ls -l ${GEANY_PLUGINS_INSTALLATION_DIR}/lib/geany/addons.dll || exit 1
Expand All @@ -292,7 +292,7 @@ test_installer() {
test_uninstaller() {
log "Test NSIS uninstaller"
# uninstall Geany-Plugins and test if everything is clean
mingw-w64-i686-wine ${GEANY_PLUGINS_INSTALLATION_DIR}/uninst-plugins.exe /S
mingw-w64-x86_64-wine ${GEANY_PLUGINS_INSTALLATION_DIR}/uninst-plugins.exe /S
sleep 15 # it seems the uninstaller returns earlier than the files are actually removed, so wait a moment
rest=$(find ${GEANY_PLUGINS_INSTALLATION_DIR} \( -path '*share/locale' -o -path '*share/licenses' \) -prune -false -o -true -printf '%P ')
if [ "${rest}" != " share share/locale share/licenses " ]; then
Expand Down
2 changes: 2 additions & 0 deletions build/geany-plugins.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ CRCCheck force
RequestExecutionLevel highest ; set execution level for Windows Vista
; NSIS 3 Unicode support
Unicode true
; Create 64bit installer (and uninstaller)
Target amd64-unicode

;;;;;;;;;;;;;;;;;;;
; helper defines ;
Expand Down
Loading