From 1fdf4f2998a4a4c5293e865a34ba0e99f301bbe2 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 3 Jul 2022 20:59:33 -0700 Subject: [PATCH] Switch to foosoft.net for packages --- LICENSE | 2 +- common.go | 21 --------------------- daijirin.go | 35 +++++++---------------------------- daijisen.go | 23 +---------------------- edict.go | 23 +---------------------- enamdict.go | 23 +---------------------- epwing.go | 23 +---------------------- frequency.go | 21 --------------------- gakken.go | 23 +---------------------- go.mod | 12 +++++++----- go.sum | 17 ++++++++--------- kanjidic.go | 23 +---------------------- kotowaza.go | 23 +---------------------- koujien.go | 23 +---------------------- meikyou.go | 23 +---------------------- rikai.go | 21 --------------------- scripts/build_dicts.sh | 2 +- scripts/build_linux.sh | 5 +++-- scripts/build_windows.sh | 5 +++-- wadai.go | 23 +---------------------- yomichan-gtk/main.go | 23 +---------------------- yomichan/main.go | 23 +---------------------- 22 files changed, 42 insertions(+), 375 deletions(-) diff --git a/LICENSE b/LICENSE index d4dddf8..f13e263 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2016-2021 Alex Yatskov +Copyright 2016-2022 Alex Yatskov Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/common.go b/common.go index 189bf6b..aa566c0 100644 --- a/common.go +++ b/common.go @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( diff --git a/daijirin.go b/daijirin.go index 5983918..2c2b190 100644 --- a/daijirin.go +++ b/daijirin.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type daijirinExtractor struct { @@ -379,13 +358,13 @@ func (*daijirinExtractor) getFontNarrow() map[int]string { 50006: "₋", 50010: "g̀", 50012: "$", - 50016: "ㇾ", /* FIXME: 漢文訓読 */ - 50020: "₋", /* FIXME: 漢文訓読 */ + 50016: "ㇾ", /* FIXME: 漢文訓読 */ + 50020: "₋", /* FIXME: 漢文訓読 */ 50021: "{㆘}", /* FIXME: 漢文訓読 */ 50022: "{㆔}", /* FIXME: 漢文訓読 */ 50023: "{㆖}", /* FIXME: 漢文訓読 */ 50025: "{㆗}", /* FIXME: 漢文訓読 */ - 50026: "₌", /* FIXME: 漢文訓読 */ + 50026: "₌", /* FIXME: 漢文訓読 */ 50027: "ĕ", 50028: "Č", 50029: "Š", @@ -1664,7 +1643,7 @@ func (*daijirinExtractor) getFontWide() map[int]string { 44613: "𩙿", 44619: "𤣥", /* FIXME: 欠画 */ 44621: "⺩", - 44622: "⺏", /* FIXME: 尢, this but with with leg stretched as in 尩 */ + 44622: "⺏", /* FIXME: 尢, this but with with leg stretched as in 尩 */ 44623: "भर", /* FIXME: 勃嚕唵/bhrūṃ in sanskrit */ 44624: "㐂", 44625: "𛀸", /* FIXME: 変体仮名 (こ) */ @@ -1717,9 +1696,9 @@ func (*daijirinExtractor) getFontWide() map[int]string { 45112: "☴", 45113: "☵", 45114: "☶", - 45115: "＼", /* FIXME: くの字点 */ + 45115: "＼", /* FIXME: くの字点 */ 45116: "＼ﾞ", /* FIXME: くの字点 */ - 45117: "／", /* FIXME: くの字点 */ + 45117: "／", /* FIXME: くの字点 */ 45118: "〻", 45119: "ǂ", /* FIXME: 複十字, probably not the char they wanted */ 45120: "℉", diff --git a/daijisen.go b/daijisen.go index 6262891..caf96be 100644 --- a/daijisen.go +++ b/daijisen.go @@ -1,31 +1,10 @@ -/* -* Copyright (c) 2016-2021 Alex Yatskov -* -* Permission is hereby granted, free of charge, to any person obtaining a copy of -* this software and associated documentation files (the "Software"), to deal in -* the Software without restriction, including without limitation the rights to -* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -* the Software, and to permit persons to whom the Software is furnished to do so, -* subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in all -* copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type daijisenExtractor struct { diff --git a/edict.go b/edict.go index 827e5b1..cc9173e 100644 --- a/edict.go +++ b/edict.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "os" "strings" - "github.com/FooSoft/jmdict" + "foosoft.net/projects/jmdict" ) const jmdictRevision = "jmdict4" diff --git a/enamdict.go b/enamdict.go index 8977bf6..f3df513 100644 --- a/enamdict.go +++ b/enamdict.go @@ -1,30 +1,9 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "os" - "github.com/FooSoft/jmdict" + "foosoft.net/projects/jmdict" ) const jmnedictRevision = "jmnedict1" diff --git a/epwing.go b/epwing.go index b3d46f2..5005b01 100644 --- a/epwing.go +++ b/epwing.go @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( @@ -27,7 +6,7 @@ import ( "strconv" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type epwingExtractor interface { diff --git a/frequency.go b/frequency.go index a145d15..694ed67 100644 --- a/frequency.go +++ b/frequency.go @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2017-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( diff --git a/gakken.go b/gakken.go index 3e8ef04..b25f989 100644 --- a/gakken.go +++ b/gakken.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type gakkenExtractor struct { diff --git a/go.mod b/go.mod index f0c61a3..0bca3dd 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,12 @@ -module github.com/FooSoft/yomichan-import +module foosoft.net/projects/yomichan-import -go 1.15 +go 1.18 require ( - github.com/FooSoft/jmdict v0.0.0-20190926045629-808d66c7b050 - github.com/FooSoft/zero-epwing-go v0.0.0-20210111010306-2b31c3d779e3 + foosoft.net/projects/jmdict v0.0.0-20220704034116-2e3194aa18d5 + foosoft.net/projects/zero-epwing-go v0.0.0-20220704035039-bc008453615d github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e - github.com/mattn/go-sqlite3 v1.14.6 + github.com/mattn/go-sqlite3 v1.14.14 ) + +require golang.org/x/text v0.3.7 // indirect diff --git a/go.sum b/go.sum index ce15c64..ca51ada 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,10 @@ -github.com/FooSoft/jmdict v0.0.0-20190926045629-808d66c7b050 h1:3VWk8B61jEgfcV+pEgzWO1j7TVXC9g5QaS0J06994Zc= -github.com/FooSoft/jmdict v0.0.0-20190926045629-808d66c7b050/go.mod h1:zo92ezZlNld5cN1iuS0QRAmSsHcpvcqGZLVNKPM4Hlg= -github.com/FooSoft/zero-epwing-go v0.0.0-20210111010306-2b31c3d779e3 h1:cJAbqN6kihWyUi45bkThmpmHGqX0n3BxYgzHq7o0as8= -github.com/FooSoft/zero-epwing-go v0.0.0-20210111010306-2b31c3d779e3/go.mod h1:HbHFbLqiZe/xWwz7j0zPrHQ6CvJA3IM71yeB7ncL5ss= +foosoft.net/projects/jmdict v0.0.0-20220704034116-2e3194aa18d5 h1:OSA3YcWT9bUg4ut4bTuUtrW1wMg9wJen1VUBbLKqyTQ= +foosoft.net/projects/jmdict v0.0.0-20220704034116-2e3194aa18d5/go.mod h1:ZrjLCcE7ZrND28ZOSGYMd78tL+Dffiv2g+NjOMKgnew= +foosoft.net/projects/zero-epwing-go v0.0.0-20220704035039-bc008453615d h1:GDyxif1+wM5gml2yTb9zy+9KE9NcTrtFxplpQCt/ksQ= +foosoft.net/projects/zero-epwing-go v0.0.0-20220704035039-bc008453615d/go.mod h1:ux61lX0Tn9Pd3xz/48Obt2I/A5LPWoNtV2x6rZpWuPM= github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e h1:wSQCJiig/QkoUnpvelSPbLiZNWvh2yMqQTQvIQqSUkU= github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e/go.mod h1:5G2EjwzgZUPnnReoKvPWVneT8APYbyKkihDVAHUi0II= -github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg= -github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw= +github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/kanjidic.go b/kanjidic.go index d3b5786..37bebdd 100644 --- a/kanjidic.go +++ b/kanjidic.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "os" "strconv" - "github.com/FooSoft/jmdict" + "foosoft.net/projects/jmdict" ) const kanjidicRevision = "kanjidic2" diff --git a/kotowaza.go b/kotowaza.go index 8141fc0..7f713ae 100644 --- a/kotowaza.go +++ b/kotowaza.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2017-2021 Alex Yatskov , ajyliew - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type kotowazaExtractor struct { diff --git a/koujien.go b/koujien.go index cf898e7..89b7379 100644 --- a/koujien.go +++ b/koujien.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type koujienExtractor struct { diff --git a/meikyou.go b/meikyou.go index 6efe42e..78a3081 100644 --- a/meikyou.go +++ b/meikyou.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2017-2021 Alex Yatskov , ajyliew - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type meikyouExtractor struct { diff --git a/rikai.go b/rikai.go index 39041b6..651bc44 100644 --- a/rikai.go +++ b/rikai.go @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2017-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( diff --git a/scripts/build_dicts.sh b/scripts/build_dicts.sh index dc1eb6c..b91d9a5 100755 --- a/scripts/build_dicts.sh +++ b/scripts/build_dicts.sh @@ -1,6 +1,6 @@ #!/bin/bash -go get github.com/FooSoft/yomichan-import/yomichan +go get foosoft.net/projects/yomichan-import/yomichan mkdir -p src mkdir -p dst diff --git a/scripts/build_linux.sh b/scripts/build_linux.sh index 1569178..3fc8853 100755 --- a/scripts/build_linux.sh +++ b/scripts/build_linux.sh @@ -1,9 +1,10 @@ #!/bin/bash + mkdir -p dst mkdir -p yomichan-import -go build github.com/FooSoft/yomichan-import/yomichan -go build github.com/FooSoft/yomichan-import/yomichan-gtk +go build foosoft.net/projects/yomichan-import/yomichan +go build foosoft.net/projects/yomichan-import/yomichan-gtk mv yomichan yomichan-import mv yomichan-gtk yomichan-import diff --git a/scripts/build_windows.sh b/scripts/build_windows.sh index 7ddcfa3..0d856b8 100755 --- a/scripts/build_windows.sh +++ b/scripts/build_windows.sh @@ -1,11 +1,12 @@ #!/bin/bash + mkdir -p dst mkdir -p yomichan-import export CXX=x86_64-w64-mingw32-g++.exe export CC=x86_64-w64-mingw32-gcc.exe -go build github.com/FooSoft/yomichan-import/yomichan -go build -ldflags="-H windowsgui" github.com/FooSoft/yomichan-import/yomichan-gtk +go build foosoft.net/projects/yomichan-import/yomichan +go build -ldflags="-H windowsgui" foosoft.net/projects/yomichan-import/yomichan-gtk mv yomichan.exe yomichan-import mv yomichan-gtk.exe yomichan-import diff --git a/wadai.go b/wadai.go index 648169c..2507b92 100644 --- a/wadai.go +++ b/wadai.go @@ -1,31 +1,10 @@ -/* - * Copyright (c) 2017-2021 Alex Yatskov , ajyliew - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package yomichan import ( "regexp" "strings" - zig "github.com/FooSoft/zero-epwing-go" + zig "foosoft.net/projects/zero-epwing-go" ) type wadaiExtractor struct { diff --git a/yomichan-gtk/main.go b/yomichan-gtk/main.go index 801fc53..26df9a5 100644 --- a/yomichan-gtk/main.go +++ b/yomichan-gtk/main.go @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2017-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package main import ( @@ -28,7 +7,7 @@ import ( "github.com/andlabs/ui" _ "github.com/andlabs/ui/winmanifest" - yomichan "github.com/FooSoft/yomichan-import" + yomichan "foosoft.net/projects/yomichan-import" ) func main() { diff --git a/yomichan/main.go b/yomichan/main.go index 3ea164e..95cc22e 100644 --- a/yomichan/main.go +++ b/yomichan/main.go @@ -1,24 +1,3 @@ -/* - * Copyright (c) 2016-2021 Alex Yatskov - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - package main import ( @@ -28,7 +7,7 @@ import ( "os" "path" - yomichan "github.com/FooSoft/yomichan-import" + yomichan "foosoft.net/projects/yomichan-import" ) func usage() {