lothar.buchholz/Grichelde
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version 1.1.2a

Browse Source 
- adopt to BigWigs release script
This commit is contained in:
Lothar Buchholz 2021-05-23 16:41:57 +02:00
parent 06a1f1177a
commit 68da0b15bb
12 changed files with 3033 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -38,6 +38,7 @@ obj/
# Misc
.bin/
.release/
*.log
*.graphml
coverage.db*
coverage.db*

34
.pkgmeta
View File

@ -2,23 +2,29 @@ package-as: Grichelde
enable-nolib-creation: no
externals:
libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
embedded-libraries:
Libs/LibStub: https://repos.wowace.com/wow/libstub/tags/1.0
curse-slug: libstub
Libs/LibDataBroker: https://github.com/tekkub/libdatabroker-1-1
curse-slug: libdatabroker-1-1
Libs/LibDBIcon: https://repos.curseforge.com/wow/libdbicon-1-0/trunk/LibDBIcon-1.0
curse-slug: libdbicon-1-0
Libs/CallbackHandler-1.0: https://repos.wowace.com/wow/callbackhandler/trunk/CallbackHandler-1.0
curse-slug: callbackhandler
Libs/AceAddon-3.0: https://repos.wowace.com/wow/ace3/trunk/AceAddon-3.0
curse-slug: ace3
Libs/AceConfig-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConfig-3.0
Libs/AceConsole-3.0: https://repos.wowace.com/wow/ace3/trunk/AceConsole-3.0
Libs/AceDB-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDB-3.0
Libs/AceDBOptions-3.0: https://repos.wowace.com/wow/ace3/trunk/AceDBOptions-3.0
Libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
Libs/AceGUI-3.0: https://repos.wowace.com/wow/ace3/trunk/AceGUI-3.0
Libs/AceHook-3.0: https://repos.wowace.com/wow/ace3/trunk/AceHook-3.0
Libs/AceLocale-3.0: https://repos.wowace.com/wow/ace3/trunk/AceLocale-3.0
ignore:
- twitch
- GricheldeTest.lua
manual-changelog:
filename: CHANGELOG.md

311
.release/README.md Normal file
View File

@ -0,0 +1,311 @@
# release.sh
__release.sh__ generates an addon zip file from a Git, SVN, or Mercurial
checkout.
__release.sh__ works by creating a new project directory (*.release* by
default), copying files from the checkout into the project directory, checking
out external repositories then copying their files into the project directory,
then moves subdirectories into the project root. The project directory is then
zipped to create a distributable addon zip file which can also be uploaded to
CurseForge, WoWInterface, Wago, and GitHub (as a release).
__release.sh__ assumes that tags (Git annotated tags and SVN tags) are named for
the version numbers for the project. It will identify if the HEAD is tagged and
use that as the current version number. It will search back through parent
commits for the previous tag and generate a changelog containing the commits
since that tag.
## Building with GitHub Actions
For a full example workflow, please check out the [wiki page](https://github.com/BigWigsMods/packager/wiki/GitHub-Actions-workflow).
### Example using [options](#Usage)
```yaml
- uses: BigWigsMods/packager@v1
with:
args: -g classic -m .pkgmeta-classic
```
## Customizing the build
__release.sh__ uses the TOC file to determine the package name for the project.
You can also set the CurseForge project id (`-p`), the WoWInterface addon
id (`-w`) or the Wago project id (`-a`) by adding the following to the TOC file:
```toc
## X-Curse-Project-ID: 1234
## X-WoWI-ID: 5678
## X-Wago-ID: he54k6bL
```
Your CurseForge project id can be found on the addon page in the "About Project"
side box.
Your WoWInterface addon id is in the url for the addon, eg, the "5678"
in <https://wowinterface.com/downloads/info5678-MyAddon>.
Your Wago project id can be found on the developer dashboard.
### The PackageMeta file
__release.sh__ can read a __.pkgmeta__ file and supports the following
directives. See the [wiki page](https://github.com/BigWigsMods/packager/wiki/Preparing-the-PackageMeta-File)
for more info.
- *externals* (Git, SVN, and Mercurial) Caveats: An external's .pkgmeta is only
parsed for ignore and externals will not have localization keywords replaced.
- *ignore*
- *changelog-title*
- *manual-changelog*
- *move-folders*
- *package-as*
- *enable-nolib-creation* (defaults to no) Caveats: nolib packages will only be
uploaded to GitHub and attached to a release. Unlike with the CurseForge
packager, manually uploaded nolib packages will not be used by the client when
users have enabled downloading libraries separately.
- *tools-used*
- *required-dependencies*
- *optional-dependencies*
- *embedded-libraries* Note: All fetched externals will be marked as embedded,
overriding any manually set relations in the pkgmeta.
You can also use a few directives for WoWInterface uploading.
- *wowi-archive-previous* : `yes|no` (defaults to yes) Archive the previous
release.
- *wowi-create-changelog* : `yes|no` (defaults to yes) Generate a changelog
using BBCode that will be set when uploading. A manual changelog will always
be used instead if set in the .pkgmeta.
- *wowi-convert-changelog* : `yes|no` (defaults to yes) Convert a manual
changelog in Markdown format to BBCode if you have [pandoc](http://pandoc.org/)
installed; otherwise, the manual changelog will be used as-is. If set to `no`
when using a generated changelog, Markdown will be used instead of BBCode.
**Note**: Markdown support is experimental and needs to be requested on a
per-project basis.
### String replacements
__release.sh__ supports the following repository substitution keywords when
copying the files from the checkout into the project directory. See the
[wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions)
for more info.
- *@[localization](https://github.com/BigWigsMods/packager/wiki/Localization-Substitution)(locale="locale", format="format", ...)@*
- *escape-non-ascii*
- *handle-unlocalized*
- *handle-subnamespaces="concat"*
- *key*
- *namespace*
- *same-key-is-true*
- *table-name*
- *@file-revision@*
- *@project-revision@*
- *@file-hash@*
- *@project-hash@*
- *@file-abbreviated-hash@*
- *@project-abbreviated-hash@*
- *@file-author@*
- *@project-author@*
- *@file-date-iso@*
- *@project-date-iso@*
- *@file-date-integer@*
- *@project-date-integer@*
- *@file-timestamp@*
- *@project-timestamp@*
- *@project-version@*
### Build type keywords
Specific keywords used in a comment at the start (`@keyword@`) and end
(`@end-keyword@`) of a block of code can be used to conditionally run that code
based on the build type. If the build type does not match, the block of code
is comment out so line numbers do not change.
Supported keywords and when the code block will run:
- `alpha`: in untagged builds.
- `debug`: never. Code will only run when using an unpackaged source.
- `do-not-package`: never. Same as `debug` except removed from the packaged
file.
- `no-lib-strip`: _(not supported in Lua files)_ in any build other than a
*nolib* build.
- `retail`,`version-retail`,`version-classic`,`version-bcc`: based on game
version.
`do-not-package` is a bit special. Everything between the tags, including the
tags themselves, will always be removed from the packaged file. This will cause
the line numbers of subsequent lines to change, which can result in bug report
line numbers not matching the source code. The typical usage is at the end of
Lua files surrounding debugging functions and other code that end users should
never see or execute.
All keywords except `do-not-package` can be prefixed with `non-` to inverse the
logic. When doing this, the keywords should start and end a **block comment**
as shown below.
More examples are available on the [wiki page](https://github.com/BigWigsMods/packager/wiki/Repository-Keyword-Substitutions#debug-replacements).
#### In Lua files
`--@keyword@` and `--@end-keyword@`
turn into `--[===[@keyword` and `--@end-keyword]===]`.
`--[===[@non-keyword@` and `--@end-non-keyword@]===]`
turn into `--@non-keyword@` and `--@end-non-keyword@`.
#### In XML files
**Note:** XML doesn't allow nested comments so make sure not to nest keywords.
If you need to nest keywords, you can do so in the TOC instead.
`<!--@keyword@-->` and `<!--@end-keyword@-->`
turn into `<!--@keyword` and `@end-keyword@-->`.
`<!--@non-keyword@` and `@end-non-keyword@-->`
turn into `<!--@non-keyword@-->` and `<!--@end-non-keyword@-->`.
#### In TOC files
The lines with `#@keyword@` and `#@end-keyword@` get removed, as well as every
line in-between.
The lines with `#@non-keyword@` and `#@end-non-keyword@` get removed, as well as
removing a '# ' at the beginning of each line in-between.
### Changing the file name
__release.sh__ uses the file name template `"{package-name}-{project-version}{nolib}{classic}"`
for the addon zip file. This can be changed with the `-n` switch (`release.sh
-n "{package-name}-{project-version}"`).
These tokens are always replaced with their value:
- `{package-name}`
- `{project-revision}`
- `{project-hash}`
- `{project-abbreviated-hash}`
- `{project-author}`
- `{project-date-iso}`
- `{project-date-integer}`
- `{project-timestamp}`
- `{project-version}`
- `{game-type}`
- `{release-type}`
These tokens are "flags" and are conditionally shown prefixed with a dash based
on the build type:
- `{alpha}`
- `{beta}`
- `{nolib}`
- `{classic}`
`{classic}` has some additional magic:
1. It will show as the non-retail build type, so either `-classic` or `-bcc`.
2. It will not be shown if "-classic" or "-bcc" is in the project version.
3. If it is included in the file name (it is by default) and #2 does not apply,
it will also be appended to the file label (i.e., the name shown on
CurseForge).
## Building for multiple game versions
__release.sh__ needs to know what version of World of Warcraft the package is
targeting. This is normally automatically detected using the `## Interface:`
line of the addon's TOC file.
If your addon supports both retail and classic in the same branch, you can use
multiple `## Interface-Type:` lines in your TOC file. Only one `## Interface:`
line will be included in the packaged TOC file based on the targeted game
version.
```toc
## Interface: 90005
## Interface-Retail: 90005
## Interface-Classic: 11306
## Interface-BCC: 20501
```
You specify what version of the game you're targeting with the `-g` switch. You
can use a specific version (`release.sh -g 1.13.6`) or you can use the game type
(`release.sh -g classic`). Using a game type will set the game version based on
the appropriate TOC `## Interface` value.
You can also set multiple specific versions as a comma delimited list using the
`-g` switch (`release.sh -g 1.13.6,2.5.1,9.0.5`). This will still only build
one package, with the the last version listed used as the target version for
the build.
**Setting multiple versions is not recommended!** The addon will always be
marked "Out of date" in-game for versions that do not match the TOC interface
value for the last version set. So even if you don't need any special file
processing, it will always be best to run the packager multiple times so the TOC
interface value is correct for each game version.
## Building locally
The recommended way to include __release.sh__ in a project is to:
1. Create a *.release* subdirectory in your top-level checkout.
2. Copy __release.sh__ into the *.release* directory.
3. Ignore the *.release* subdirectory in __.gitignore__.
4. Run __release.sh__.
## Usage
```text
Usage: release.sh [options]
-c Skip copying files into the package directory.
-d Skip uploading.
-e Skip checkout of external repositories.
-l Skip @localization@ keyword replacement.
-L Only do @localization@ keyword replacement (skip upload to CurseForge).
-o Keep existing package directory, overwriting its contents.
-s Create a stripped-down "nolib" package.
-u Use Unix line-endings.
-z Skip zip file creation.
-t topdir Set top-level directory of checkout.
-r releasedir Set directory containing the package directory. Defaults to "$topdir/.release".
-p curse-id Set the project id used on CurseForge for localization and uploading. (Use 0 to unset the TOC value)
-w wowi-id Set the addon id used on WoWInterface for uploading. (Use 0 to unset the TOC value)
-a wago-id Set the project id used on Wago Addons for uploading. (Use 0 to unset the TOC value)
-g game-version Set the game version to use for uploading.
-m pkgmeta.yaml Set the pkgmeta file to use.
-n package-name Set the package zip file name. Use "-n help" for more info.
```
### Uploading
__release.sh__ uses following environment variables for uploading:
- `CF_API_KEY` - a [CurseForge API token](https://wow.curseforge.com/account/api-tokens),
required for the CurseForge API to fetch localization and upload files.
- `WOWI_API_TOKEN` - a [WoWInterface API token](https://www.wowinterface.com/downloads/filecpl.php?action=apitokens),
required for uploading to WoWInterface.
- `WAGO_API_TOKEN` - a [Wago Addons API token](https://addons.wago.io/account/apikeys),
required for uploading to Wago Addons.
- `GITHUB_OAUTH` - a [GitHub personal access token](https://github.com/settings/tokens),
required for uploading to GitHub.
__release.sh__ will attempt to load environment variables from a `.env` file in
the topdir or current working directory. You can also edit __release.sh__ and
enter the tokens near the top of the file.
### Dependencies
__release.sh__ is mostly POSIX-compatible, so it should run in any Unix-like
environment provided the following are available:
- bash >= 4.3
- awk
- sed
- curl
- zip
- version control software as needed:
- git >= 2.13.0
- subversion >= 1.7.0
- mercurial >= 3.9.0 (pre-3.9 will have issues with [secure connections](https://www.mercurial-scm.org/wiki/SecureConnections))
- [jq](https://stedolan.github.io/jq/download/) >= 1.5 (when uploading)
- [pandoc](https://pandoc.org/installing.html) >= 1.19.2 (optional)

2647
.release/release.sh Normal file
View File

File diff suppressed because it is too large Load Diff

3
.retail.toc
View File

@ -1,3 +0,0 @@
## Interface: 90005
## X-Build: Retail

4
CHANGELOG.md
View File

@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Version 1.1.2 - 2021-05-23
### Changed
- adopted to BigWigs release script to better support different game packages
## Version 1.1.1 - 2021-04-22
### Changed
- bumped versions for WoW Classic and Shadowlands

5
Grichelde.lua
View File

@ -21,8 +21,9 @@ local _G = _G
-- initialize addon
local Grichelde = LibStub("AceAddon-3.0"):NewAddon(AddonTable, AddonName, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
Grichelde.version = GetAddOnMetadata(AddonName, "Version")
Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Experimental"
Grichelde.classic = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
Grichelde.build = GetAddOnMetadata(AddonName, "X-Build") or "Development"
--Grichelde.era = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_CLASSIC
--Grichelde.bcc = _G.WOW_PROJECT_ID == _G.WOW_PROJECT_BURNING_CRUSADE_CLASSIC
Grichelde.logLevel = 0 -- cannot reference Grichelde.LOG_LEVELs here as they are loaded afterwards
-- publish to global env

47
Grichelde.toc
View File

@ -1,13 +1,38 @@
## Interface: 11307
## Interface-Classic: 11307
## Interface-BCC: 20501
## Interface-Retail: 90005
## Title: Grichelde
## Notes: Replaces characters of your chat input line before sending.
## Notes-de: Ersetzt eingegebene Zeichen in der Chat-Zeile vor dem Versenden.
## Version: 1.1.1
#@debug@
## Version: 1.1.2
#@end-debug@
#@non-debug@
# ## Version: @project-version@
#@end-non-debug@
## Author: Teilzeit-Jedi
## eMail: tj@teilzeit-jedi.de
#@version-classic@
## X-Build: Classic
## X-Compatible: 20501
## X-Compatible: 90005
#@end-version-classic@
#@non-version-classic@
#@version-bcc@
# ## X-Build: BCC
# ## X-Compatible: 11307
# ## X-Compatible: 90005
#@end-version-bcc@
#@version-retail@
# ## X-Build: Retail
# ## X-Compatible: 11307
# ## X-Compatible: 20501
#@end-version-retail@
#@end-non-version-classic@
## X-Curse-Project-ID: 385480
## X-License: GPLv3
## X-Category: Chat/Communication
@ -17,7 +42,21 @@
## OptionalDeps: LibStub, CallbackHandler, Ace3, LibDataBroker, LibDBIcon
## SavedVariables: GricheldeDB
libs.xml
#@no-lib-strip@
Libs\LibStub\LibStub.lua
Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml
Libs\AceAddon-3.0\AceAddon-3.0.xml
Libs\AceLocale-3.0\AceLocale-3.0.xml
Libs\AceEvent-3.0\AceEvent-3.0.xml
Libs\AceHook-3.0\AceHook-3.0.xml
Libs\AceConsole-3.0\AceConsole-3.0.xml
Libs\AceDB-3.0\AceDB-3.0.xml
Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml
Libs\AceGUI-3.0\AceGUI-3.0.xml
Libs\AceConfig-3.0\AceConfig-3.0.xml
Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua
Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua
#@end-no-lib-strip@
Grichelde.lua
GricheldeConstants.lua
@ -31,4 +70,6 @@ GricheldeOptions.lua
GricheldeMinimap.lua
GricheldeChat.lua
GricheldeTest.lua
#@do-not-package@
GricheldeTest.lua
#@end-do-not-package@

6
GricheldeUtils.lua
View File

@ -84,12 +84,6 @@ function Grichelde:SplitOnLastMatch(text, delimPattern, start)
return left, right or text
end
--- Splits at last word of a text line
function Grichelde:TestMatch(text, pattern)
local pos1, pos2, left, right = find(text, pattern, 1)
self:DebugPrint("TestMatch : pos1: %d, pos2: %d, left: %s, right: %s", pos1, pos2, left, right)
end
function Grichelde:Format(message, ...)
if (message == nil) then
return "<nil>"

17
libs.xml
View File

@ -1,17 +0,0 @@
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
..\FrameXML\UI.xsd">
<Script file="Libs\LibStub\LibStub.lua"/>
<Include file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
<Include file="Libs\AceAddon-3.0\AceAddon-3.0.xml"/>
<Include file="Libs\AceLocale-3.0\AceLocale-3.0.xml" />
<Include file="Libs\AceEvent-3.0\AceEvent-3.0.xml" />
<Include file="Libs\AceHook-3.0\AceHook-3.0.xml"/>
<Include file="Libs\AceConsole-3.0\AceConsole-3.0.xml"/>
<Include file="Libs\AceDB-3.0\AceDB-3.0.xml"/>
<Include file="Libs\AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
<Include file="Libs\AceGUI-3.0\AceGUI-3.0.xml"/>
<Include file="Libs\AceConfig-3.0\AceConfig-3.0.xml"/>
<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua" />
<Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua" />
</Ui>

2
localisation/deDE.lua
View File

@ -15,7 +15,7 @@ local cPrefix = Grichelde.F.cPrefix
L.AddonName = "Grichelde"
L.AddonNamePlusVersion = "%s v%s"
L.AddonLoaded = "%s unterst\195\188tzt Euch jetzt bei euren Sprachschwierigkeiten."
L.AddonUnloaded = "%s wartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
L.AddonUnloaded = "%s erwartet geduldig Euch weiter unterst\195\188tzen zu d\195\188rfen."
L.Upgrade_ToVersion = "Hebe Databank auf Version %s an."
L.Upgrade_Successful = "Upgrade erfolgreich."
L.Upgrade_Error = "Upgrade fehlgeschlagen!"

2
localisation/enUS.lua
View File

@ -15,7 +15,7 @@ local cPrefix = Grichelde.F.cPrefix
L.AddonName = "Grichelde"
L.AddonNamePlusVersion = "%s v%s"
L.AddonLoaded = "%s happily assists you with your spelling disabilities now."
L.AddonUnloaded = "%s patiently waits to support you again when needed."
L.AddonUnloaded = "%s patiently awaits to support you again."
L.Upgrade_ToVersion = "Upgrade database to version %s."
L.Upgrade_Successful = "Upgrade successful."
L.Upgrade_Error = "Upgrade failed!"