- version locally the script geany-plugins-release.py so far hosted in the wiki - applied fix for building without signing (missing key/certificate in the filesystem) - applied fix to geanygendoc/docs/Makefile.am - applied fix to lsp/src/lsp-server.c - applied fix for languages binaries not being generated - changed version num to 2.1 You can view, comment on, or merge this pull request online at:
https://github.com/geany/geany-plugins/pull/1408
-- Commit Summary --
* fixes for building on windows/msys2
-- File Changes --
M .gitignore (2) A build/msys2-geany-plugins-release.py (122) M geanygendoc/docs/Makefile.am (2) M lsp/src/lsp-server.c (1) A po/LINGUAS (1) A po/Makevars (82) A po/Rules-gmo (12)
-- Patch Links --
https://github.com/geany/geany-plugins/pull/1408.patch https://github.com/geany/geany-plugins/pull/1408.diff
Coule you please split each item to its own commit? We prefer having smaller more specific commits leading to the final stage. Of course each commit should be complete in regard of what it is meant to achieve, but each of these should try and be small. It also gives you the opportunity to actually explain why you changed something, both to help reviewers and future understanding of why a change has been made.
@b4n commented on this pull request.
@@ -15,6 +15,6 @@ dist_pluginhtmldoc_DATA = \
if BUILD_RST manual.html: manual.rst manual.css html4css1.css $(AM_V_GEN) $(RST2HTML) -d --strict \ - --stylesheet-path $(abs_srcdir)/html4css1.css,$(abs_srcdir)/manual.css \ + --stylesheet-path $(srcdir)/html4css1.css,$(srcdir)/manual.css \
Using `abs_srcdir` was done on purpose, see de89404b0edec7cc6a9808e94dd2559ebabdbe10. If somehow this breaks MSYS2, it can be weighted again as it's not 2016 anymore, but you'd have to verify no relevant version of the tool is still impacted by the issue.
@b4n commented on this pull request.
@@ -0,0 +1 @@
+be ca da de el es fr gl it ja kk nl pt pt_BR ru tr uk zh_CN
What's up about the i18n changes? It looks like a partial replication of geany#2938, but without actually switching over to the "modernized" i18n setup I can't see where this is going. What is this *actually* supposed to fix? Again, explaining changes it very important :slightly_smiling_face:
@giuspen commented on this pull request.
@@ -15,6 +15,6 @@ dist_pluginhtmldoc_DATA = \
if BUILD_RST manual.html: manual.rst manual.css html4css1.css $(AM_V_GEN) $(RST2HTML) -d --strict \ - --stylesheet-path $(abs_srcdir)/html4css1.css,$(abs_srcdir)/manual.css \ + --stylesheet-path $(srcdir)/html4css1.css,$(srcdir)/manual.css \
Unfortunately without this patch, it won't build on msys2. The error you get is that manual.css is not found
@giuspen commented on this pull request.
@@ -0,0 +1 @@
+be ca da de el es fr gl it ja kk nl pt pt_BR ru tr uk zh_CN
I'm clearly no expert of the autotools but without this change, on msys2 the languages binaries (*.gmo) are not generated. With this change, all the *.gmo binaries are correctly built and consequently the script that generates the installer is happy ( build/msys2-geany-plugins-release.py and specifically run_command( 'makensis', ...). -> the error points to `File /r "${GEANY_PLUGINS_RELEASE_DIR}\share\locale*"` in build/geany-plugins.nsi ``` Section "Language Files" SEC02 SectionIn 1 SetOutPath "$INSTDIR\share\locale" File /r "${GEANY_PLUGINS_RELEASE_DIR}\share\locale*" ; dependency translations SetOutPath "$INSTDIR\share\locale" File /r "${DEPENDENCY_BUNDLE_DIR}\share\locale*" SectionEnd ```
@b4n commented on this pull request.
@@ -15,6 +15,6 @@ dist_pluginhtmldoc_DATA = \
if BUILD_RST manual.html: manual.rst manual.css html4css1.css $(AM_V_GEN) $(RST2HTML) -d --strict \ - --stylesheet-path $(abs_srcdir)/html4css1.css,$(abs_srcdir)/manual.css \ + --stylesheet-path $(srcdir)/html4css1.css,$(srcdir)/manual.css \
What does the command-line look like? would quoting the paths help?
github-comments@lists.geany.org