[geany/geany-plugins] 9ab480: Merge pull request #386 from eht16/windows_installer_msys2_update
Frank Lanitz
git-noreply at xxxxx
Sun Mar 13 10:33:12 UTC 2016
Branch: refs/heads/master
Author: Frank Lanitz <frank at frank.uvena.de>
Committer: Frank Lanitz <frank at frank.uvena.de>
Date: Sun, 13 Mar 2016 10:33:12 UTC
Commit: 9ab4806548e832260ba74e53f31481c15c77fd6d
https://github.com/geany/geany-plugins/commit/9ab4806548e832260ba74e53f31481c15c77fd6d
Log Message:
-----------
Merge pull request #386 from eht16/windows_installer_msys2_update
Windows Installer: Adapt paths and cleanup code for new MSYS2 build e…
Modified Paths:
--------------
README.windows
build/geany-plugins.nsi
Modified: README.windows
33 lines changed, 0 insertions(+), 33 deletions(-)
===================================================================
@@ -1,33 +0,0 @@
-Geany Plugins for Windows
-=========================
-
-
-Since the Geany Plugins 0.18 release, the Windows installer contains
-a few dependency library files. Currently, these are Enchant 1.5.0 which
-is required by the Spell Check plugin, Lua 5.1 for the GeanyLua
-plugin, LibXML2 for the PrettyPrinter plugin, CTPL 0.3.4 for the GeanyGenDoc
-plugin, LibGit2 for the Git Change Bar plugin
-and LibSoup 2.26 for the UpdateChecker plugin.
-
-The installation of these dependencies is fully optional but obviously
-those plugins which depend on the libraries can't be loaded if the
-dependencies are not installed.
-
-
-Enchant 1.5.0 was downloaded from
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/
-
-Lua 5.1 was downloaded from
-http://luaforge.net/frs/?group_id=377
-
-LibXML2 was downloaded from
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/
-
-CTPL 0.3.4 was downloaded from
-http://ctpl.tuxfamily.org/
-
-LibSoup 2.26.3 was downloaded from
-http://ftp.gnome.org/pub/gnome/binaries/win32/libsoup/2.26/
-
-LibGit2 0.22.2 was downloaded from
-http://download.geany.org/contrib/
Modified: build/geany-plugins.nsi
120 lines changed, 106 insertions(+), 14 deletions(-)
===================================================================
@@ -83,7 +83,7 @@ ReserveFile "${NSISDIR}\Plugins\LangDLL.dll"
!insertmacro MUI_PAGE_WELCOME
; License page
; FIXME
-!insertmacro MUI_PAGE_LICENSE "${RESOURCEDIR}\doc\plugins\addons\Copying.txt"
+!insertmacro MUI_PAGE_LICENSE "${RESOURCEDIR}\share\doc\geany-plugins\addons\Copying"
; Components page
!insertmacro MUI_PAGE_COMPONENTS
; Directory page
@@ -105,11 +105,8 @@ Section "!Program Files" SEC01
SectionIn RO 1 2
SetOverwrite ifnewer
- SetOutPath "$INSTDIR\"
- File "${RESOURCEDIR}\ReadMe.Windows.txt"
-
SetOutPath "$INSTDIR\lib"
- File /r "${RESOURCEDIR}\lib\*"
+ File /r "${RESOURCEDIR}\lib\*.dll"
SetOutPath "$INSTDIR\share\icons"
File /r "${RESOURCEDIR}\share\icons\*"
@@ -127,8 +124,8 @@ SectionEnd
Section "Documentation" SEC03
SectionIn 1
SetOverwrite ifnewer
- SetOutPath "$INSTDIR"
- File /r "${RESOURCEDIR}\doc"
+ SetOutPath "$INSTDIR\share\doc\geany-plugins"
+ File /r "${RESOURCEDIR}\share\doc\geany-plugins\*"
SectionEnd
Section "Dependencies" SEC04
@@ -155,7 +152,7 @@ Section -Post
SectionEnd
Section Uninstall
- Delete "$INSTDIR\ReadMe.Windows.txt"
+ Delete "$INSTDIR\ReadMe.Dependencies.Geany-Plugins.txt"
Delete "$INSTDIR\uninst-plugins.exe"
Delete "$INSTDIR\lib\geany\addons.dll"
Delete "$INSTDIR\lib\geany\autoclose.dll"
@@ -174,11 +171,14 @@ Section Uninstall
Delete "$INSTDIR\lib\geany\geanymacro.dll"
Delete "$INSTDIR\lib\geany\geanyminiscript.dll"
Delete "$INSTDIR\lib\geany\geanynumberedbookmarks.dll"
+ Delete "$INSTDIR\lib\geany\geanypg.dll"
Delete "$INSTDIR\lib\geany\geanyprj.dll"
Delete "$INSTDIR\lib\geany\geanysendmail.dll"
Delete "$INSTDIR\lib\geany\geanyvc.dll"
Delete "$INSTDIR\lib\geany\geniuspaste.dll"
Delete "$INSTDIR\lib\geany\git-changebar.dll"
+ Delete "$INSTDIR\lib\geany\lineoperations.dll"
+ Delete "$INSTDIR\lib\geany\markdown.dll"
Delete "$INSTDIR\lib\geany\overview.dll"
Delete "$INSTDIR\lib\geany\pairtaghighlighter.dll"
Delete "$INSTDIR\lib\geany\pohelper.dll"
@@ -190,22 +190,114 @@ Section Uninstall
Delete "$INSTDIR\lib\geany\tableconvert.dll"
Delete "$INSTDIR\lib\geany\treebrowser.dll"
Delete "$INSTDIR\lib\geany\updatechecker.dll"
+ Delete "$INSTDIR\lib\geany\webhelper.dll"
Delete "$INSTDIR\lib\geany\xmlsnippets.dll"
- Delete "$INSTDIR\bin\ctpl-2.dll"
+ Delete "$INSTDIR\bin\ctags.exe"
+ Delete "$INSTDIR\bin\gpg2.exe"
+ Delete "$INSTDIR\bin\gpgconf.exe"
+ Delete "$INSTDIR\bin\gpgme-tool.exe"
+ Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
+ Delete "$INSTDIR\bin\libassuan-0.dll"
+ Delete "$INSTDIR\bin\libctpl-2.dll"
+ Delete "$INSTDIR\bin\libcurl-4.dll"
+ Delete "$INSTDIR\bin\libdbus-1-3.dll"
+ Delete "$INSTDIR\bin\libdbus-glib-1-2.dll"
+ Delete "$INSTDIR\bin\libeay32.dll"
Delete "$INSTDIR\bin\libenchant.dll"
+ Delete "$INSTDIR\bin\libexslt-0.dll"
+ Delete "$INSTDIR\bin\libgcrypt-20.dll"
+ Delete "$INSTDIR\bin\libgeoclue-0.dll"
+ Delete "$INSTDIR\bin\libgif-7.dll"
Delete "$INSTDIR\bin\libgit2.dll"
+ Delete "$INSTDIR\bin\libgmp-10.dll"
+ Delete "$INSTDIR\bin\libgmpxx-4.dll"
+ Delete "$INSTDIR\bin\libgnutls-30.dll"
+ Delete "$INSTDIR\bin\libgnutlsxx-28.dll"
+ Delete "$INSTDIR\bin\libgpg-error-0.dll"
+ Delete "$INSTDIR\bin\libgpgme-11.dll"
+ Delete "$INSTDIR\bin\libgstallocators-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstapp-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstaudio-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstbase-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstcheck-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstcontroller-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstfft-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstnet-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstpbutils-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstreamer-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstriff-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstrtp-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstrtsp-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstsdp-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgsttag-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgstvideo-1.0-0.dll"
+ Delete "$INSTDIR\bin\libgtkspell-0.dll"
+ Delete "$INSTDIR\bin\libhistory6.dll"
+ Delete "$INSTDIR\bin\libhogweed-4-1.dll"
+ Delete "$INSTDIR\bin\libhttp_parser-2.dll"
+ Delete "$INSTDIR\bin\libhunspell-1.3-0.dll"
+ Delete "$INSTDIR\bin\libicudt56.dll"
+ Delete "$INSTDIR\bin\libicuin56.dll"
+ Delete "$INSTDIR\bin\libicuio56.dll"
+ Delete "$INSTDIR\bin\libicule56.dll"
+ Delete "$INSTDIR\bin\libiculx56.dll"
+ Delete "$INSTDIR\bin\libicutest56.dll"
+ Delete "$INSTDIR\bin\libicutu56.dll"
+ Delete "$INSTDIR\bin\libicuuc56.dll"
+ Delete "$INSTDIR\bin\libidn-11.dll"
+ Delete "$INSTDIR\bin\libjavascriptcoregtk-1.0-0.dll"
+ Delete "$INSTDIR\bin\libjpeg-8.dll"
+ Delete "$INSTDIR\bin\liblzma-5.dll"
+ Delete "$INSTDIR\bin\libnettle-6-1.dll"
+ Delete "$INSTDIR\bin\libogg-0.dll"
+ Delete "$INSTDIR\bin\liborc-0.4-0.dll"
+ Delete "$INSTDIR\bin\liborc-test-0.4-0.dll"
+ Delete "$INSTDIR\bin\libp11-kit-0.dll"
+ Delete "$INSTDIR\bin\libreadline6.dll"
+ Delete "$INSTDIR\bin\librtmp-1.dll"
Delete "$INSTDIR\bin\libsoup-2.4-1.dll"
+ Delete "$INSTDIR\bin\libsoup-gnome-2.4-1.dll"
+ Delete "$INSTDIR\bin\libsqlite3-0.dll"
+ Delete "$INSTDIR\bin\libssh2-1.dll"
+ Delete "$INSTDIR\bin\libsystre-0.dll"
+ Delete "$INSTDIR\bin\libtasn1-6.dll"
+ Delete "$INSTDIR\bin\libtermcap-0.dll"
+ Delete "$INSTDIR\bin\libtheora-0.dll"
+ Delete "$INSTDIR\bin\libtheoradec-1.dll"
+ Delete "$INSTDIR\bin\libtheoraenc-1.dll"
+ Delete "$INSTDIR\bin\libtiff-5.dll"
+ Delete "$INSTDIR\bin\libtiffxx-5.dll"
+ Delete "$INSTDIR\bin\libtre-5.dll"
+ Delete "$INSTDIR\bin\libturbojpeg-0.dll"
+ Delete "$INSTDIR\bin\libvorbis-0.dll"
+ Delete "$INSTDIR\bin\libvorbisenc-2.dll"
+ Delete "$INSTDIR\bin\libvorbisfile-3.dll"
+ Delete "$INSTDIR\bin\libvorbisidec-1.dll"
+ Delete "$INSTDIR\bin\libwebkitgtk-1.0-0.dll"
+ Delete "$INSTDIR\bin\libwebp-6.dll"
+ Delete "$INSTDIR\bin\libwebpdecoder-2.dll"
+ Delete "$INSTDIR\bin\libwebpdemux-2.dll"
+ Delete "$INSTDIR\bin\libwebpmux-2.dll"
Delete "$INSTDIR\bin\libxml2-2.dll"
- Delete "$INSTDIR\bin\lua5.1.dll"
+ Delete "$INSTDIR\bin\libxslt-1.dll"
+ Delete "$INSTDIR\bin\lua51.dll"
+ Delete "$INSTDIR\bin\ssleay32.dll"
Delete "$INSTDIR\share\icons\hicolor\16x16\apps\prjorg-*.png"
- RMDir /r "$INSTDIR\doc\plugins"
+ RMDir /r "$INSTDIR\lib\enchant"
+ RMDir /r "$INSTDIR\lib\engines"
+ RMDir /r "$INSTDIR\lib\gio"
+ RMDir /r "$INSTDIR\lib\gstreamer-1.0"
+ RMDir /r "$INSTDIR\lib\pkcs11"
RMDir /r "$INSTDIR\lib\geany-plugins"
+ RMDir /r "$INSTDIR\share\doc\geany-plugins"
RMDir /r "$INSTDIR\share\geany-plugins"
- RMDir /r "$INSTDIR\lib\enchant"
RMDir /r "$INSTDIR\share\enchant"
+ RMDir /r "$INSTDIR\share\p11-kit"
+ RMDir /r "$INSTDIR\share\vala"
+ RMDir /r "$INSTDIR\share\webkitgtk-1.0"
FindFirst $0 $1 "$INSTDIR\share\locale\*"
loop:
@@ -219,8 +311,8 @@ Section Uninstall
FindClose $0
; only if empty
- RMDir "$INSTDIR\doc"
RMDir "$INSTDIR\lib"
+ RMDir "$INSTDIR\share\doc"
RMDir "$INSTDIR\share\icons"
RMDir "$INSTDIR\share\locale"
RMDir "$INSTDIR\share"
@@ -241,7 +333,7 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Required plugin files. You cannot skip these files."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Various translations for the included plugins."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Various documentation files for the included plugins."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Dependency files for various plugins (currently libenchant for Spell Check, Lua for GeanyLua, libxml2 for PrettyPrinter, CTPL for GeanyGenDoc, libgit2 for Git Change Bar)."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Dependency files for various plugins (GeanyCTags, GeanyGenDoc, SpellCheck, WebHelper, Markdown, GeanyLua, GeanyPG, UpdateChecker, GitChangeBar, PrettyPrinter, GeanyVC)."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;;;;;;;;;;;;;;;;;;;;;
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Plugins-Commits
mailing list