Commits July 2015

commits@lists.geany.org

1 participants
73 discussions

[geany/geany] e34421: spawn: Remove unnecessary and redundant comments
by Colomban Wendling 10 Jul '15

10 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Jul 2015 20:41:02 UTC Commit: e34421377c7f82cbb4d7965227a64c6d3162466d https://github.com/geany/geany/commit/e34421377c7f82cbb4d7965227a64c6d31624… Log Message: ----------- spawn: Remove unnecessary and redundant comments Modified Paths: -------------- src/spawn.c Modified: src/spawn.c 21 lines changed, 1 insertions(+), 20 deletions(-) =================================================================== @@ -79,22 +79,7 @@ /* * Checks whether a command line is syntactically valid and extracts the program name from it. * - * All OS: - * - any leading spaces, tabs and new lines are skipped - * - an empty command is invalid - * Unix: - * - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv() - * - as a consequence, an unqouted # at the start of an argument comments to the end of line - * Windows: - * - leading carriage returns are skipped too - * - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or - * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe - * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered - * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as - * Windows normally does. - * - the program name must be separated from the arguments by at least one space or tab - * - the standard Windows quoting and escaping rules are used: double quote is escaped with - * backslash, and any literal backslashes before a double quote must be duplicated. + * See @c spawn_check_command() for details. * * @param command_line the command line to check and get the program name from. * @param error return location for error. @@ -1065,10 +1050,6 @@ static void spawn_append_gstring_cb(GString *string, GIOCondition condition, gpo } -/* - * Convinience @c GChildWatchFunc callback that copies the child exit status into a gint - * pointed by @a exit_status. - */ static void spawn_get_exit_status_cb(G_GNUC_UNUSED GPid pid, gint status, gpointer exit_status) { *(gint *) exit_status = status; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7a91a8: spawn: Do not export unnecessary API
by Colomban Wendling 10 Jul '15

10 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Fri, 10 Jul 2015 16:24:23 UTC Commit: 7a91a8661dceff94623da7569b381cd479af301b https://github.com/geany/geany/commit/7a91a8661dceff94623da7569b381cd479af3… Log Message: ----------- spawn: Do not export unnecessary API Hide spawn_get_program_name(), spawn_async_with_pipes() and spawn_get_exit_status_cb(), which are not used by anyone else and should not be part of the plugin API unless explicitly required. See http://lists.geany.org/pipermail/devel/2015-June/thread.html#9521 Note: this duplicates some documentation when a now hidden function was referred to. Modified Paths: -------------- NEWS src/spawn.c src/spawn.h Modified: NEWS 8 lines changed, 3 insertions(+), 5 deletions(-) =================================================================== @@ -129,11 +129,9 @@ Geany 1.25 (unreleased) * Add pseudo-unique document IDs through GeanyDocument::id and document_find_by_id(). This is a safer API for keeping a reference to a document for a long time (PR#256). - * Add convenient and portable spawning API: spawn_sync() - spawn_async(), spawn_async_with_pipes(), spawn_with_callbacks(), - spawn_kill_process(), spawn_get_program_name(), - spawn_check_command(), spawn_write_data(), - spawn_get_exit_status_cb() (PR#441, Dimitar Zhekov). + * Add convenient and portable spawning API: spawn_sync(), spawn_async(), + spawn_with_callbacks(), spawn_kill_process(), spawn_check_command(), + spawn_write_data() (PR#441, Dimitar Zhekov). * plugin_signal_connect() is now safe to use also with objects destroyed before unloading the plugin. * Add document_reload_force() to replace document_reload_file(). Modified: src/spawn.c 63 lines changed, 41 insertions(+), 22 deletions(-) =================================================================== @@ -76,7 +76,7 @@ #define G_IO_FAILURE (G_IO_ERR | G_IO_HUP | G_IO_NVAL) /* always used together */ -/** +/* * Checks whether a command line is syntactically valid and extracts the program name from it. * * All OS: @@ -88,7 +88,7 @@ * Windows: * - leading carriage returns are skipped too * - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or - * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe + * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as * Windows normally does. @@ -100,11 +100,8 @@ * @param error return location for error. * * @return allocated string with the program name on success, @c NULL on error. - * - * @since 1.25 - **/ -GEANY_API_SYMBOL -gchar *spawn_get_program_name(const gchar *command_line, GError **error) + */ +static gchar *spawn_get_program_name(const gchar *command_line, GError **error) { gchar *program; @@ -206,7 +203,24 @@ gchar *spawn_get_program_name(const gchar *command_line, GError **error) /** * Checks whether a command line is valid. * - * Checks if @a command_line is syntactically valid using @c spawn_get_program_name(). + * Checks if @a command_line is syntactically valid. + * + * All OS: + * - any leading spaces, tabs and new lines are skipped + * - an empty command is invalid + * Unix: + * - the standard shell quoting and escaping rules are used, see @c g_shell_parse_argv() + * - as a consequence, an unqouted # at the start of an argument comments to the end of line + * Windows: + * - leading carriage returns are skipped too + * - a quoted program name must be entirely inside the quotes. No "C:\Foo\Bar".pdf or + * "C:\Foo\Bar".bat, which would be executed by Windows as C:\Foo\Bar.exe + * - an unquoted program name may not contain spaces. Foo Bar Qux will not be considered + * "Foo Bar.exe" Qux or "Foo Bar Qux.exe", depending on what executables exist, as + * Windows normally does. + * - the program name must be separated from the arguments by at least one space or tab + * - the standard Windows quoting and escaping rules are used: double quote is escaped with + * backslash, and any literal backslashes before a double quote must be duplicated. * * If @a execute is TRUE, also checks, using @c g_find_program_in_path(), if the program * specified in @a command_line exists and is executable. @@ -453,7 +467,7 @@ static void spawn_append_argument(GString *command, const char *text) #endif /* G_OS_WIN32 */ -/** +/* * Executes a child program asynchronously and setups pipes. * * This is the low-level spawning function. Please use @c spawn_with_callbacks() unless @@ -478,11 +492,8 @@ static void spawn_append_argument(GString *command, const char *text) * @param error return location for error. * * @return @c TRUE on success, @c FALSE on error. - * - * @since 1.25 - **/ -GEANY_API_SYMBOL -gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, + */ +static gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, gchar **argv, gchar **envp, GPid *child_pid, gint *stdin_fd, gint *stdout_fd, gint *stderr_fd, GError **error) { @@ -592,8 +603,19 @@ gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *com /** * Executes a child asynchronously. * - * See @c spawn_async_with_pipes() for a full description; this function simply calls - * @c g_spawn_async_with_pipes() without any pipes. + * A command line or an argument vector must be passed. If both are present, the argument + * vector is appended to the command line. An empty command line is not allowed. + * + * If a @a child_pid is passed, it's your responsibility to invoke @c g_spawn_close_pid(). + * + * @param working_directory child's current working directory, or @c NULL. + * @param command_line child program and arguments, or @c NULL. + * @param argv child's argument vector, or @c NULL. + * @param envp child's environment, or @c NULL. + * @param child_pid return location for child process ID, or @c NULL. + * @param error return location for error. + * + * @return @c TRUE on success, @c FALSE on error. * * @since 1.25 **/ @@ -1043,14 +1065,11 @@ static void spawn_append_gstring_cb(GString *string, GIOCondition condition, gpo } -/** +/* * Convinience @c GChildWatchFunc callback that copies the child exit status into a gint * pointed by @a exit_status. - * - * @since 1.25 - **/ -GEANY_API_SYMBOL -void spawn_get_exit_status_cb(G_GNUC_UNUSED GPid pid, gint status, gpointer exit_status) + */ +static void spawn_get_exit_status_cb(G_GNUC_UNUSED GPid pid, gint status, gpointer exit_status) { *(gint *) exit_status = status; } Modified: src/spawn.h 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -35,16 +35,10 @@ G_BEGIN_DECLS -gchar *spawn_get_program_name(const gchar *command_line, GError **error); - gboolean spawn_check_command(const gchar *command_line, gboolean execute, GError **error); gboolean spawn_kill_process(GPid pid, GError **error); -gboolean spawn_async_with_pipes(const gchar *working_directory, const gchar *command_line, - gchar **argv, gchar **envp, GPid *child_pid, gint *stdin_fd, gint *stdout_fd, - gint *stderr_fd, GError **error); - gboolean spawn_async(const gchar *working_directory, const gchar *command_line, gchar **argv, gchar **envp, GPid *child_pid, GError **error); @@ -100,8 +94,6 @@ typedef struct _SpawnWriteData gboolean spawn_write_data(GIOChannel *channel, GIOCondition condition, SpawnWriteData *data); -void spawn_get_exit_status_cb(GPid pid, gint status, gpointer exit_status); - gboolean spawn_sync(const gchar *working_directory, const gchar *command_line, gchar **argv, gchar **envp, SpawnWriteData *stdin_data, GString *stdout_data, GString *stderr_data, gint *exit_status, GError **error); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cea347: Update NEWS
by Colomban Wendling 08 Jul '15

08 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 08 Jul 2015 16:39:53 UTC Commit: cea34734c472c0374ddbfc0b0655665d47027413 https://github.com/geany/geany/commit/cea34734c472c0374ddbfc0b0655665d47027… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 24 lines changed, 20 insertions(+), 4 deletions(-) =================================================================== @@ -31,11 +31,12 @@ Geany 1.25 (unreleased) Techet). * Fix function return type in symbol list tooltips in some cases (PR#475, Jiří Techet). + * Fix VTE path following on startup. Interface * Show document-related dialogs embedded in the main window ("info bars") (PR#277, Matthew Brush and Thomas Martitz). - * Plugin manager dialog cleanup (PR#251). + * Plugin manager dialog cleanup and overhaul (PR#251, PR#414). * Filetypes can now define the MIME type used to select their icon (PR#179). * Close documents in the sidebar with middle mouse button (PR#172, @@ -50,6 +51,7 @@ Geany 1.25 (unreleased) * Add "dirty" terminal indication (PR#476, Jiří Techet). * Allow to select the None filetype in the Open File dialog (Issue#483). + * Add configuration menu entries for all filetypes (PR#491, Jiří Techet). Editor * Update Scintilla to version 3.5.6 (#1041). @@ -58,6 +60,8 @@ Geany 1.25 (unreleased) * Improve handling of Verilog strings and comments. * Keep undo history when reloading files (PR#188, Arthur Rosenstein). + * Respect filetype.common's wordchars if a filetype doesn't have its own + (Issue#492, PR#501). Search * Add support for single-line regular expressions (PR#310). @@ -70,8 +74,9 @@ Geany 1.25 (unreleased) * Add JSON filetype. * Add Zephir filetype. * Add CoffeScript filetype (PR#230, Mark Dresselhaus). - * Add Go tags parser (PR#373, Jiří Techet). + * Add Go tags parser (PR#373, PR#481, Issue#238, Jiří Techet). * Add Erlang tags parser (PR#445, Beng Tan). + * Add PowerShell tags parser (PR#477). * Many JavaScript parsing fixes and improvements. * Many CSS parser fixes and improvements. * Many Txt2tags parsing fixes and improvements (feature #690). @@ -91,18 +96,27 @@ Geany 1.25 (unreleased) * Recognize `.vbs` files as FreeBasic (PR#171, Nicolas Karolak). * Recognize `.tpl` files as HTML. * Recognize `.xtpl` files as XML. + * Recognize `.xpm` files as C. + * Recognize more Bash files (PR#291, Peter Bittner). * Update templates for Python and Vala. * Add template for HTML5. * Fix parsing of some Python triple-quoted strings. * Add some linting tools to some filetype's default Build menu. + * Fix scope of some Python symbols. + * Fix support of trigraphs in C-like languages. + * Add support of digraphs in C-like languages. + * Add support of `final`, `override` and `noexcpet` C++11 keywords + (PR#544). Internationalization - * Update translations: ca, cs, de, el, es, fr, id, it, ja, nl, pl, - pt_BR, pt, ru, sl, sr, sv. + * Update translations: be, ca, cs, de, el, es, fr, id, it, ja, nl, pl, + pt_BR, pt, ru, sl, sr, sv, zh_CN. Plugins * File Browser: use "explorer" as the default open command on Windows. + * File Browser: use icons based on the detected file's MIME type (PR#455, + Jiří Techet). * Save Actions: use mode 0600 for backup copies (#833, PR#413). * Split Window: Fix a few keybindings (cut, copy, paste, delete, select all) (PR#467, Alex). @@ -135,6 +149,8 @@ Geany 1.25 (unreleased) dialog (PR#113, Adam Coyne). * View -> Change Font now respects the native dialog setting. * Fix main window freeze when displaying native dialogs. + * Use the same plugin directory as other platforms (PR#540, Thomas + Martitz). Geany 1.24.1 (April 16, 2014) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 96d5ee: Merge pull request #544 from b4n/cxx11-override
by Colomban Wendling 08 Jul '15

08 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 08 Jul 2015 16:04:05 UTC Commit: 96d5eec50f35b9daeb7da882ed6b98ff47edaf17 https://github.com/geany/geany/commit/96d5eec50f35b9daeb7da882ed6b98ff47eda… Log Message: ----------- Merge pull request #544 from b4n/cxx11-override c++: Properly parse C++11 overrides, finals and noexcepts Modified Paths: -------------- tagmanager/ctags/c.c tests/ctags/Makefile.am tests/ctags/cxx11-final.cpp tests/ctags/cxx11-final.cpp.tags tests/ctags/cxx11-noexcept.cpp tests/ctags/cxx11-noexcept.cpp.tags tests/ctags/cxx11-override.cpp tests/ctags/cxx11-override.cpp.tags tests/ctags/cxx14-combined.cpp tests/ctags/cxx14-combined.cpp.tags Modified: tagmanager/ctags/c.c 31 lines changed, 20 insertions(+), 11 deletions(-) =================================================================== @@ -76,7 +76,7 @@ typedef enum eKeywordId KEYWORD_LOCAL, KEYWORD_LONG, KEYWORD_M_BAD_STATE, KEYWORD_M_BAD_TRANS, KEYWORD_M_STATE, KEYWORD_M_TRANS, KEYWORD_MODULE, KEYWORD_MUTABLE, - KEYWORD_NAMESPACE, KEYWORD_NEW, KEYWORD_NEWCOV, KEYWORD_NATIVE, + KEYWORD_NAMESPACE, KEYWORD_NEW, KEYWORD_NEWCOV, KEYWORD_NATIVE, KEYWORD_NOEXCEPT, KEYWORD_OPERATOR, KEYWORD_OUT, KEYWORD_OUTPUT, KEYWORD_OVERLOAD, KEYWORD_OVERRIDE, KEYWORD_PACKED, KEYWORD_PORT, KEYWORD_PACKAGE, KEYWORD_PRIVATE, KEYWORD_PROGRAM, KEYWORD_PROTECTED, KEYWORD_PUBLIC, @@ -425,7 +425,7 @@ static const keywordDesc KeywordTable [] = { { "extends", KEYWORD_EXTENDS, { 0, 0, 0, 1, 1, 0, 0 } }, { "extern", KEYWORD_EXTERN, { 1, 1, 1, 0, 1, 1, 0 } }, { "extern", KEYWORD_NAMESPACE, { 0, 0, 0, 0, 0, 0, 1 } }, /* parse block */ - { "final", KEYWORD_FINAL, { 0, 1, 0, 1, 0, 0, 1 } }, + { "final", KEYWORD_FINAL, { 0, 0, 0, 1, 0, 0, 1 } }, { "finally", KEYWORD_FINALLY, { 0, 0, 0, 0, 0, 1, 1 } }, { "float", KEYWORD_FLOAT, { 1, 1, 1, 1, 0, 1, 1 } }, { "for", KEYWORD_FOR, { 1, 1, 1, 1, 0, 1, 1 } }, @@ -457,6 +457,7 @@ static const keywordDesc KeywordTable [] = { { "native", KEYWORD_NATIVE, { 0, 0, 0, 1, 0, 0, 0 } }, { "new", KEYWORD_NEW, { 0, 1, 1, 1, 0, 1, 1 } }, { "newcov", KEYWORD_NEWCOV, { 0, 0, 0, 0, 1, 0, 0 } }, + { "noexcept", KEYWORD_NOEXCEPT, { 0, 1, 0, 0, 0, 0, 0 } }, { "operator", KEYWORD_OPERATOR, { 0, 1, 1, 0, 0, 0, 0 } }, { "out", KEYWORD_OUT, { 0, 0, 0, 0, 0, 1, 1 } }, { "output", KEYWORD_OUTPUT, { 0, 0, 0, 0, 1, 0, 0 } }, @@ -2242,6 +2243,7 @@ static boolean skipPostArgumentStuff (statementInfo *const st, case KEYWORD_ATTRIBUTE: skipParens (); break; case KEYWORD_THROW: skipParens (); break; case KEYWORD_CONST: break; + case KEYWORD_NOEXCEPT: break; case KEYWORD_TRY: break; case KEYWORD_VOLATILE: break; @@ -2262,7 +2264,13 @@ static boolean skipPostArgumentStuff (statementInfo *const st, break; default: - if (isType (token, TOKEN_NONE)) + /* "override" and "final" are only keywords in the declaration of a virtual + * member function, so need to be handled specially, not as keywords */ + if (isLanguage(Lang_cpp) && isType (token, TOKEN_NAME) && + (strcmp ("override", vStringValue (token->name)) == 0 || + strcmp ("final", vStringValue (token->name)) == 0)) + ; + else if (isType (token, TOKEN_NONE)) ; else if (info->isKnrParamList && info->parameterCount > 0) ++elementCount; @@ -2969,7 +2977,15 @@ static void tagCheck (statementInfo *const st) tokenInfo *name_token = (tokenInfo *)prev; boolean free_name_token = FALSE; - if (isType (name_token, TOKEN_NAME)) + /* C++ 11 allows class <name> final { ... } */ + if (isLanguage (Lang_cpp) && isType (prev, TOKEN_NAME) && + strcmp("final", vStringValue(prev->name)) == 0 && + isType(prev2, TOKEN_NAME)) + { + name_token = (tokenInfo *)prev2; + copyToken (st->blockName, name_token); + } + else if (isType (name_token, TOKEN_NAME)) { if (!isLanguage (Lang_vala)) copyToken (st->blockName, name_token); @@ -2994,13 +3010,6 @@ static void tagCheck (statementInfo *const st) } } } - /* C++ 11 allows class <name> final { ... } */ - else if (isLanguage (Lang_cpp) && isType (prev, TOKEN_KEYWORD) && - prev->keyword == KEYWORD_FINAL && isType(prev2, TOKEN_NAME)) - { - name_token = (tokenInfo *)prev2; - copyToken (st->blockName, name_token); - } else if (isLanguage (Lang_csharp)) makeTag (prev, st, FALSE, TAG_PROPERTY); else Modified: tests/ctags/Makefile.am 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -132,6 +132,10 @@ test_sources = \ cython_sample.pyx \ cython_sample2.pyx \ cxx11enum.cpp \ + cxx11-final.cpp \ + cxx11-noexcept.cpp \ + cxx11-override.cpp \ + cxx14-combined.cpp \ db-trig.sql \ debian_432872.f90 \ directives.c \ Modified: tests/ctags/cxx11-final.cpp 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,23 @@ +class Base +{ +public: + virtual void foo() = 0; +}; + +class Derived final : public Base +{ + virtual void foo() final; + virtual void final(); +}; + +void Base::foo() +{ +} + +void Derived::foo() +{ +} + +void Derived::final() +{ +} Modified: tests/ctags/cxx11-final.cpp.tags 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +# format=tagmanager +Base�1�0 +Derived�1�0 +final�16�()�Derived�0�void +final�1024�()�Derived�0�virtual void +foo�16�()�Base�0�void +foo�16�()�Derived�0�void +foo�1024�()�Base�0�virtual void +foo�1024�()�Derived�0�virtual void Modified: tests/ctags/cxx11-noexcept.cpp 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ +class Base +{ +public: + virtual void foo() noexcept = 0; + virtual void bar() const noexcept = 0; + int baz() noexcept { return 42; } +}; Modified: tests/ctags/cxx11-noexcept.cpp.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +Base�1�0 +bar�1024�()�Base�0�virtual void +baz�16�()�Base�0�int +foo�1024�()�Base�0�virtual void Modified: tests/ctags/cxx11-override.cpp 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,23 @@ +class Base +{ +public: + virtual void foo() = 0; +}; + +class Derived : public Base +{ + virtual void foo() override; + virtual void override(); +}; + +void Base::foo() +{ +} + +void Derived::foo() +{ +} + +void Derived::override() +{ +} Modified: tests/ctags/cxx11-override.cpp.tags 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +# format=tagmanager +Base�1�0 +Derived�1�0 +foo�16�()�Base�0�void +foo�16�()�Derived�0�void +foo�1024�()�Base�0�virtual void +foo�1024�()�Derived�0�virtual void +override�16�()�Derived�0�void +override�1024�()�Derived�0�virtual void Modified: tests/ctags/cxx14-combined.cpp 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ +struct Base { + virtual void baz() const throw() = 0; +}; + +struct Foo final : public Base { + static constexpr auto bar() noexcept { return 1; } + virtual void baz() const throw() final override; +}; Modified: tests/ctags/cxx14-combined.cpp.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +Base�2048�0 +Foo�2048�0 +bar�16�()�Foo�0�constexpr +baz�1024�()�Base�0�virtual void +baz�1024�()�Foo�0�virtual void -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6f5d5d: Disable "maintain history on reload" by default
by Colomban Wendling 08 Jul '15

08 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 08 Jul 2015 15:54:34 UTC Commit: 6f5d5db2cb6da4970aa78a64efee3a91727fea51 https://github.com/geany/geany/commit/6f5d5db2cb6da4970aa78a64efee3a91727fe… Log Message: ----------- Disable "maintain history on reload" by default While the feature is nice, it might be unexpected and lacks user feedback. This might lead to user thinking they lost their work because they don't know they can undo the reload operation. So, disable the feature by default until we introduce appropriate user feedback allowing the user to learn about the feature and new behavior. See http://lists.geany.org/pipermail/devel/2015-June/thread.html#9537 Modified Paths: -------------- NEWS doc/geany.txt src/keyfile.c Modified: NEWS 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -56,8 +56,8 @@ Geany 1.25 (unreleased) * Do not comment out blank lines when toggling comments (PR#79, Igor Shaula). * Improve handling of Verilog strings and comments. - * Keep undo history when reloading files (PR#188, Arthur - Rosenstein). + * Support for keeping undo history when reloading files (PR#188, Arthur + Rosenstein). This is not enabled by default in this release. Search * Add support for single-line regular expressions (PR#310). Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2652,7 +2652,7 @@ use_gio_unsafe_file_saving Whether to use GIO as the unsafe file t correctly on some complex setups. gio_unsafe_save_backup Make a backup when using GIO unsafe file false immediately saving. Backup is named `filename~`. -keep_edit_history_on_reload Whether to maintain the edit history when true immediately +keep_edit_history_on_reload Whether to maintain the edit history when false immediately reloading a file, and allow the operation to be reverted. **Filetype related** Modified: src/keyfile.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -234,7 +234,7 @@ static void init_pref_groups(void) stash_group_add_boolean(group, &file_prefs.use_gio_unsafe_file_saving, "use_gio_unsafe_file_saving", TRUE); stash_group_add_boolean(group, &file_prefs.keep_edit_history_on_reload, - "keep_edit_history_on_reload", TRUE); + "keep_edit_history_on_reload", FALSE); /* for backwards-compatibility */ stash_group_add_integer(group, &editor_prefs.indentation->hard_tab_width, "indent_hard_tab_width", 8); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] c5b864: Merge pull request #539 from kugel-/win32-fix
by Colomban Wendling 07 Jul '15

07 Jul '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 07 Jul 2015 15:34:43 UTC Commit: c5b86474adccb2dbcbf4631e96631bb653dae759 https://github.com/geany/geany/commit/c5b86474adccb2dbcbf4631e96631bb653dae… Log Message: ----------- Merge pull request #539 from kugel-/win32-fix Win32 Autotools build and installer fixes. Modified Paths: -------------- .gitignore Makefile.am configure.ac geany.nsi.in scripts/gtk-bundle-from-msys2.sh src/Makefile.am src/socket.c src/spawn.c src/win32.c src/win32defines.h win32-config.h wscript Modified: .gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,7 @@ Makefile.in /geany.glade.bak /geany.gladep.bak /geany.pc +/geany.nsi /geany.spec /geany_private.res /global.tags.old Modified: Makefile.am 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -44,6 +44,15 @@ uninstall-local: install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2 +if MINGW + $(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(prefix)/Authors.txt + $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(prefix)/Changelog.txt + $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(prefix)/Copying.txt + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/Readme.txt + $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(prefix)/News.txt + $(INSTALL_DATA) $(srcdir)/THANKS $(DESTDIR)$(prefix)/Thanks.txt + $(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(prefix)/Todo.txt +endif dist-hook: @if test -d "$(top_srcdir)/.git"; then \ Modified: configure.ac 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,7 @@ AC_SUBST([DEPENDENCIES], [$gtk_modules]) AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_LIBS]) GTK_VERSION=`$PKG_CONFIG --modversion $gtk_package` +AC_SUBST([GTK_VERSION]) GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) # GTHREAD checks gthread_modules="gthread-2.0" @@ -155,6 +156,7 @@ AC_CONFIG_FILES([ doc/geany.1 geany.spec geany.pc + geany.nsi doc/Doxyfile tests/Makefile tests/ctags/Makefile Modified: geany.nsi.in 23 lines changed, 18 insertions(+), 5 deletions(-) =================================================================== @@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "1.25" -!define PRODUCT_VERSION_ID "1.25.0.0" +!define PRODUCT_VERSION "@VERSION@" +!define PRODUCT_VERSION_ID "@VERSION@.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" @@ -42,6 +42,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista !define PRODUCT_REGNAME "Geany.ProjectFile" !define PRODUCT_EXT ".geany" !define RESOURCEDIR "geany-${PRODUCT_VERSION}" +!define GTK_VERSION @GTK_VERSION@ ;;;;;;;;;;;;;;;;;;;;; ; Version resource ; @@ -124,13 +125,17 @@ Section "!Program Files" SEC01 SetOutPath "$INSTDIR\bin" File "${RESOURCEDIR}\bin\Geany.exe" - File "${RESOURCEDIR}\bin\Geany*.dll" + File "${RESOURCEDIR}\bin\*Geany*.dll" SetOutPath "$INSTDIR\data" File "${RESOURCEDIR}\data\GPL-2" File "${RESOURCEDIR}\data\file*" File "${RESOURCEDIR}\data\geany.glade" +!if ${GTK_VERSION} >= 3 + File "${RESOURCEDIR}\data\geany.css" +!else File "${RESOURCEDIR}\data\geany.gtkrc" +!endif File "${RESOURCEDIR}\data\snippets.conf" File "${RESOURCEDIR}\data\ui_toolbar.xml" @@ -205,7 +210,7 @@ SectionEnd ; Include GTK runtime library but only if desired from command line !ifdef INCLUDE_GTK -Section "GTK 2.24 Runtime Environment" SEC06 +Section "GTK ${GTK_VERSION} Runtime Environment" SEC06 SectionIn 1 SetOverwrite ifnewer SetOutPath "$INSTDIR\bin" @@ -216,6 +221,14 @@ Section "GTK 2.24 Runtime Environment" SEC06 File /r "gtk\lib\*" SetOutPath "$INSTDIR\share\themes" File /r "gtk\share\themes\*" +!if ${GTK_VERSION} >= 3 + SetOutPath "$INSTDIR\share\icons" + File /r "gtk\share\icons\*" + SetOutPath "$INSTDIR\share\glib-2.0" + File /r "gtk\share\glib-2.0\*" + SetOutPath "$INSTDIR\share\gtk-3.0" + File /r "gtk\share\gtk-3.0\*" +!endif SectionEnd !endif @@ -326,7 +339,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format." !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols." !ifdef INCLUDE_GTK -!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.24 or higher), you can skip it." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (${GTK_VERSION} or higher), you can skip it." !endif !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'" !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar" Modified: scripts/gtk-bundle-from-msys2.sh 109 lines changed, 109 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,109 @@ +#!/bin/sh + +ABI=i686 + +GLIB= +ADW= +GTK= + +use_cache="no" +make_zip="no" +gtkv="3" + +for opt in "$@"; do + case "$opt" in + "-c"|"--cache") + use_cache="yes" + ;; + "-z"|"--zip") + make_zip="yes" + ;; + "-2") + gtkv="2" + ;; + "-3") + gtkv="3" + ;; + "-h"|"--help") + echo "gtk-bundle-from-msys2.sh [-c] [-z] [-2 | -3]" + echo " -c Use pacman cache. Otherwise pacman will download" + echo " archive files" + echo " -z Create a zip afterwards" + echo " -2 Prefer gtk2" + echo " -3 Prefer gtk3" + exit 1 + ;; + *) + cachedir="$opt" + ;; + esac +done + +if [ -z "$cachedir" ]; then + cachedir="/var/cache/pacman/pkg" +fi + +if [ "$use_cache" = "yes" ] && ! [ -d "$cachedir" ]; then + echo "Cache dir \"$cachedir\" not a directory" + exit 1 +fi + +gtk="gtk$gtkv" + +getpkg() { + if [ "$use_cache" = "yes" ]; then + ls $cachedir/mingw-w64-$ABI-$1-* | sort -V | tail -n 1 + else + pacman -Sp mingw-w64-$ABI-$1 + fi +} + +GLIB=$(getpkg glib2) +ATK=$(getpkg atk) +PANGO=$(getpkg pango) +CAIRO=$(getpkg cairo) +ADW=$(getpkg adwaita-icon-theme) +GTK=$(getpkg $gtk) + +cat <<EOF +Using: +glib: $GLIB +atk: $ATK +pango: $PANGO +cairo: $CAIRO +adwaita $ADW +$gtk: $GTK +EOF + + +for i in $GLIB $ATK $PANGO $CAURIO $ADW $GTK; do + if [ "$use_cache" = "yes" -a -e "$i" ]; then + echo "Extracting $i from cache" + tar xaf $i + else + echo "Download $i using curl" + curl -L "$i" | tar -x --xz + fi + echo "Running post_install script" + test -f .INSTALL && /bin/bash -c ". .INSTALL; post_install" + if [ "$make_zip" = "yes" -a "$i" = "$GTK" ]; then + VERSION=$(grep ^pkgver .PKGINFO | sed -e 's,^pkgver = ,,' -e 's,-.*$,,') + fi + rm -f .INSTALL .MTREE .PKGINFO +done + +if [ -d mingw32 ]; then + for d in bin etc include lib locale share; do + rm -rf $d + mv mingw32/$d . + done + rmdir mingw32 +fi + +if [ "$make_zip" = "yes" ]; then + if [ -z "$VERSION" ]; then + VERSION="unknown-version" + fi + echo "Packing the bundle" + zip -r gtk-$VERSION.zip bin etc include lib locale share +fi Modified: src/Makefile.am 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -26,9 +26,10 @@ lib_LTLIBRARIES = libgeany.la geany_SOURCES = main.c geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) +geany_LDFLAGS = if ENABLE_BINRELOC -geany_LDFLAGS = -Wl,-rpath='$$ORIGIN/../lib' +geany_LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib' endif geany_includedir = $(includedir)/geany @@ -147,11 +148,12 @@ WINDRES = $(host_alias)-windres geany_private.res: $(top_srcdir)/geany_private.rc $(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff -libgeany_la_SOURCES += win32.c win32.h +libgeany_la_SOURCES += win32.c win32.h win32defines.h libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32 libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined +geany_LDFLAGS += -mwindows -mms-bitfields -CLEANFILES += geany_private.res +CLEANFILES += geany_private.res else # build Geany for all other platforms Modified: src/socket.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -79,6 +79,7 @@ # include <netinet/in.h> # include <glib/gstdio.h> #else +# include "win32defines.h" # include <winsock2.h> # include <windows.h> # include <gdk/gdkwin32.h> Modified: src/spawn.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -49,6 +49,7 @@ #include "spawn.h" #ifdef G_OS_WIN32 +# include "win32defines.h" # include <ctype.h> /* isspace() */ # include <fcntl.h> /* _O_RDONLY, _O_WRONLY */ # include <io.h> /* _open_osfhandle, _close */ Modified: src/win32.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,6 +31,8 @@ #ifdef G_OS_WIN32 +#include "win32defines.h" + #include "dialogs.h" #include "document.h" #include "editor.h" @@ -47,8 +49,6 @@ #include <stdlib.h> #include <string.h> -#define VC_EXTRALEAN -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> #include <shellapi.h> Modified: src/win32defines.h 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,31 @@ +/* + * win32defines.h - this file is part of Geany, a fast and lightweight IDE + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef WIN32DEFINES_H +#define WIN32DEFINES_H 1 + +/* These defines are necessary defines *before* windows.h is included */ + +#define VC_EXTRALEAN +#define WIN32_LEAN_AND_MEAN +/* Need Windows XP for SHGetFolderPathAndSubDirW */ +#define WINVER 0x0501 +/* Needed for SHGFP_TYPE */ +#define _WIN32_IE 0x0500 + +#endif /* WIN32DEFINES_H */ Modified: win32-config.h 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -317,9 +317,3 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1 - -// Need Windows XP for SHGetFolderPathAndSubDirW -#define WINVER 0x0501 - -// Needed for SHGFP_TYPE -#define _WIN32_IE 0x0500 Modified: wscript 13 lines changed, 10 insertions(+), 3 deletions(-) =================================================================== @@ -239,6 +239,7 @@ def configure(conf): mandatory=True, args='--cflags --libs') # remember GTK version for the build step conf.env['gtk_package_name'] = gtk_package_name + conf.env['gtk_version'] = gtk_version conf.env['minimum_gtk_version'] = minimum_gtk_version conf.env['use_gtk3'] = conf.options.use_gtk3 @@ -274,9 +275,6 @@ but you then may not have a local copy of the HTML manual.''' '-static-libgcc', '-static-libstdc++']) conf.env.append_value('LIB_WIN32', ['wsock32', 'uuid', 'ole32', 'comdlg32']) - # explicitly define Windows version for older Mingw environments - conf.define('WINVER', '0x0501', quote=False) # for SHGetFolderPathAndSubDirW - conf.define('_WIN32_IE', '0x0500', quote=False) # for SHGFP_TYPE else: conf.env['cshlib_PATTERN'] = '%s.so' # DATADIR and LOCALEDIR are defined by the intltool tool @@ -570,6 +568,15 @@ def build(bld): 'datadir': '${datarootdir}', 'localedir': '${datarootdir}/locale'}) + # geany.nsi + bld( + features = 'subst', + source = 'geany.nsi.in', + target = 'geany.nsi', + dct = {'VERSION': VERSION, + 'GTK_VERSION': bld.env['gtk_version']}, + install_path = None) + if not is_win32: # geany.desktop if bld.env['INTLTOOL']: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 71ce7c: win32: Add some window-specifc LDFLAGS to geany itself as well
by Thomas Martitz 05 Jul '15

05 Jul '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Sun, 05 Jul 2015 16:28:20 UTC Commit: 71ce7c077d05353adbe1f0a78cc3c5204ceeb1ec https://github.com/geany/geany/commit/71ce7c077d05353adbe1f0a78cc3c5204ceeb… Log Message: ----------- win32: Add some window-specifc LDFLAGS to geany itself as well Since we build libgeany some ld flags were applied to libgeany only. Some of them need to be applied to the main binary as well. This fixes the problem that a sticky terminal window starts together with geany. Modified Paths: -------------- src/Makefile.am Modified: src/Makefile.am 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -26,9 +26,10 @@ lib_LTLIBRARIES = libgeany.la geany_SOURCES = main.c geany_LDADD = libgeany.la $(GTK_LIBS) $(GTHREAD_LIBS) $(INTLLIBS) +geany_LDFLAGS = if ENABLE_BINRELOC -geany_LDFLAGS = -Wl,-rpath='$$ORIGIN/../lib' +geany_LDFLAGS += -Wl,-rpath='$$ORIGIN/../lib' endif geany_includedir = $(includedir)/geany @@ -150,8 +151,9 @@ geany_private.res: $(top_srcdir)/geany_private.rc libgeany_la_SOURCES += win32.c win32.h win32defines.h libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32 libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined +geany_LDFLAGS += -mwindows -mms-bitfields -CLEANFILES += geany_private.res +CLEANFILES += geany_private.res else # build Geany for all other platforms -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9224c3: win32: run geany.nsi.in through automake to replace @GTK_VERSION@ variable
by Thomas Martitz 05 Jul '15

05 Jul '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Sun, 05 Jul 2015 16:28:09 UTC Commit: 9224c3c3912960e321d29875353cb166427060e6 https://github.com/geany/geany/commit/9224c3c3912960e321d29875353cb16642706… Log Message: ----------- win32: run geany.nsi.in through automake to replace @GTK_VERSION@ variable This automatically keeps the installer's idea of Gtk version with the one used to compile geany in sync. Traditionally we use the bundles from gtk.org to compile geany, and this is also used for the installer. With msys2, we can use precompiled msys2 binaries. These exist for GTK3 as well so we can actually provide a GTK3 based installer. The installer naturually should reflect this. Msys2's GTK2 is also newer. Use the new script gtk-bundle-from-msys2.sh to extract the precompiled GTK binaries from msys2 / pacman for packing the installer (can also be used to make a zip for sharing). mkdir gtk; cd gtk; ../scripts/gtk-bundle-from-msys.sh [-c] [-z] [-2 | -3] waf is also adapted to process geany.nsi.in. This implies geany.nsi is now under _build_, not in the root anymore. Modified Paths: -------------- .gitignore configure.ac geany.nsi.in scripts/gtk-bundle-from-msys2.sh wscript Modified: .gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,7 @@ Makefile.in /geany.glade.bak /geany.gladep.bak /geany.pc +/geany.nsi /geany.spec /geany_private.res /global.tags.old Modified: configure.ac 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -81,6 +81,7 @@ AC_SUBST([DEPENDENCIES], [$gtk_modules]) AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_LIBS]) GTK_VERSION=`$PKG_CONFIG --modversion $gtk_package` +AC_SUBST([GTK_VERSION]) GEANY_STATUS_ADD([Using GTK version], [${GTK_VERSION}]) # GTHREAD checks gthread_modules="gthread-2.0" @@ -155,6 +156,7 @@ AC_CONFIG_FILES([ doc/geany.1 geany.spec geany.pc + geany.nsi doc/Doxyfile tests/Makefile tests/ctags/Makefile Modified: geany.nsi.in 23 lines changed, 18 insertions(+), 5 deletions(-) =================================================================== @@ -32,8 +32,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ; helper defines ; ;;;;;;;;;;;;;;;;;;; !define PRODUCT_NAME "Geany" -!define PRODUCT_VERSION "1.25" -!define PRODUCT_VERSION_ID "1.25.0.0" +!define PRODUCT_VERSION "@VERSION@" +!define PRODUCT_VERSION_ID "@VERSION@.0.0" !define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_DIR_REGKEY "Software\Geany" @@ -42,6 +42,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista !define PRODUCT_REGNAME "Geany.ProjectFile" !define PRODUCT_EXT ".geany" !define RESOURCEDIR "geany-${PRODUCT_VERSION}" +!define GTK_VERSION @GTK_VERSION@ ;;;;;;;;;;;;;;;;;;;;; ; Version resource ; @@ -124,13 +125,17 @@ Section "!Program Files" SEC01 SetOutPath "$INSTDIR\bin" File "${RESOURCEDIR}\bin\Geany.exe" - File "${RESOURCEDIR}\bin\Geany*.dll" + File "${RESOURCEDIR}\bin\*Geany*.dll" SetOutPath "$INSTDIR\data" File "${RESOURCEDIR}\data\GPL-2" File "${RESOURCEDIR}\data\file*" File "${RESOURCEDIR}\data\geany.glade" +!if ${GTK_VERSION} >= 3 + File "${RESOURCEDIR}\data\geany.css" +!else File "${RESOURCEDIR}\data\geany.gtkrc" +!endif File "${RESOURCEDIR}\data\snippets.conf" File "${RESOURCEDIR}\data\ui_toolbar.xml" @@ -205,7 +210,7 @@ SectionEnd ; Include GTK runtime library but only if desired from command line !ifdef INCLUDE_GTK -Section "GTK 2.24 Runtime Environment" SEC06 +Section "GTK ${GTK_VERSION} Runtime Environment" SEC06 SectionIn 1 SetOverwrite ifnewer SetOutPath "$INSTDIR\bin" @@ -216,6 +221,14 @@ Section "GTK 2.24 Runtime Environment" SEC06 File /r "gtk\lib\*" SetOutPath "$INSTDIR\share\themes" File /r "gtk\share\themes\*" +!if ${GTK_VERSION} >= 3 + SetOutPath "$INSTDIR\share\icons" + File /r "gtk\share\icons\*" + SetOutPath "$INSTDIR\share\glib-2.0" + File /r "gtk\share\glib-2.0\*" + SetOutPath "$INSTDIR\share\gtk-3.0" + File /r "gtk\share\gtk-3.0\*" +!endif SectionEnd !endif @@ -326,7 +339,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format." !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols." !ifdef INCLUDE_GTK -!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.24 or higher), you can skip it." +!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (${GTK_VERSION} or higher), you can skip it." !endif !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'" !insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar" Modified: scripts/gtk-bundle-from-msys2.sh 109 lines changed, 109 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,109 @@ +#!/bin/sh + +ABI=i686 + +GLIB= +ADW= +GTK= + +use_cache="no" +make_zip="no" +gtkv="3" + +for opt in "$@"; do + case "$opt" in + "-c"|"--cache") + use_cache="yes" + ;; + "-z"|"--zip") + make_zip="yes" + ;; + "-2") + gtkv="2" + ;; + "-3") + gtkv="3" + ;; + "-h"|"--help") + echo "gtk-bundle-from-msys2.sh [-c] [-z] [-2 | -3]" + echo " -c Use pacman cache. Otherwise pacman will download" + echo " archive files" + echo " -z Create a zip afterwards" + echo " -2 Prefer gtk2" + echo " -3 Prefer gtk3" + exit 1 + ;; + *) + cachedir="$opt" + ;; + esac +done + +if [ -z "$cachedir" ]; then + cachedir="/var/cache/pacman/pkg" +fi + +if [ "$use_cache" = "yes" ] && ! [ -d "$cachedir" ]; then + echo "Cache dir \"$cachedir\" not a directory" + exit 1 +fi + +gtk="gtk$gtkv" + +getpkg() { + if [ "$use_cache" = "yes" ]; then + ls $cachedir/mingw-w64-$ABI-$1-* | sort -V | tail -n 1 + else + pacman -Sp mingw-w64-$ABI-$1 + fi +} + +GLIB=$(getpkg glib2) +ATK=$(getpkg atk) +PANGO=$(getpkg pango) +CAIRO=$(getpkg cairo) +ADW=$(getpkg adwaita-icon-theme) +GTK=$(getpkg $gtk) + +cat <<EOF +Using: +glib: $GLIB +atk: $ATK +pango: $PANGO +cairo: $CAIRO +adwaita $ADW +$gtk: $GTK +EOF + + +for i in $GLIB $ATK $PANGO $CAURIO $ADW $GTK; do + if [ "$use_cache" = "yes" -a -e "$i" ]; then + echo "Extracting $i from cache" + tar xaf $i + else + echo "Download $i using curl" + curl -L "$i" | tar -x --xz + fi + echo "Running post_install script" + test -f .INSTALL && /bin/bash -c ". .INSTALL; post_install" + if [ "$make_zip" = "yes" -a "$i" = "$GTK" ]; then + VERSION=$(grep ^pkgver .PKGINFO | sed -e 's,^pkgver = ,,' -e 's,-.*$,,') + fi + rm -f .INSTALL .MTREE .PKGINFO +done + +if [ -d mingw32 ]; then + for d in bin etc include lib locale share; do + rm -rf $d + mv mingw32/$d . + done + rmdir mingw32 +fi + +if [ "$make_zip" = "yes" ]; then + if [ -z "$VERSION" ]; then + VERSION="unknown-version" + fi + echo "Packing the bundle" + zip -r gtk-$VERSION.zip bin etc include lib locale share +fi Modified: wscript 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -239,6 +239,7 @@ def configure(conf): mandatory=True, args='--cflags --libs') # remember GTK version for the build step conf.env['gtk_package_name'] = gtk_package_name + conf.env['gtk_version'] = gtk_version conf.env['minimum_gtk_version'] = minimum_gtk_version conf.env['use_gtk3'] = conf.options.use_gtk3 @@ -567,6 +568,15 @@ def build(bld): 'datadir': '${datarootdir}', 'localedir': '${datarootdir}/locale'}) + # geany.nsi + bld( + features = 'subst', + source = 'geany.nsi.in', + target = 'geany.nsi', + dct = {'VERSION': VERSION, + 'GTK_VERSION': bld.env['gtk_version']}, + install_path = None) + if not is_win32: # geany.desktop if bld.env['INTLTOOL']: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ba80af: win32: install a few more files needed by the installer
by Thomas Martitz 05 Jul '15

05 Jul '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Sun, 05 Jul 2015 16:25:24 UTC Commit: ba80af0822da934f6d11a1c7564d0013bdebf976 https://github.com/geany/geany/commit/ba80af0822da934f6d11a1c7564d0013bdebf… Log Message: ----------- win32: install a few more files needed by the installer Modified Paths: -------------- Makefile.am Modified: Makefile.am 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -44,6 +44,15 @@ uninstall-local: install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2 +if MINGW + $(INSTALL_DATA) $(srcdir)/AUTHORS $(DESTDIR)$(prefix)/Authors.txt + $(INSTALL_DATA) $(srcdir)/ChangeLog $(DESTDIR)$(prefix)/Changelog.txt + $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(prefix)/Copying.txt + $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(prefix)/Readme.txt + $(INSTALL_DATA) $(srcdir)/NEWS $(DESTDIR)$(prefix)/News.txt + $(INSTALL_DATA) $(srcdir)/THANKS $(DESTDIR)$(prefix)/Thanks.txt + $(INSTALL_DATA) $(srcdir)/TODO $(DESTDIR)$(prefix)/Todo.txt +endif dist-hook: @if test -d "$(top_srcdir)/.git"; then \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2e76e3: win32: port some defines from win32-config.h & waf to a new win32defines.h
by Thomas Martitz 05 Jul '15

05 Jul '15

Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Sun, 05 Jul 2015 16:25:24 UTC Commit: 2e76e3792e7d8a568aeadc5a9cdbf37c9eca8661 https://github.com/geany/geany/commit/2e76e3792e7d8a568aeadc5a9cdbf37c9eca8… Log Message: ----------- win32: port some defines from win32-config.h & waf to a new win32defines.h autotools based build system uses only config.h. This file was lacking some important defines. Rather than maintaining the defines in all build systems, we can simply define in a specialized header that is included by all .c files that use windows.h Modified Paths: -------------- src/Makefile.am src/socket.c src/spawn.c src/win32.c src/win32defines.h win32-config.h wscript Modified: src/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -147,7 +147,7 @@ WINDRES = $(host_alias)-windres geany_private.res: $(top_srcdir)/geany_private.rc $(WINDRES) -i $(top_srcdir)/geany_private.rc --input-format=rc -o $@ -O coff -libgeany_la_SOURCES += win32.c win32.h +libgeany_la_SOURCES += win32.c win32.h win32defines.h libgeany_la_LIBADD += -lole32 -lwsock32 -lcomdlg32 libgeany_la_LDFLAGS += -Wl,-luuid -mwindows -mms-bitfields -no-undefined Modified: src/socket.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -79,6 +79,7 @@ # include <netinet/in.h> # include <glib/gstdio.h> #else +# include "win32defines.h" # include <winsock2.h> # include <windows.h> # include <gdk/gdkwin32.h> Modified: src/spawn.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -49,6 +49,7 @@ #include "spawn.h" #ifdef G_OS_WIN32 +# include "win32defines.h" # include <ctype.h> /* isspace() */ # include <fcntl.h> /* _O_RDONLY, _O_WRONLY */ # include <io.h> /* _open_osfhandle, _close */ Modified: src/win32.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,6 +31,8 @@ #ifdef G_OS_WIN32 +#include "win32defines.h" + #include "dialogs.h" #include "document.h" #include "editor.h" @@ -47,8 +49,6 @@ #include <stdlib.h> #include <string.h> -#define VC_EXTRALEAN -#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> #include <shellapi.h> Modified: src/win32defines.h 31 lines changed, 31 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,31 @@ +/* + * win32defines.h - this file is part of Geany, a fast and lightweight IDE + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef WIN32DEFINES_H +#define WIN32DEFINES_H 1 + +/* These defines are necessary defines *before* windows.h is included */ + +#define VC_EXTRALEAN +#define WIN32_LEAN_AND_MEAN +/* Need Windows XP for SHGetFolderPathAndSubDirW */ +#define WINVER 0x0501 +/* Needed for SHGFP_TYPE */ +#define _WIN32_IE 0x0500 + +#endif /* WIN32DEFINES_H */ Modified: win32-config.h 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -317,9 +317,3 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1 - -// Need Windows XP for SHGetFolderPathAndSubDirW -#define WINVER 0x0501 - -// Needed for SHGFP_TYPE -#define _WIN32_IE 0x0500 Modified: wscript 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -274,9 +274,6 @@ but you then may not have a local copy of the HTML manual.''' '-static-libgcc', '-static-libstdc++']) conf.env.append_value('LIB_WIN32', ['wsock32', 'uuid', 'ole32', 'comdlg32']) - # explicitly define Windows version for older Mingw environments - conf.define('WINVER', '0x0501', quote=False) # for SHGetFolderPathAndSubDirW - conf.define('_WIN32_IE', '0x0500', quote=False) # for SHGFP_TYPE else: conf.env['cshlib_PATTERN'] = '%s.so' # DATADIR and LOCALEDIR are defined by the intltool tool -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2015