Commits August 2023

commits@lists.geany.org

1 participants
19 discussions

[geany/geany] c5d5a5: Merge pull request #3522 from lucasvieites/patch-2
by Frank Lanitz 08 Aug '23

08 Aug '23

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 08 Aug 2023 21:45:49 UTC Commit: c5d5a577f6774642e65127a749431724556d7935 https://github.com/geany/geany/commit/c5d5a577f6774642e65127a749431724556d7… Log Message: ----------- Merge pull request #3522 from lucasvieites/patch-2 Update Spanish translation Modified Paths: -------------- po/es.po Modified: po/es.po 3265 lines changed, 1719 insertions(+), 1546 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ee2519: Small update of German translation
by Frank Lanitz 08 Aug '23

08 Aug '23

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 08 Aug 2023 21:43:11 UTC Commit: ee2519befb93597f988f58c23499ef06f5993e0e https://github.com/geany/geany/commit/ee2519befb93597f988f58c23499ef06f5993… Log Message: ----------- Small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 4016 lines changed, 2055 insertions(+), 1961 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a6c04e: Add helper script for generating ctags files in Python
by Enrico Tröger 05 Aug '23

05 Aug '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 04 Jun 2023 16:24:27 UTC Commit: a6c04edcd26f2d50b732989fca10e87e8567109e https://github.com/geany/geany/commit/a6c04edcd26f2d50b732989fca10e87e85671… Log Message: ----------- Add helper script for generating ctags files in Python Modified Paths: -------------- scripts/create_py_tags.py scripts/create_tags_helper.py Modified: scripts/create_py_tags.py 31 lines changed, 5 insertions(+), 26 deletions(-) =================================================================== @@ -23,17 +23,17 @@ # docker run --rm -it --user $(id -u):$(id -g) -v $(pwd):/data --workdir /data python:3.11-alpine python scripts/create_py_tags.py # -import datetime import importlib.util import inspect import os -import platform import re import sys import sysconfig import warnings from pathlib import Path +from create_tags_helper import format_tag, write_ctags_file + # treat all DeprecationWarnings as errors so we can catch them to ignore the corresponding modules warnings.filterwarnings('error', category=DeprecationWarning) @@ -56,15 +56,6 @@ TAG_REGEXP = re.compile(r'^[ \t]*(def|class)[ \t]+([a-zA-Z0-9_]+)[ \t]*($.*$)[:]') OBJECT_MEMORY_ADDRESS_REGEXP = re.compile(r'<(.+?) at 0x[0-9a-f]+(?:.+)>', flags=re.IGNORECASE) -CTAGS_FILE_HEADER = f'''!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ -!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ -!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ -!_TAG_OUTPUT_FILESEP slash /slash or backslash/ -!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ -!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ -!_TAG_PROGRAM_NAME scripts/create_py_tags.py Automatically generated file - do not edit (created on {datetime.datetime.now().ctime()} with Python {platform.python_version()}) -''' - # pylint: disable=no-else-return,no-self-use @@ -89,13 +80,7 @@ def _add_tag(self, object_name, object_, kind, module_path=None, parent=''): tag_key = (module_path, parent, object_name) if tag_key not in self.tags: signature = self._create_signature(object_) if object_ is not None else None - self.tags[tag_key] = self._format_tag(object_name, kind, signature, parent) - - def _format_tag(self, tagname, kind, signature, parent): - signature_field = f'\tsignature:{signature}' if signature else '' - parent_field = f'\tclass:{parent}' if parent else '' - - return f'{tagname}\t/unknown\t1;"\tkind:{kind}{parent_field}{signature_field}\n' + self.tags[tag_key] = format_tag(object_name, kind, signature, parent) def _get_safe_parameter_default_value(self, value): """ @@ -234,7 +219,7 @@ def _process_module_with_fallback_parser(self, module_filename): kind = KIND_CLASS if tag_type_str == 'class' else KIND_FUNCTION signature = args.strip() - self.tags[tagname] = self._format_tag(tagname, kind, signature, parent=None) + self.tags[tagname] = format_tag(tagname, kind, signature, parent=None) def add_builtins(self): """ @@ -253,13 +238,7 @@ def write_to_file(self, filename): @param filename (str) """ - result = sorted(self.tags.values()) - # write them - with open(filename, 'w') as target_file: - target_file.write(CTAGS_FILE_HEADER) - for symbol in result: - if symbol != '\n': # skip empty lines - target_file.write(symbol) + write_ctags_file(filename, self.tags.values(), sys.argv[0]) def is_import(object_, module_path): Modified: scripts/create_tags_helper.py 70 lines changed, 70 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 +# +# Author: The Geany contributors +# License: GPL v2 or later +# +# This is a helper library for Python scripts to create tag files in ctags format, +# e.g. create_py_tags.py and create_php_tags.py. +# + +import datetime +import platform + + +CTAGS_FILE_HEADER = '''!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ +!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ +!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ +!_TAG_OUTPUT_FILESEP slash /slash or backslash/ +!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ +!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ +!_TAG_PROGRAM_NAME {program_name} Automatically generated file - do not edit (created on {timestamp} with Python {python_version}) +''' + + +def format_tag(tagname, kind, signature, parent, return_type=None): + """ + @param tagname (str) + @param kind (str) + @param signature (str) + @param parent (str) + @param return_type (tuple of two elements or None) + + """ + if signature: + signature_field = f'\tsignature:{signature}' + else: + signature_field = '' + + if parent: + parent_field = f'\tclass:{parent}' + else: + parent_field = '' + + if return_type: + return_type_field = f'\ttyperef:{return_type[0]}:{return_type[1]}' + else: + return_type_field = '' + + return f'{tagname}\t/unknown\t1;"\tkind:{kind}{parent_field}{signature_field}{return_type_field}\n' + + +def write_ctags_file(filename, tags, program_name): + """ + Sort the found tags and write them into the file specified by filename + + @param filename (str) + @param tags (list) + @param program_name (str) + """ + result = sorted(tags) + + ctags_file_header = CTAGS_FILE_HEADER.format( + program_name=program_name, + timestamp=datetime.datetime.now().ctime(), + python_version=platform.python_version()) + + with open(filename, 'w', encoding='utf-8') as target_file: + target_file.write(ctags_file_header) + for symbol in result: + if symbol != '\n': # skip empty lines + target_file.write(symbol) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 49ce92: Generate PHP global tags in ctags format
by Enrico Tröger 05 Aug '23

05 Aug '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 04 Jun 2023 16:25:24 UTC Commit: 49ce92541e12d0bf35435f52dc8f1eb07dfee35e https://github.com/geany/geany/commit/49ce92541e12d0bf35435f52dc8f1eb07dfee… Log Message: ----------- Generate PHP global tags in ctags format Modified Paths: -------------- data/tags/std.php.tags scripts/create_php_tags.py Modified: data/tags/std.php.tags 18624 lines changed, 9317 insertions(+), 9307 deletions(-) =================================================================== No diff available, check online Modified: scripts/create_php_tags.py 39 lines changed, 15 insertions(+), 24 deletions(-) =================================================================== @@ -9,10 +9,12 @@ # to ../data/tags/std.php.tags (relative to the script's location, not $CWD). import re +import sys from json import loads from os.path import dirname, join from urllib.request import urlopen +from create_tags_helper import format_tag, write_ctags_file UPSTREAM_TAG_DEFINITION = 'http://doc.php.net/downloads/json/php_manual_en.json' PROTOTYPE_RE = r'^(?P<return_type>.*) {tag_name}(?P<arg_list>$.*$)$' @@ -23,12 +25,11 @@ TA_ARGLIST = 205 TA_SCOPE = 206 TA_VARTYPE = 207 -# TMTagType (src/tagmanager/tm_tag.h:49) -TYPE_CLASS = 1 -TYPE_FUNCTION = 16 -TYPE_MEMBER = 64 -TYPE_METHOD = 128 -TYPE_VARIABLE = 16384 + +# PHP kinds +KIND_CLASS = 'class' +KIND_FUNCTION = 'function' +KIND_VARIABLE = 'variable' def normalize_name(name): @@ -70,31 +71,21 @@ def parse_and_create_php_tags_file(): scope, tag_name = split_scope(tag_name) if tag_name[0] == '$': - tag_type = TYPE_MEMBER if scope is not None else TYPE_VARIABLE + kind = KIND_VARIABLE else: - tag_type = TYPE_METHOD if scope is not None else TYPE_FUNCTION - tag_list.append((tag_name, tag_type, return_type, arg_list, scope)) + kind = KIND_FUNCTION + + tag_list.append(format_tag(tag_name, kind, arg_list, scope, ('unknown', return_type))) # Also create a class tag when encountering a __construct() if tag_name == '__construct' and scope is not None: scope, tag_name = split_scope(scope) - tag_list.append((tag_name, TYPE_CLASS, None, arg_list, scope or '')) + tag_list.append(format_tag(tag_name, KIND_CLASS, arg_list, scope or '')) # write tags script_dir = dirname(__file__) - tags_file_path = join(script_dir, '..', 'data', 'tags', 'std.php.tags') - with open(tags_file_path, 'w', encoding='iso-8859-1') as tags_file: - tags_file.write('# format=tagmanager\n') - for tag_name, tag_type, return_type, arg_list, scope in sorted(tag_list): - tag_line = f'{tag_name}' - for attr, type_ in [(tag_type, TA_TYPE), - (arg_list, TA_ARGLIST), - (return_type, TA_VARTYPE), - (scope, TA_SCOPE)]: - if attr is not None: - tag_line += f'{type_:c}{attr}' - - tags_file.write(tag_line + '\n') - print(f'Created: {tags_file_path} with {len(tag_list)} tags') + filename = join(script_dir, '..', 'data', 'tags', 'std.php.tags') + write_ctags_file(filename, tag_list, sys.argv[0]) + print(f'Created: {filename} with {len(tag_list)} tags') if __name__ == '__main__': -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e806a5: Merge pull request #3512 from eht16/generate_php_global_tags_in_ctags_format
by Enrico Tröger 05 Aug '23

05 Aug '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 05 Aug 2023 21:06:34 UTC Commit: e806a54a9661bf39dd4af8a6c7daad5b6be8fa28 https://github.com/geany/geany/commit/e806a54a9661bf39dd4af8a6c7daad5b6be8f… Log Message: ----------- Merge pull request #3512 from eht16/generate_php_global_tags_in_ctags_format Generate PHP global tags in ctags format Modified Paths: -------------- data/tags/std.php.tags scripts/create_php_tags.py scripts/create_py_tags.py scripts/create_tags_helper.py Modified: data/tags/std.php.tags 18624 lines changed, 9317 insertions(+), 9307 deletions(-) =================================================================== No diff available, check online Modified: scripts/create_php_tags.py 39 lines changed, 15 insertions(+), 24 deletions(-) =================================================================== @@ -9,10 +9,12 @@ # to ../data/tags/std.php.tags (relative to the script's location, not $CWD). import re +import sys from json import loads from os.path import dirname, join from urllib.request import urlopen +from create_tags_helper import format_tag, write_ctags_file UPSTREAM_TAG_DEFINITION = 'http://doc.php.net/downloads/json/php_manual_en.json' PROTOTYPE_RE = r'^(?P<return_type>.*) {tag_name}(?P<arg_list>$.*$)$' @@ -23,12 +25,11 @@ TA_ARGLIST = 205 TA_SCOPE = 206 TA_VARTYPE = 207 -# TMTagType (src/tagmanager/tm_tag.h:49) -TYPE_CLASS = 1 -TYPE_FUNCTION = 16 -TYPE_MEMBER = 64 -TYPE_METHOD = 128 -TYPE_VARIABLE = 16384 + +# PHP kinds +KIND_CLASS = 'class' +KIND_FUNCTION = 'function' +KIND_VARIABLE = 'variable' def normalize_name(name): @@ -70,31 +71,21 @@ def parse_and_create_php_tags_file(): scope, tag_name = split_scope(tag_name) if tag_name[0] == '$': - tag_type = TYPE_MEMBER if scope is not None else TYPE_VARIABLE + kind = KIND_VARIABLE else: - tag_type = TYPE_METHOD if scope is not None else TYPE_FUNCTION - tag_list.append((tag_name, tag_type, return_type, arg_list, scope)) + kind = KIND_FUNCTION + + tag_list.append(format_tag(tag_name, kind, arg_list, scope, ('unknown', return_type))) # Also create a class tag when encountering a __construct() if tag_name == '__construct' and scope is not None: scope, tag_name = split_scope(scope) - tag_list.append((tag_name, TYPE_CLASS, None, arg_list, scope or '')) + tag_list.append(format_tag(tag_name, KIND_CLASS, arg_list, scope or '')) # write tags script_dir = dirname(__file__) - tags_file_path = join(script_dir, '..', 'data', 'tags', 'std.php.tags') - with open(tags_file_path, 'w', encoding='iso-8859-1') as tags_file: - tags_file.write('# format=tagmanager\n') - for tag_name, tag_type, return_type, arg_list, scope in sorted(tag_list): - tag_line = f'{tag_name}' - for attr, type_ in [(tag_type, TA_TYPE), - (arg_list, TA_ARGLIST), - (return_type, TA_VARTYPE), - (scope, TA_SCOPE)]: - if attr is not None: - tag_line += f'{type_:c}{attr}' - - tags_file.write(tag_line + '\n') - print(f'Created: {tags_file_path} with {len(tag_list)} tags') + filename = join(script_dir, '..', 'data', 'tags', 'std.php.tags') + write_ctags_file(filename, tag_list, sys.argv[0]) + print(f'Created: {filename} with {len(tag_list)} tags') if __name__ == '__main__': Modified: scripts/create_py_tags.py 31 lines changed, 5 insertions(+), 26 deletions(-) =================================================================== @@ -23,17 +23,17 @@ # docker run --rm -it --user $(id -u):$(id -g) -v $(pwd):/data --workdir /data python:3.11-alpine python scripts/create_py_tags.py # -import datetime import importlib.util import inspect import os -import platform import re import sys import sysconfig import warnings from pathlib import Path +from create_tags_helper import format_tag, write_ctags_file + # treat all DeprecationWarnings as errors so we can catch them to ignore the corresponding modules warnings.filterwarnings('error', category=DeprecationWarning) @@ -56,15 +56,6 @@ TAG_REGEXP = re.compile(r'^[ \t]*(def|class)[ \t]+([a-zA-Z0-9_]+)[ \t]*($.*$)[:]') OBJECT_MEMORY_ADDRESS_REGEXP = re.compile(r'<(.+?) at 0x[0-9a-f]+(?:.+)>', flags=re.IGNORECASE) -CTAGS_FILE_HEADER = f'''!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ -!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ -!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ -!_TAG_OUTPUT_FILESEP slash /slash or backslash/ -!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ -!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ -!_TAG_PROGRAM_NAME scripts/create_py_tags.py Automatically generated file - do not edit (created on {datetime.datetime.now().ctime()} with Python {platform.python_version()}) -''' - # pylint: disable=no-else-return,no-self-use @@ -89,13 +80,7 @@ def _add_tag(self, object_name, object_, kind, module_path=None, parent=''): tag_key = (module_path, parent, object_name) if tag_key not in self.tags: signature = self._create_signature(object_) if object_ is not None else None - self.tags[tag_key] = self._format_tag(object_name, kind, signature, parent) - - def _format_tag(self, tagname, kind, signature, parent): - signature_field = f'\tsignature:{signature}' if signature else '' - parent_field = f'\tclass:{parent}' if parent else '' - - return f'{tagname}\t/unknown\t1;"\tkind:{kind}{parent_field}{signature_field}\n' + self.tags[tag_key] = format_tag(object_name, kind, signature, parent) def _get_safe_parameter_default_value(self, value): """ @@ -234,7 +219,7 @@ def _process_module_with_fallback_parser(self, module_filename): kind = KIND_CLASS if tag_type_str == 'class' else KIND_FUNCTION signature = args.strip() - self.tags[tagname] = self._format_tag(tagname, kind, signature, parent=None) + self.tags[tagname] = format_tag(tagname, kind, signature, parent=None) def add_builtins(self): """ @@ -253,13 +238,7 @@ def write_to_file(self, filename): @param filename (str) """ - result = sorted(self.tags.values()) - # write them - with open(filename, 'w') as target_file: - target_file.write(CTAGS_FILE_HEADER) - for symbol in result: - if symbol != '\n': # skip empty lines - target_file.write(symbol) + write_ctags_file(filename, self.tags.values(), sys.argv[0]) def is_import(object_, module_path): Modified: scripts/create_tags_helper.py 70 lines changed, 70 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,70 @@ +#!/usr/bin/env python3 +# +# Author: The Geany contributors +# License: GPL v2 or later +# +# This is a helper library for Python scripts to create tag files in ctags format, +# e.g. create_py_tags.py and create_php_tags.py. +# + +import datetime +import platform + + +CTAGS_FILE_HEADER = '''!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ +!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ +!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ +!_TAG_OUTPUT_FILESEP slash /slash or backslash/ +!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ +!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ +!_TAG_PROGRAM_NAME {program_name} Automatically generated file - do not edit (created on {timestamp} with Python {python_version}) +''' + + +def format_tag(tagname, kind, signature, parent, return_type=None): + """ + @param tagname (str) + @param kind (str) + @param signature (str) + @param parent (str) + @param return_type (tuple of two elements or None) + + """ + if signature: + signature_field = f'\tsignature:{signature}' + else: + signature_field = '' + + if parent: + parent_field = f'\tclass:{parent}' + else: + parent_field = '' + + if return_type: + return_type_field = f'\ttyperef:{return_type[0]}:{return_type[1]}' + else: + return_type_field = '' + + return f'{tagname}\t/unknown\t1;"\tkind:{kind}{parent_field}{signature_field}{return_type_field}\n' + + +def write_ctags_file(filename, tags, program_name): + """ + Sort the found tags and write them into the file specified by filename + + @param filename (str) + @param tags (list) + @param program_name (str) + """ + result = sorted(tags) + + ctags_file_header = CTAGS_FILE_HEADER.format( + program_name=program_name, + timestamp=datetime.datetime.now().ctime(), + python_version=platform.python_version()) + + with open(filename, 'w', encoding='utf-8') as target_file: + target_file.write(ctags_file_header) + for symbol in result: + if symbol != '\n': # skip empty lines + target_file.write(symbol) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7daf6e: Update NSIS filetype keywords
by Enrico Tröger 05 Aug '23

05 Aug '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 07 May 2023 08:38:05 UTC Commit: 7daf6eec76aa2e52afd4b208456a3692f6b6f0e4 https://github.com/geany/geany/commit/7daf6eec76aa2e52afd4b208456a3692f6b6f… Log Message: ----------- Update NSIS filetype keywords Created by "scripts/update-nsis-functions.sh". Modified Paths: -------------- data/filedefs/filetypes.nsis Modified: data/filedefs/filetypes.nsis 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -23,8 +23,8 @@ commentbox=comment [keywords] # all items must be in one line and in lowercase -functions=!addincludedir !addplugindir !appendfile !cd !define !delfile !echo !else !endif !error !execute !finalize !getdllversion !gettlbversion !if !ifdef !ifmacrodef !ifmacrondef !ifndef !include !insertmacro !macro !macroend !macroundef !makensis !packhdr !pragma !searchparse !searchreplace !system !tempfile !undef !verbose !warning abort addbrandingimage addsize allowrootdirinstall allowskipfiles autoclosewindow bgfont bggradient brandingtext bringtofront cpu crccheck call callinstdll caption changeui checkbitmap clearerrors completedtext componenttext copyfiles createdirectory createfont createshortcut delete deleteinisec deleteinistr deleteregkey deleteregvalue detailprint detailsbuttontext dirshow dirtext dirvar dirverify enablewindow enumregkey enumregvalue exch exec execshell execshellwait execwait expandenvstrings file filebufsize fileclose fileerrortext fileopen fileread filereadbyte filereadutf16le filereadword fileseek filewrite filewritebyte filewriteutf16le filewriteword findclose findfirst findnext findwindow flushini function functionend getcurinsttype getcurrentaddress getdllversion getdllversionlocal getdlgitem geterrorlevel getfiletime getfiletimelocal getfullpathname getfunctionaddress getinstdirerror getlabeladdress gettempfilename goto hidewindow icon ifabort iferrors iffileexists ifrebootflag ifsilent initpluginsdir instprogressflags insttype insttypegettext insttypesettext installbuttontext installcolors installdir installdirregkey int64cmp int64cmpu int64fmt intcmp intcmpu intfmt intop intptrcmp intptrcmpu intptrop iswindow langstring langstringup licensebkcolor licensedata licenseforceselection licenselangstring licensetext loadandsetimage loadlanguagefile lockwindow logset logtext manifestdpiaware manifestdpiawareness manifestdisablewindowfiltering manifestgdiscaling manifestmaxversiontested manifestsupportedos messagebox miscbuttontext name nop outfile peaddresource pedllcharacteristics peremoveresource pesubsysver page page pagecallbacks pageex pageexend pop push quit rmdir readenvstr readinistr readregdword readregstr reboot regdll rename requestexecutionlevel reservefile return searchpath section sectionend sectiongetflags sectiongetinsttypes sectiongetsize sectiongettext sectiongroup sectiongroupend sectionin sectionsetflags sectionsetinsttypes sectionsetsize sectionsettext sendmessage setautoclose setbrandingimage setcompress setcompressionlevel setcompressor setcompressordictsize setctlcolors setcurinsttype setdatablockoptimize setdatesave setdetailsprint setdetailsview seterrorlevel seterrors setfileattributes setfont setoutpath setoverwrite setpluginunload setrebootflag setregview setshellvarcontext setsilent showinstdetails showuninstdetails showwindow silentinstall silentuninstall sleep spacetexts strcmp strcmps strcpy strlen subcaption subsection subsectionend target unregdll unicode uninstpage uninstpage uninstallbuttontext uninstallcaption uninstallexename uninstallicon uninstallsubcaption uninstalltext unsafestrcpy viaddversionkey vifileversion viproductversion var windowicon writeinistr writeregbin writeregdword writeregexpandstr writeregmultistr writeregnone writeregstr writeuninstaller xpstyle -variables=${nsisdir} $0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $r0 $r1 $r2 $r3 $r4 $r5 $r6 $r7 $r8 $r9 $\n $\r $\t $$ $admintools $appdata $cdburn_area $cmdline $commonfiles $commonfiles32 $commonfiles64 $cookies $desktop $documents $exedir $exefile $exepath $favorites $fonts $history $hwndparent $instdir $internet_cache $language $localappdata $music $nethood $outdir $pictures $pluginsdir $printhood $profile $programfiles $programfiles32 $programfiles64 $quicklaunch $recent $resources $resources_localized $sendto $smprograms $smstartup $startmenu $sysdir $temp $templates $videos $windir $_click $_outdir +functions=!addincludedir !addplugindir !appendfile !assert !cd !define !delfile !echo !else !endif !error !execute !finalize !getdllversion !gettlbversion !if !ifdef !ifmacrodef !ifmacrondef !ifndef !include !insertmacro !macro !macroend !macroundef !makensis !packhdr !pragma !searchparse !searchreplace !system !tempfile !undef !uninstfinalize !verbose !warning abort addbrandingimage addsize allowrootdirinstall allowskipfiles autoclosewindow bgfont bggradient brandingtext bringtofront cpu crccheck call callinstdll caption changeui checkbitmap clearerrors completedtext componenttext copyfiles createdirectory createfont createshortcut delete deleteinisec deleteinistr deleteregkey deleteregvalue detailprint detailsbuttontext dirshow dirtext dirvar dirverify enablewindow enumregkey enumregvalue exch exec execshell execshellwait execwait expandenvstrings file filebufsize fileclose fileerrortext fileopen fileread filereadbyte filereadutf16le filereadword fileseek filewrite filewritebyte filewriteutf16le filewriteword findclose findfirst findnext findwindow flushini function functionend getcurinsttype getcurrentaddress getdllversion getdllversionlocal getdlgitem geterrorlevel getfiletime getfiletimelocal getfullpathname getfunctionaddress getinstdirerror getknownfolderpath getlabeladdress getregview getshellvarcontext gettempfilename getwinver goto hidewindow icon ifabort ifaltregview iferrors iffileexists ifrebootflag ifrtllanguage ifshellvarcontextall ifsilent initpluginsdir instprogressflags insttype insttypegettext insttypesettext installbuttontext installcolors installdir installdirregkey int64cmp int64cmpu int64fmt intcmp intcmpu intfmt intop intptrcmp intptrcmpu intptrop iswindow langstring langstringup licensebkcolor licensedata licenseforceselection licenselangstring licensetext loadandsetimage loadlanguagefile lockwindow logset logtext manifestappendcustomstring manifestdpiaware manifestdpiawareness manifestdisablewindowfiltering manifestgdiscaling manifestlongpathaware manifestmaxversiontested manifestsupportedos messagebox miscbuttontext name nop outfile peaddresource pedllcharacteristics peremoveresource pesubsysver page page pagecallbacks pageex pageexend pop push quit rmdir readenvstr readinistr readmemory readregdword readregstr reboot regdll rename requestexecutionlevel reservefile return searchpath section sectionend sectiongetflags sectiongetinsttypes sectiongetsize sectiongettext sectiongroup sectiongroupend sectionin sectioninsttype sectionsetflags sectionsetinsttypes sectionsetsize sectionsettext sendmessage setautoclose setbrandingimage setcompress setcompressionlevel setcompressor setcompressordictsize setctlcolors setcurinsttype setdatablockoptimize setdatesave setdetailsprint setdetailsview seterrorlevel seterrors setfileattributes setfont setoutpath setoverwrite setpluginunload setrebootflag setregview setshellvarcontext setsilent showinstdetails showuninstdetails showwindow silentinstall silentuninstall sleep spacetexts strcmp strcmps strcpy strlen subcaption subsection subsectionend target unregdll unicode uninstpage uninstpage uninstallbuttontext uninstallcaption uninstallexename uninstallicon uninstallsubcaption uninstalltext unsafestrcpy viaddversionkey vifileversion viproductversion var windowicon writeinistr writeregbin writeregdword writeregexpandstr writeregmultistr writeregnone writeregstr writeuninstaller xpstyle +variables=${nsisdir} $0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $r0 $r1 $r2 $r3 $r4 $r5 $r6 $r7 $r8 $r9 $\n $\r $\t $$ $admintools $appdata $cdburn_area $cmdline $commondesktop $commonfiles $commonfiles32 $commonfiles64 $commonlocalappdata $commonprogramdata $commonsmprograms $commonstartmenu $commontemplates $cookies $desktop $documents $exedir $exefile $exepath $favorites $fonts $history $hwndparent $instdir $internet_cache $language $localappdata $music $nethood $outdir $pictures $pluginsdir $printhood $profile $programfiles $programfiles32 $programfiles64 $quicklaunch $recent $resources $resources_localized $sendto $smprograms $smstartup $startmenu $sysdir $temp $templates $userappdata $userdesktop $userlocalappdata $usersmprograms $userstartmenu $usertemplates $videos $windir $_click $_outdir lables=all alt alwaysoff archive auto both bottom bzip2 center colored components control current custom directory dlg_id ext false file_attribute_archive file_attribute_hidden file_attribute_normal file_attribute_offline file_attribute_readonly file_attribute_system file_attribute_temporary filesonly force hidden hide hkcc hkcr hkcu hkdd hkey_classes_root hkey_current_config hkey_current_user hkey_dyn_data hkey_local_machine hkey_performance_data hkey_users hklm hkpd hku idabort idcancel idignore idno idok idretry idyes ifdiff ifnewer instfiles italic lastused leave left license listonly lzma manual mb_abortretryignore mb_defbutton1 mb_defbutton2 mb_defbutton3 mb_defbutton4 mb_iconexclamation mb_iconinformation mb_iconquestion mb_iconstop mb_ok mb_okcancel mb_retrycancel mb_right mb_setforeground mb_topmost mb_yesno mb_yesnocancel nevershow none nonfatal normal of off offline on open print readonly rebootok right shctx shift show silent silentlog smooth strike sw_hide sw_showmaximized sw_showmaximized sw_showminimized sw_showminimized sw_showminnoactive sw_showna sw_shownoactivate sw_shownormal sw_shownormal system temporary textonly top trim true try underline uninstconfirm zlib userdefined= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a3518b: Merge pull request #3487 from eht16/update_nsis_keywords
by Enrico Tröger 05 Aug '23

05 Aug '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 05 Aug 2023 21:04:42 UTC Commit: a3518b7c41371e3e022cec7949b880cc22faf7d1 https://github.com/geany/geany/commit/a3518b7c41371e3e022cec7949b880cc22faf… Log Message: ----------- Merge pull request #3487 from eht16/update_nsis_keywords Update NSIS filetype keywords Modified Paths: -------------- data/filedefs/filetypes.nsis Modified: data/filedefs/filetypes.nsis 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -23,8 +23,8 @@ commentbox=comment [keywords] # all items must be in one line and in lowercase -functions=!addincludedir !addplugindir !appendfile !cd !define !delfile !echo !else !endif !error !execute !finalize !getdllversion !gettlbversion !if !ifdef !ifmacrodef !ifmacrondef !ifndef !include !insertmacro !macro !macroend !macroundef !makensis !packhdr !pragma !searchparse !searchreplace !system !tempfile !undef !verbose !warning abort addbrandingimage addsize allowrootdirinstall allowskipfiles autoclosewindow bgfont bggradient brandingtext bringtofront cpu crccheck call callinstdll caption changeui checkbitmap clearerrors completedtext componenttext copyfiles createdirectory createfont createshortcut delete deleteinisec deleteinistr deleteregkey deleteregvalue detailprint detailsbuttontext dirshow dirtext dirvar dirverify enablewindow enumregkey enumregvalue exch exec execshell execshellwait execwait expandenvstrings file filebufsize fileclose fileerrortext fileopen fileread filereadbyte filereadutf16le filereadword fileseek filewrite filewritebyte filewriteutf16le filewriteword findclose findfirst findnext findwindow flushini function functionend getcurinsttype getcurrentaddress getdllversion getdllversionlocal getdlgitem geterrorlevel getfiletime getfiletimelocal getfullpathname getfunctionaddress getinstdirerror getlabeladdress gettempfilename goto hidewindow icon ifabort iferrors iffileexists ifrebootflag ifsilent initpluginsdir instprogressflags insttype insttypegettext insttypesettext installbuttontext installcolors installdir installdirregkey int64cmp int64cmpu int64fmt intcmp intcmpu intfmt intop intptrcmp intptrcmpu intptrop iswindow langstring langstringup licensebkcolor licensedata licenseforceselection licenselangstring licensetext loadandsetimage loadlanguagefile lockwindow logset logtext manifestdpiaware manifestdpiawareness manifestdisablewindowfiltering manifestgdiscaling manifestmaxversiontested manifestsupportedos messagebox miscbuttontext name nop outfile peaddresource pedllcharacteristics peremoveresource pesubsysver page page pagecallbacks pageex pageexend pop push quit rmdir readenvstr readinistr readregdword readregstr reboot regdll rename requestexecutionlevel reservefile return searchpath section sectionend sectiongetflags sectiongetinsttypes sectiongetsize sectiongettext sectiongroup sectiongroupend sectionin sectionsetflags sectionsetinsttypes sectionsetsize sectionsettext sendmessage setautoclose setbrandingimage setcompress setcompressionlevel setcompressor setcompressordictsize setctlcolors setcurinsttype setdatablockoptimize setdatesave setdetailsprint setdetailsview seterrorlevel seterrors setfileattributes setfont setoutpath setoverwrite setpluginunload setrebootflag setregview setshellvarcontext setsilent showinstdetails showuninstdetails showwindow silentinstall silentuninstall sleep spacetexts strcmp strcmps strcpy strlen subcaption subsection subsectionend target unregdll unicode uninstpage uninstpage uninstallbuttontext uninstallcaption uninstallexename uninstallicon uninstallsubcaption uninstalltext unsafestrcpy viaddversionkey vifileversion viproductversion var windowicon writeinistr writeregbin writeregdword writeregexpandstr writeregmultistr writeregnone writeregstr writeuninstaller xpstyle -variables=${nsisdir} $0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $r0 $r1 $r2 $r3 $r4 $r5 $r6 $r7 $r8 $r9 $\n $\r $\t $$ $admintools $appdata $cdburn_area $cmdline $commonfiles $commonfiles32 $commonfiles64 $cookies $desktop $documents $exedir $exefile $exepath $favorites $fonts $history $hwndparent $instdir $internet_cache $language $localappdata $music $nethood $outdir $pictures $pluginsdir $printhood $profile $programfiles $programfiles32 $programfiles64 $quicklaunch $recent $resources $resources_localized $sendto $smprograms $smstartup $startmenu $sysdir $temp $templates $videos $windir $_click $_outdir +functions=!addincludedir !addplugindir !appendfile !assert !cd !define !delfile !echo !else !endif !error !execute !finalize !getdllversion !gettlbversion !if !ifdef !ifmacrodef !ifmacrondef !ifndef !include !insertmacro !macro !macroend !macroundef !makensis !packhdr !pragma !searchparse !searchreplace !system !tempfile !undef !uninstfinalize !verbose !warning abort addbrandingimage addsize allowrootdirinstall allowskipfiles autoclosewindow bgfont bggradient brandingtext bringtofront cpu crccheck call callinstdll caption changeui checkbitmap clearerrors completedtext componenttext copyfiles createdirectory createfont createshortcut delete deleteinisec deleteinistr deleteregkey deleteregvalue detailprint detailsbuttontext dirshow dirtext dirvar dirverify enablewindow enumregkey enumregvalue exch exec execshell execshellwait execwait expandenvstrings file filebufsize fileclose fileerrortext fileopen fileread filereadbyte filereadutf16le filereadword fileseek filewrite filewritebyte filewriteutf16le filewriteword findclose findfirst findnext findwindow flushini function functionend getcurinsttype getcurrentaddress getdllversion getdllversionlocal getdlgitem geterrorlevel getfiletime getfiletimelocal getfullpathname getfunctionaddress getinstdirerror getknownfolderpath getlabeladdress getregview getshellvarcontext gettempfilename getwinver goto hidewindow icon ifabort ifaltregview iferrors iffileexists ifrebootflag ifrtllanguage ifshellvarcontextall ifsilent initpluginsdir instprogressflags insttype insttypegettext insttypesettext installbuttontext installcolors installdir installdirregkey int64cmp int64cmpu int64fmt intcmp intcmpu intfmt intop intptrcmp intptrcmpu intptrop iswindow langstring langstringup licensebkcolor licensedata licenseforceselection licenselangstring licensetext loadandsetimage loadlanguagefile lockwindow logset logtext manifestappendcustomstring manifestdpiaware manifestdpiawareness manifestdisablewindowfiltering manifestgdiscaling manifestlongpathaware manifestmaxversiontested manifestsupportedos messagebox miscbuttontext name nop outfile peaddresource pedllcharacteristics peremoveresource pesubsysver page page pagecallbacks pageex pageexend pop push quit rmdir readenvstr readinistr readmemory readregdword readregstr reboot regdll rename requestexecutionlevel reservefile return searchpath section sectionend sectiongetflags sectiongetinsttypes sectiongetsize sectiongettext sectiongroup sectiongroupend sectionin sectioninsttype sectionsetflags sectionsetinsttypes sectionsetsize sectionsettext sendmessage setautoclose setbrandingimage setcompress setcompressionlevel setcompressor setcompressordictsize setctlcolors setcurinsttype setdatablockoptimize setdatesave setdetailsprint setdetailsview seterrorlevel seterrors setfileattributes setfont setoutpath setoverwrite setpluginunload setrebootflag setregview setshellvarcontext setsilent showinstdetails showuninstdetails showwindow silentinstall silentuninstall sleep spacetexts strcmp strcmps strcpy strlen subcaption subsection subsectionend target unregdll unicode uninstpage uninstpage uninstallbuttontext uninstallcaption uninstallexename uninstallicon uninstallsubcaption uninstalltext unsafestrcpy viaddversionkey vifileversion viproductversion var windowicon writeinistr writeregbin writeregdword writeregexpandstr writeregmultistr writeregnone writeregstr writeuninstaller xpstyle +variables=${nsisdir} $0 $1 $2 $3 $4 $5 $6 $7 $8 $9 $r0 $r1 $r2 $r3 $r4 $r5 $r6 $r7 $r8 $r9 $\n $\r $\t $$ $admintools $appdata $cdburn_area $cmdline $commondesktop $commonfiles $commonfiles32 $commonfiles64 $commonlocalappdata $commonprogramdata $commonsmprograms $commonstartmenu $commontemplates $cookies $desktop $documents $exedir $exefile $exepath $favorites $fonts $history $hwndparent $instdir $internet_cache $language $localappdata $music $nethood $outdir $pictures $pluginsdir $printhood $profile $programfiles $programfiles32 $programfiles64 $quicklaunch $recent $resources $resources_localized $sendto $smprograms $smstartup $startmenu $sysdir $temp $templates $userappdata $userdesktop $userlocalappdata $usersmprograms $userstartmenu $usertemplates $videos $windir $_click $_outdir lables=all alt alwaysoff archive auto both bottom bzip2 center colored components control current custom directory dlg_id ext false file_attribute_archive file_attribute_hidden file_attribute_normal file_attribute_offline file_attribute_readonly file_attribute_system file_attribute_temporary filesonly force hidden hide hkcc hkcr hkcu hkdd hkey_classes_root hkey_current_config hkey_current_user hkey_dyn_data hkey_local_machine hkey_performance_data hkey_users hklm hkpd hku idabort idcancel idignore idno idok idretry idyes ifdiff ifnewer instfiles italic lastused leave left license listonly lzma manual mb_abortretryignore mb_defbutton1 mb_defbutton2 mb_defbutton3 mb_defbutton4 mb_iconexclamation mb_iconinformation mb_iconquestion mb_iconstop mb_ok mb_okcancel mb_retrycancel mb_right mb_setforeground mb_topmost mb_yesno mb_yesnocancel nevershow none nonfatal normal of off offline on open print readonly rebootok right shctx shift show silent silentlog smooth strike sw_hide sw_showmaximized sw_showmaximized sw_showminimized sw_showminimized sw_showminnoactive sw_showna sw_shownoactivate sw_shownormal sw_shownormal system temporary textonly top trim true try underline uninstconfirm zlib userdefined= -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 219888: Remove obsolete helper scripts (#3486)
by Enrico Tröger 05 Aug '23

05 Aug '23

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 05 Aug 2023 21:03:59 UTC Commit: 2198888ba1cb5e2e86dc780cc2fa4ce56a719c8f https://github.com/geany/geany/commit/2198888ba1cb5e2e86dc780cc2fa4ce56a719… Log Message: ----------- Remove obsolete helper scripts (#3486) * Remove obsolete helper scripts scripts/changelist.pl: process ChangeLog which we do not use anymore scripts/cross-build-mingw.sh: old cross build script, replaced by #3315 scripts/rstrip-whitespace.py: probably unused scripts/fix-alignment.pl scripts/fix-cxx-comments.pl scripts/warning-summary.pl Modified Paths: -------------- scripts/changelist.pl scripts/cross-build-mingw.sh scripts/fix-alignment.pl scripts/fix-cxx-comments.pl scripts/rstrip-whitespace.py scripts/warning-summary.pl Modified: scripts/changelist.pl 135 lines changed, 0 insertions(+), 135 deletions(-) =================================================================== @@ -1,135 +0,0 @@ -#!/usr/bin/env perl -# Copyright: 2008, The Geany contributors -# License: GNU GPL V2 or later, as published by the Free Software Foundation, USA. -# Warranty: NONE - -# Searches a ChangeLog file for a line matching 'matchstring', then matches -# all lines until two consecutive empty lines are found. The process then -# repeats until all matching blocks of text are found. -# Results are printed in reverse, hence in chronological order (as ChangeLogs -# are usually written in reverse date order). -# -# The resulting lines are then formatted to be easier to read and edit into a -# NEWS file. - -# Example ChangeLog format: -#2009-04-03 Joe Author <joe(a)example.net> -# -# * src/file.c, src/file.h, -# src/another.c: -# Some change description, -# spanning several lines. -# * foo.c: Combined line. - -use strict; -use warnings; - -my $argc = $#ARGV + 1; -my ($matchstr, $infile); - -if ($argc == 1) -{ - ($infile) = @ARGV; - $matchstr = '.'; -} -elsif ($argc == 2) -{ - ($matchstr, $infile) = @ARGV; -} -else { - die <<END; -Usage: -$0 changelogfile >outfile -$0 matchstring changelogfile >outfile - - matchstring is a case-insensitive regular expression, e.g. 'joe|fred'. -END -} - -open(INPUT, $infile) - or die "Couldn't open $infile for reading: $!\n"; - -my $entry; # the current matching block of text -my @entries; # changelog entries, one per date - -# first parse each ChangeLog entry into an array - -my $found = 0; # if we're in a matching block of text -my $blank = 0; # whether the last line was empty - -while (<INPUT>) { - my $line = $_; # read a line, including \n char - - if (! $found) { - ($line =~ m/$matchstr/) and $found = 1; - } else { - if (length($line) <= 1) { # current line is empty - if ($blank > 0) { # previous line was also empty - push(@entries, $entry); # append entry - $entry = ""; - $found = 0; # now look for next match - $blank = 0; - } - else { - $blank = 1; - } - } - } - if ($found) { - $entry .= $line; - } -} -close(INPUT); - -# reformat entries -foreach $entry (reverse @entries) { - my @lines = split(/\n/, $entry); - my $fl = 0; # in file list lines - my $cm = 0; # in commit message lines - - foreach my $line (@lines){ - my $flset = $fl; - - # strip trailing space - $line =~ s/\s+$//g; - - if (!$cm){ - # check if in filelist - ($line =~ m/ \* /) and $fl = 1; - # join filelist together on one line - $fl and ($line =~ s/^ / /); - if ($fl and ($line =~ m/:/)){ - $fl = 0; - # separate ' * foo.c: Some edit.' messages: - if (!($line =~ m/:$/)) { - ($line =~ s/:/:\n*/); - } - } - $fl and ($line =~ m/,$/) or $fl = 0; - } - if (!$flset){ - # Asterisk commit messages - if (!$cm and ($line =~ m/^ /)){ - $cm = 1; - $line =~ s/^( )/$1* /; - } else { - $cm and ($line =~ s/^( )/$1 /); # indent continuing lines - } - $cm and ($line =~ m/\.$/) and $cm = 0; - } - #~ print $fl.','.$cm.','.$line."\n"; next; # debug - - # change file list start char to easily distinguish between file list and commit messages - $line =~ s/^ \* /@ /g; - # strip <email> from date line - $line =~ s/^([0-9-]+.*?)\s+<.+>$/$1/g; - # remove indent - $line =~ s/^ //g; - - if ($line ne ""){ - print $line; - (!$fl) and print "\n"; - } - } - print "\n"; -} Modified: scripts/cross-build-mingw.sh 98 lines changed, 0 insertions(+), 98 deletions(-) =================================================================== @@ -1,98 +0,0 @@ -#!/bin/sh -# A script to automate setup and build for Windows cross-compilation -# -# What it does: -# 1) prepare a build directory -# 2) download and unpacked the dependencies -# (see http://www.gtk.org/download/win32.php) -# 2.1) fixup the unpacked pkg-config file paths -# 3) setup the few required paths -# 4) configure with sensible options for this -# 5) build -# 6) install in a local directory -# 7) pack the installation in a ZIP file, ready to be used -# (but does not pack the dependencies) - -# You may change those -HOST=i686-w64-mingw32 -GTK_BUNDLE_ZIP="https://download.geany.org/contrib/gtk/gtk+-bundle_3.8.2-20131001_win32.zip" -BUILDDIR=_build-cross-mingw -CONFIGUREFLAGS="--enable-nls" -MAKEFLAGS="${MAKEFLAGS:--j2}" - -while getopts '32b:h' o; do - case "$o" in - b) BUILDDIR="$OPTARG";; - h) - cat <<EOF -USAGE: $0 [-b DIR] [-h] - --b DIR Use DIR as build directory --h Show this help and exit -EOF - exit 0;; - *) echo "Invalid option $o (see -h)">&2; exit 1;; - esac -done -shift $((OPTIND - 1)) - -# USAGE: fetch_and_unzip URL DEST_PREFIX -fetch_and_unzip() -{ - local basename=${1##*/} - curl -L -# "$1" > "$basename" - unzip -qn "$basename" -d "$2" - rm -f "$basename" -} - -if test -d "$BUILDDIR"; then - cat >&2 <<EOF -** Directory "$BUILDDIR/" already exists. -If it was created by this tool and just want to build, simply run make: - $ make -C "$BUILDDIR/_build/" - -If however you want to recreate it, please remove it first: - $ rm -rf "$BUILDDIR/" -EOF - exit 1 -fi - -set -e -set -x - - -test -f configure -# check if the host tools are available, because configure falls back -# on default non-prefixed tools if they are missing, and it can spit -# quite a lot of subtle errors. also avoids going further if something -# is obviously missing. -type "$HOST-gcc" - -SRCDIR="$PWD" - -mkdir "$BUILDDIR" -cd "$BUILDDIR" - -mkdir _deps - -fetch_and_unzip "$GTK_BUNDLE_ZIP" _deps - -# fixup the prefix= in the pkg-config files -sed -i "s%^$prefix=$.*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc - -export PKG_CONFIG_PATH="$PWD/_deps/lib/pkgconfig/" -export CPPFLAGS="-I$PWD/_deps/include" -export LDFLAGS="-L$PWD/_deps/lib" - -mkdir _build -cd _build -"$SRCDIR/configure" \ - --host=$HOST \ - --disable-silent-rules \ - --prefix="$PWD/../_install" \ - $CONFIGUREFLAGS || { - cat config.log - exit 1 -} -make $MAKEFLAGS -make $MAKEFLAGS install Modified: scripts/fix-alignment.pl 108 lines changed, 0 insertions(+), 108 deletions(-) =================================================================== @@ -1,108 +0,0 @@ -#!/usr/bin/env perl -# Copyright: 2009 The Geany contributors -# License: GNU GPL V2 or later, as published by the Free Software Foundation, USA. -# Warranty: NONE - -# Re-align C source code for Geany. -# Doesn't handle indents/blank lines/anything complicated ;-) - -use strict; -use warnings; - -use Getopt::Std; - -my %args = (); -getopts('w', \%args); -my $opt_write = $args{'w'}; - -my $argc = $#ARGV + 1; -my $scriptname = $0; - -(($argc == 1) or ($argc >= 1 and $opt_write)) or die <<END; -Usage: -$scriptname sourcefile [>outfile] - Print formatted output to STDOUT or outfile. - Warning: do not use the same file for outfile. - -$scriptname -w sourcefile(s) - Writes to the file(s) in-place. - Warning: backup your file(s) first or use clean version control files. -END - - -sub parse($) -{ - my ($infile) = @_; - my @lines; - - open(INPUT, $infile) or die "Couldn't open $infile for reading: $!\n"; - - while (<INPUT>) { - my $line = $_; # read a line, including \n char - - # strip trailing space & newline - $line =~ s/\s+$//g; - - # for now, don't process lines with comments, strings, preproc non-defines, overflowed lines or chars - # multi-line comment internal lines are skipped only if they start with '* '. - if (!($line =~ m,/\*|\*/|//|"|\\$|',) and !($line =~ m/^\s*(\*\s|#[^d])/)) { - # make binary operators have *one* space each side - # operators must have longer variants first otherwise trailing operators can be broken e.g. "+ =" - # '*' ignored as could be pointer - my $ops = '<<=,<<,>>=,>>,<=,>=,<,>,||,|=,|,&&,&=,-=,+=,+,*=,/=,/,==,!=,%=,%,^=,^,='; - $ops =~ s/([|*+])/\\$1/g; # escape regex chars - $ops =~ s/,/|/g; - $line =~ s/([\w)\]]) ?($ops) ?([\w(]|$)/$1 $2 $3/g; - - # space binary operators that can conflict with unaries with cast and/or 'return -1/&foo' - # '-' could be unary "(gint)-j" - # '&' could be address-of "(type*)&foo" - $line =~ s/([\w\]])(-|&) ?([\w(]|$)/$1 $2 $3/g; - - # space ternary conditional operator - $line =~ s/ ?\? ?(.+?) ?: ?/ ? $1 : /g; - - # space comma operator (allowing for possible alignment space afterwards) - $line =~ s/ ?,(\S)/, $1/g; - - # space after statements - my $statements = 'for|if|while|switch'; - $line =~ s/\b($statements)\b\s*/$1 /g; - - # no space on inside of brackets - $line =~ s/$\s+/(/g; - $line =~ s/(\S)\s+$/$1)/g; - - # enforce 'fn(void);' in prototypes - $line =~ s/^(\w.+\w$)$;$/$1void);/; - } - # strip trailing space again (e.g. a trailing operator now has space afterwards) - $line =~ s/\s+$//g; - - push(@lines, $line); - } - close(INPUT); - - my $text = join("\n", @lines); - undef @lines; # free memory - $text .= "\n"; - - # 1+ newline -> 2 newlines after function - $text =~ s/^}\n\n+([^\n])/}\n\n\n$1/gm; - - if (!$opt_write) { - print $text; - } - else { - open(OUTPUT, ">$infile") or die "Couldn't open $infile for writing: $!\n"; - print OUTPUT $text; - close(OUTPUT); - } -} - - -foreach my $infile (@ARGV) -{ - parse($infile); -} - Modified: scripts/fix-cxx-comments.pl 78 lines changed, 0 insertions(+), 78 deletions(-) =================================================================== @@ -1,78 +0,0 @@ -#!/usr/bin/env perl -# fix-cxx-comments.pl -# Copyright (c) 2008, Daniel Richard G. <skunk(at)iskunk(dot)org> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of the author nor the names of -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -use strict; -use warnings; - -sub xform($$$) -{ - my ($a, $b, $c) = @_; - - $a =~ s!///!/**!; - $b =~ s!(\a\s*)///!$1 **!g; - $c =~ s!///! **!; - - $a =~ s!//!/*!; - $b =~ s!(\a\s*)//!$1 *!g; - $c =~ s!//! *!; - - $c .= ' */'; - - return $a . $b . $c . "\a"; -} - -sub fix_cxx_comments() -{ - s/\r//g; # This is Unix, not DOS - s/[\t ]+$//g; # Remove trailing whitespace - s/\n/\a/g; # Convert file to single line - - # Process multi-line comments: - # $1 = first line of comment, $3 = last line, $2 = lines in between - s! (\a\s*//[^\a]*) ((?:\a\s*//[^\a]*)*) (\a\s*//[^\a]*)\a !xform($1,$2,$3)!egx; - - # Process /// single-line comments - s! (\a\s*)///(\s?)([^\a]*)\a !$1/**$2$3$2*/\a!gx; - s! (\s+)///(\s?)([^\a]*)\a !$1/**$2$3$2*/\a!gx; - - # Process // single-line comments - s! (\a\s*)//(\s?)([^\a]*)\a !$1/*$2$3$2*/\a!gx; - s! (\s+)//(\s?)([^\a]*)\a !$1/*$2$3$2*/\a!gx; - - s/\a/\n/g; # Convert back to multiple lines -} - -{ - local $/; - $_ = <>; - fix_cxx_comments(); - print; -} - Modified: scripts/rstrip-whitespace.py 23 lines changed, 0 insertions(+), 23 deletions(-) =================================================================== @@ -1,23 +0,0 @@ -#!/usr/bin/env python - -import sys - -filenames = sys.argv[1:] - -def backup_file (fn): - open ("%s~" % fn, "w").write (open (fn, "r").read ()) - -for fn in filenames: - #backup_file (fn) - contents = open (fn, "r").read () - lines = contents.split ('\n') - with open (fn, "w") as fobj: - for line in lines: - line = line.rstrip () - fobj.write ("%s\n" % line) - contents = open (fn, "r").read () - contents.rstrip () - while contents[-1] in " \t\r\n": - contents = contents[:-1] - open (fn, "w").write ("%s\n" % contents) - Modified: scripts/warning-summary.pl 78 lines changed, 0 insertions(+), 78 deletions(-) =================================================================== @@ -1,78 +0,0 @@ -#!/usr/bin/env perl -# warning-summary.pl -# Copyright (c) 2008, Daniel Richard G. <skunk(at)iskunk(dot)org> -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of the author nor the names of -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -use strict; -use warnings; - -use encoding 'utf8'; - -binmode(STDIN, ":utf8"); - -open(OUT, "| sort | uniq -c | sort -nr"); -binmode(OUT, ":utf8"); - -while (<>) -{ - /warning:/ || next; - /near initialization for/ && next; - /shadowed declaration is here/ && next; - /$this will be reported only once per input file$/ && next; - - s/^.*: warning: //g; - - tr/\x{2018}\x{2019}/''/; - - s/\barg(ument|) \d+\b/arg$1 N/g; - - s/\b(type|function|variable|enumeration value|declaration of|argument N of|parameter|type of|type of bit-field|prototype for) '[^']+'/$1 'blah'/g; - - s/"[^"]+" (is not defined)/"BLAH" $1/g; - - s/'[^']+' (defined but not used)/'blah' $1/g; - - s/format '%\w+'/format '%blah'/g; - - s/'%\w+' printf format/'%blah' printf format/g; - - s/'\d+'/'NNN'/g; - - s/'[^']+' (declared 'static' but never defined)/'blah' $1/g; - - s/(missing braces around initializer for) '\w+'/$1 'blah'/g; - - s/(missing initializer for member) '\w+::\w+'/$1 'Foo::bar'/g; - - print OUT; -} - -close(OUT); - -# end warning-summary.pl - -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cc324f: Support syntax highlighting for Meson options file (#3534)
by Thomas Lange 31 Jul '23

31 Jul '23

Branch: refs/heads/master Author: Thomas Lange <thomas-lange2(a)gmx.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 01 Aug 2023 00:07:24 UTC Commit: cc324f401c6cc1dfa9db4b6bf6df84e7922415cd https://github.com/geany/geany/commit/cc324f401c6cc1dfa9db4b6bf6df84e792241… Log Message: ----------- Support syntax highlighting for Meson options file (#3534) See also: https://mesonbuild.com/Build-options.html#build-options Modified Paths: -------------- data/filedefs/filetypes.Meson.conf data/filetype_extensions.conf Modified: data/filedefs/filetypes.Meson.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2,7 +2,7 @@ [keywords] primary=and break continue elif else endforeach endif false foreach if in not or true -identifiers=add_global_arguments add_global_link_arguments add_languages add_project_arguments add_project_link_arguments add_test_setup alias_target assert benchmark both_libraries build_target configuration_data configure_file custom_target declare_dependency dependency disabler environment error executable files find_library find_program generator get_option get_variable import include_directories install_data install_headers install_man install_subdir is_disabler is_variable jar join_paths library message project run_command run_target set_variable shared_library shared_module static_library subdir subdir_done subproject summary test vcs_tag warning +identifiers=add_global_arguments add_global_link_arguments add_languages add_project_arguments add_project_link_arguments add_test_setup alias_target assert benchmark both_libraries build_target configuration_data configure_file custom_target declare_dependency dependency disabler environment error executable files find_library find_program generator get_option get_variable import include_directories install_data install_headers install_man install_subdir is_disabler is_variable jar join_paths library message option project run_command run_target set_variable shared_library shared_module static_library subdir subdir_done subproject summary test vcs_tag warning [lexer_properties=Python] Modified: data/filetype_extensions.conf 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -52,7 +52,7 @@ Lua=*.lua; Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*; Markdown=*.mdml;*.markdown;*.md;*.mkd;*.mkdn;*.mdwn;*.mdown;*.mdtxt;*.mdtext; Matlab/Octave=*.m; -Meson=meson.build; +Meson=meson.build;meson.options;meson_options.txt; Nim=*.nim; NSIS=*.nsi;*.nsh; Objective-C=*.m;*.mm;*.h; -------------- 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 August 2023