From b858f36d54632f50d4c96034857db7c923ff702a Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Tue, 23 Aug 2022 16:25:15 +0900 Subject: [PATCH] remove the dependency on file2byteslice Specify the version explicitly instead. --- audio/vorbis/generate.go | 4 +- cmd/ebitenmobile/generate.go | 2 +- ebitenutil/debugprint.go | 2 +- examples/keyboard/keyboard/gen.go | 15 ++-- examples/resources/generate.go | 66 +++++++++--------- .../resources/images/keyboard/keyboard.png | Bin 3688 -> 0 bytes examples/shader/generate.go | 16 ++--- go.mod | 1 - go.sum | 2 - internal/gamepaddb/gamepaddb.go | 2 +- tools.go | 24 ------- 11 files changed, 54 insertions(+), 80 deletions(-) delete mode 100644 examples/resources/images/keyboard/keyboard.png delete mode 100644 tools.go diff --git a/audio/vorbis/generate.go b/audio/vorbis/generate.go index 83ba610e8..b500f573f 100644 --- a/audio/vorbis/generate.go +++ b/audio/vorbis/generate.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=vorbis_test -input=./test_mono.ogg -output=./testmonoogg_test.go -var=test_mono_ogg -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=vorbis_test -input=./test_tooshort.ogg -output=./testtooshortogg_test.go -var=test_tooshort_ogg +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=vorbis_test -input=./test_mono.ogg -output=./testmonoogg_test.go -var=test_mono_ogg +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=vorbis_test -input=./test_tooshort.ogg -output=./testtooshortogg_test.go -var=test_tooshort_ogg //go:generate gofmt -s -w . package vorbis diff --git a/cmd/ebitenmobile/generate.go b/cmd/ebitenmobile/generate.go index af6ca2351..ed1498b0b 100644 --- a/cmd/ebitenmobile/generate.go +++ b/cmd/ebitenmobile/generate.go @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=main -input=gobind.go -output=gobind.src.go -var gobindsrc +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=main -input=gobind.go -output=gobind.src.go -var gobindsrc package main diff --git a/ebitenutil/debugprint.go b/ebitenutil/debugprint.go index 02cb06c90..d68327908 100644 --- a/ebitenutil/debugprint.go +++ b/ebitenutil/debugprint.go @@ -13,7 +13,7 @@ // limitations under the License. //go:generate go run gen.go -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -input text.png -output text.png.go -package ebitenutil -var textPng +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -input text.png -output text.png.go -package ebitenutil -var textPng package ebitenutil diff --git a/examples/keyboard/keyboard/gen.go b/examples/keyboard/keyboard/gen.go index 759c13abf..bbaf36542 100644 --- a/examples/keyboard/keyboard/gen.go +++ b/examples/keyboard/keyboard/gen.go @@ -26,10 +26,10 @@ import ( "io/ioutil" "log" "os" + "os/exec" "path/filepath" "text/template" - "github.com/hajimehoshi/file2byteslice" "golang.org/x/image/font" "golang.org/x/image/font/opentype" @@ -247,15 +247,16 @@ func outputKeyboardImage() (map[ebiten.Key]image.Rectangle, error) { return nil, err } - out, err := os.Create("../../resources/images/keyboard/keyboard.go") - if err != nil { + cmd := exec.Command("go", "run", "github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0", + "-output", "../../resources/images/keyboard/keyboard.go", + "-package", "keyboard", + "-var", "Keyboard_png") + cmd.Stdin = &buf + cmd.Stderr = os.Stderr + if err := cmd.Run(); err != nil { return nil, err } - defer out.Close() - if err := file2byteslice.Write(out, &buf, false, "", "keyboard", "Keyboard_png"); err != nil { - return nil, err - } return keyMap, nil } diff --git a/examples/resources/generate.go b/examples/resources/generate.go index c236e300a..9d5ca9755 100644 --- a/examples/resources/generate.go +++ b/examples/resources/generate.go @@ -12,39 +12,39 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./audio/jab.wav -output=./audio/jab.go -var=Jab_wav -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./audio/jump.ogg -output=./audio/jump.go -var=Jump_ogg -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./audio/ragtime.mp3 -output=./audio/ragtime.mp3.go -var=Ragtime_mp3 -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./audio/ragtime.ogg -output=./audio/ragtime.ogg.go -var=Ragtime_ogg -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=fonts -input=./fonts/mplus-1p-regular.ttf -output=./fonts/mplus1pregular.go -var=MPlus1pRegular_ttf -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=fonts -input=./fonts/pressstart2p.ttf -output=./fonts/pressstart2p.go -var=PressStart2P_ttf -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/ebiten.png -output=./images/ebiten.go -var=Ebiten_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/fiveyears.jpg -output=./images/fiveyears.go -var=FiveYears_jpg -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/gophers.jpg -output=./images/gophers.go -var=Gophers_jpg -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/runner.png -output=./images/runner.go -var=Runner_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/smoke.png -output=./images/smoke.go -var=Smoke_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/spritesheet.png -output=./images/spritesheet.go -var=Spritesheet_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/tile.png -output=./images/tile.go -var=Tile_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/tiles.png -output=./images/tiles.go -var=Tiles_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=images -input=./images/ui.png -output=./images/ui.go -var=UI_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./images/audio/alert.png -output=./images/audio/alert.go -var=Alert_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./images/audio/pause.png -output=./images/audio/pause.go -var=Pause_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=audio -input=./images/audio/play.png -output=./images/audio/play.go -var=Play_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=blocks -input=./images/blocks/background.png -output=./images/blocks/background.go -var=Background_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=blocks -input=./images/blocks/blocks.png -output=./images/blocks/blocks.go -var=Blocks_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=flappy -input=./images/flappy/gopher.png -output=./images/flappy/gopher.go -var=Gopher_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=flappy -input=./images/flappy/tiles.png -output=./images/flappy/tiles.go -var=Tiles_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=mascot -input=./images/mascot/out01.png -output=./images/mascot/out01.go -var=Out01_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=mascot -input=./images/mascot/out02.png -output=./images/mascot/out02.go -var=Out02_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=mascot -input=./images/mascot/out03.png -output=./images/mascot/out03.go -var=Out03_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=shader -input=./images/shader/gopher.png -output=./images/shader/gopher.go -var=Gopher_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=shader -input=./images/shader/gopherbg.png -output=./images/shader/gopherbg.go -var=GopherBg_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=shader -input=./images/shader/normal.png -output=./images/shader/normal.go -var=Normal_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=shader -input=./images/shader/noise.png -output=./images/shader/noise.go -var=Noise_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=platformer -input=./images/platformer/background.png -output=./images/platformer/background.go -var=Background_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=platformer -input=./images/platformer/left.png -output=./images/platformer/left.go -var=Left_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=platformer -input=./images/platformer/mainchar.png -output=./images/platformer/mainchar.go -var=MainChar_png -//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice -package=platformer -input=./images/platformer/right.png -output=./images/platformer/right.go -var=Right_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./audio/jab.wav -output=./audio/jab.go -var=Jab_wav +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./audio/jump.ogg -output=./audio/jump.go -var=Jump_ogg +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./audio/ragtime.mp3 -output=./audio/ragtime.mp3.go -var=Ragtime_mp3 +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./audio/ragtime.ogg -output=./audio/ragtime.ogg.go -var=Ragtime_ogg +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=fonts -input=./fonts/mplus-1p-regular.ttf -output=./fonts/mplus1pregular.go -var=MPlus1pRegular_ttf +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=fonts -input=./fonts/pressstart2p.ttf -output=./fonts/pressstart2p.go -var=PressStart2P_ttf +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/ebiten.png -output=./images/ebiten.go -var=Ebiten_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/fiveyears.jpg -output=./images/fiveyears.go -var=FiveYears_jpg +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/gophers.jpg -output=./images/gophers.go -var=Gophers_jpg +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/runner.png -output=./images/runner.go -var=Runner_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/smoke.png -output=./images/smoke.go -var=Smoke_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/spritesheet.png -output=./images/spritesheet.go -var=Spritesheet_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/tile.png -output=./images/tile.go -var=Tile_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/tiles.png -output=./images/tiles.go -var=Tiles_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=images -input=./images/ui.png -output=./images/ui.go -var=UI_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./images/audio/alert.png -output=./images/audio/alert.go -var=Alert_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./images/audio/pause.png -output=./images/audio/pause.go -var=Pause_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=audio -input=./images/audio/play.png -output=./images/audio/play.go -var=Play_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=blocks -input=./images/blocks/background.png -output=./images/blocks/background.go -var=Background_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=blocks -input=./images/blocks/blocks.png -output=./images/blocks/blocks.go -var=Blocks_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=flappy -input=./images/flappy/gopher.png -output=./images/flappy/gopher.go -var=Gopher_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=flappy -input=./images/flappy/tiles.png -output=./images/flappy/tiles.go -var=Tiles_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=mascot -input=./images/mascot/out01.png -output=./images/mascot/out01.go -var=Out01_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=mascot -input=./images/mascot/out02.png -output=./images/mascot/out02.go -var=Out02_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=mascot -input=./images/mascot/out03.png -output=./images/mascot/out03.go -var=Out03_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=shader -input=./images/shader/gopher.png -output=./images/shader/gopher.go -var=Gopher_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=shader -input=./images/shader/gopherbg.png -output=./images/shader/gopherbg.go -var=GopherBg_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=shader -input=./images/shader/normal.png -output=./images/shader/normal.go -var=Normal_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=shader -input=./images/shader/noise.png -output=./images/shader/noise.go -var=Noise_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=platformer -input=./images/platformer/background.png -output=./images/platformer/background.go -var=Background_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=platformer -input=./images/platformer/left.png -output=./images/platformer/left.go -var=Left_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=platformer -input=./images/platformer/mainchar.png -output=./images/platformer/mainchar.go -var=MainChar_png +//go:generate go run github.com/hajimehoshi/file2byteslice/cmd/file2byteslice@v1.0.0 -package=platformer -input=./images/platformer/right.png -output=./images/platformer/right.go -var=Right_png //go:generate gofmt -s -w . package resources diff --git a/examples/resources/images/keyboard/keyboard.png b/examples/resources/images/keyboard/keyboard.png deleted file mode 100644 index 1e8d39c502f78682b99a4adff5c175b2ef740d2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3688 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