Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Enrico Tröger <enrico.troeger(a)uvena.de>
Date: Thu, 16 Sep 2021 21:55:23 UTC
Commit: b287fa14935f5d96917185f00b26947eb130df6d
https://github.com/geany/geany-plugins/commit/b287fa14935f5d96917185f00b269…
Log Message:
-----------
Windows: Support specifying installation target for silent installation
The installation directory for Geany-Plugins is automatically determined
by inspecting the existing Geany installation to use the same directory.
But it might be desired for silent installations (i.e. without user
interaction) to specify an alternative installation directory by
appending "/D=c.\some-dir" to the command line. This is now possible.
Used for CI builds to test the installation automatically.
Modified Paths:
--------------
build/geany-plugins.nsi
Modified: build/geany-plugins.nsi
11 lines changed, 8 insertions(+), 3 deletions(-)
===================================================================
@@ -75,6 +75,7 @@ OutFile "${GEANY_PLUGINS_INSTALLER_NAME}"
Var Answer
Var UserName
+Var GEANY_INSTDIR
Var UNINSTDIR
;;;;;;;;;;;;;;;;
@@ -346,13 +347,13 @@ done:
Function CheckForGeany
; find and read Geany's installation directory and use it as our installation directory
- ReadRegStr $INSTDIR SHCTX "${GEANY_DIR_REGKEY}" "Path"
- StrCmp $INSTDIR "" 0 +3
+ ReadRegStr $GEANY_INSTDIR SHCTX "${GEANY_DIR_REGKEY}" "Path"
+ StrCmp $GEANY_INSTDIR "" 0 +3
MessageBox MB_OK|MB_ICONSTOP "Geany could not be found. Please install Geany first." /SD IDOK
Abort
; check Geany's version
- GetDLLVersion "$INSTDIR\bin\geany.exe" $R0 $R1
+ GetDLLVersion "$GEANY_INSTDIR\bin\geany.exe" $R0 $R1
IntOp $R2 $R0 >> 16
IntOp $R2 $R2 & 0x0000FFFF ; $R2 now contains major version
IntOp $R3 $R0 & 0x0000FFFF ; $R3 now contains minor version
@@ -394,6 +395,10 @@ Function .onInit
Abort
Call CheckForGeany
+ ; if $INSTDIR is empty (i.e. it was not provided via /D=... on command line), use Geany's one
+ ${If} $INSTDIR == ""
+ StrCpy $INSTDIR "$GEANY_INSTDIR"
+ ${EndIf}
; warn about a new install over an existing installation
ReadRegStr $R0 SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Frank Lanitz <frank(a)frank.uvena.de>
Committer: GitHub <noreply(a)github.com>
Date: Wed, 06 Jan 2021 12:27:21 UTC
Commit: 7c540bf347d0f0c6f6ab5123fa8f226b2f9152ee
https://github.com/geany/geany-plugins/commit/7c540bf347d0f0c6f6ab5123fa8f2…
Log Message:
-----------
Merge pull request #1053 from xyproto/no-redefine-bool
Use stdbool.h istead of redefining bool
Modified Paths:
--------------
pretty-printer/src/PrettyPrinter.h
Modified: pretty-printer/src/PrettyPrinter.h
5 lines changed, 2 insertions(+), 3 deletions(-)
===================================================================
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
+#include <stdbool.h>
#ifdef HAVE_GLIB
#include <glib.h>
@@ -52,15 +53,13 @@
#define TRUE !(FALSE)
#endif
-typedef unsigned int bool;
-
/*========================================== STRUCTURES =======================================================*/
/**
* The PrettyPrintingOptions struct allows the programmer to tell the
* PrettyPrinter how it must format the XML output.
*/
-typedef struct
+typedef struct
{
const char* newLineChars; /* char used to generate a new line (generally \r\n) */
char indentChar; /* char used for indentation */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Alexander F. Rødseth <rodseth(a)gmail.com>
Committer: Alexander F. Rødseth <rodseth(a)gmail.com>
Date: Tue, 05 Jan 2021 11:57:27 UTC
Commit: ad50d3ed2ddfe11cd07954786b96725602fb4ddd
https://github.com/geany/geany-plugins/commit/ad50d3ed2ddfe11cd07954786b967…
Log Message:
-----------
Use stdbool.h istead of redefining bool
Redefining bool causes errors when used together with ie. GCC 10.2.0
Modified Paths:
--------------
pretty-printer/src/PrettyPrinter.h
Modified: pretty-printer/src/PrettyPrinter.h
5 lines changed, 2 insertions(+), 3 deletions(-)
===================================================================
@@ -29,6 +29,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
+#include <stdbool.h>
#ifdef HAVE_GLIB
#include <glib.h>
@@ -52,15 +53,13 @@
#define TRUE !(FALSE)
#endif
-typedef unsigned int bool;
-
/*========================================== STRUCTURES =======================================================*/
/**
* The PrettyPrintingOptions struct allows the programmer to tell the
* PrettyPrinter how it must format the XML output.
*/
-typedef struct
+typedef struct
{
const char* newLineChars; /* char used to generate a new line (generally \r\n) */
char indentChar; /* char used for indentation */
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
