Branch: refs/heads/master
Author: Enrico Tröger <enrico.troeger(a)uvena.de>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Fri, 10 Apr 2015 14:15:58 UTC
Commit: 3d0bdbd6da48ea2000aff937b34baec57f98bb2b
https://github.com/geany/geany/commit/3d0bdbd6da48ea2000aff937b34baec57f98b…
Log Message:
-----------
waf: The GEANY_*_SYMBOL flags also need to be defined for C++
In Waf, we need to add the new flags to CFLAGS *and* CXXFLAGS otherwise
the Scintilla build would break.
To keep it more reabable, we first populate a temporary list
geany_symbol_flags which is then added to CFLAGS and CXXFLAGS.
Concerning the quote FIXME: no further qoting is necessary here.
Modified Paths:
--------------
wscript
Modified: wscript
13 lines changed, 7 insertions(+), 6 deletions(-)
===================================================================
@@ -308,17 +308,18 @@ but you then may not have a local copy of the HTML manual.'''
conf.write_config_header('config.h', remove=False)
# GEANY_EXPORT_SYMBOL and GEANY_API_SYMBOL
- # FIXME: should I put quoting in the appended values or are they passed as-is?
if is_win32:
- conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)'])
+ geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL=__declspec(dllexport)']
# FIXME: check for -fvisibility and the __attribute__((visibility)), or
# at least for GCC >= 4
elif conf.env['CC_NAME'] == 'gcc':
- conf.env.append_value('CFLAGS', ['-fvisibility=hidden',
- '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))'])
+ geany_symbol_flags = ['-fvisibility=hidden',
+ '-DGEANY_EXPORT_SYMBOL=__attribute__((visibility("default")))']
else: # unknown, define to nothing
- conf.env.append_value('CFLAGS', ['-DGEANY_EXPORT_SYMBOL='])
- conf.env.append_value('CFLAGS', ['-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL'])
+ geany_symbol_flags = ['-DGEANY_EXPORT_SYMBOL=']
+ geany_symbol_flags.append('-DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL')
+ conf.env.append_value('CFLAGS', geany_symbol_flags)
+ conf.env.append_value('CXXFLAGS', geany_symbol_flags)
# some more compiler flags
conf.env.append_value('CFLAGS', ['-DHAVE_CONFIG_H'])
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 09 Apr 2015 22:24:20 UTC
Commit: 4e6da78f54e8734dc84386c2df1610985da91931
https://github.com/geany/geany/commit/4e6da78f54e8734dc84386c2df1610985da91…
Log Message:
-----------
PHP: Use the variable style for variable interpolated in strings
Use the same variable style for simple interpolations ("$foo") than for
complex ones ("${foo}") instead of using the string style itself. This
gives a visual feedback for simple interpolations.
Modified Paths:
--------------
data/filetypes.html
Modified: data/filetypes.html
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -44,7 +44,7 @@
php_comment=comment
php_commentline=comment_line
php_operator=operator
-php_hstring_variable=string_2
+php_hstring_variable=preprocessor
php_complex_variable=preprocessor
jscript_start=tag
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Mon, 06 Apr 2015 18:59:20 UTC
Commit: 5cf2511945f9598530401f31b62403a3a40bd8b6
https://github.com/geany/geany/commit/5cf2511945f9598530401f31b62403a3a40bd…
Log Message:
-----------
icon: Adjust the color of the inside of the bottleneck
The (almost) black color of the inside of the bottleneck is a bit too high
contrast and doesn't fit the rest of the icon (the only black part of it).
Use the "lamp yellow" as the base and lower the L in HSL representation of
the color so it just looks as darker lamp material.
Modified Paths:
--------------
icons/scalable/geany.svg
Modified: icons/scalable/geany.svg
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -607,7 +607,7 @@
style="display:inline">
<path
sodipodi:type="arc"
- style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.22474468px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ style="color:#000000;fill:#816a24;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:1.22474467999999992px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path17203"
sodipodi:cx="3"
sodipodi:cy="20.5"
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).