From 779f9e19921f88f67fb099f0269647185818e9a9 Mon Sep 17 00:00:00 2001 From: Justin Hawkins Date: Mon, 5 Dec 2022 23:36:16 +1030 Subject: [PATCH] Goodbye perl build script. --- build-release.pl | 81 ------------------------------- go.mod | 2 +- go.sum | 26 +++++++--- tools/windows_metadata/release.go | 2 +- versioninfo.json-template | 43 ---------------- 5 files changed, 21 insertions(+), 133 deletions(-) delete mode 100755 build-release.pl delete mode 100644 versioninfo.json-template diff --git a/build-release.pl b/build-release.pl deleted file mode 100755 index b79bcd6..0000000 --- a/build-release.pl +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env perl - -use strict; -use warnings; -use Mojo::JSON qw/encode_json decode_json/; -use Mojo::File; - -open my $fh, "<", "version/version.go" || die $!; - -my $version; -while (<$fh>) { - $version = $1 if /^const\s+CurrentVersion.*?"v([\d\.]+)"/; -} -close $fh; -die "no version?" unless defined $version; - -my @version_parts = split /\./, $version; -die "bad version?" unless defined $version_parts[2]; - -foreach (@version_parts) { - $_ = 0 + $_; -} - -$version = "v$version"; - -# quit if tests fail -system("go test ./...") && die "not building release with failing tests"; - -# so lazy -system "rm", "-rf", "release", "dist"; -system "mkdir", "release"; -system "mkdir", "dist"; - -my %build = ( - win => { env => { GOOS => 'windows', GOARCH => 'amd64' }, filename => 'dau.exe' }, - linux_amd64 => { env => { GOOS => 'linux', GOARCH => 'amd64' }, filename => 'dau' }, - linux_arm64 => { env => { GOOS => 'linux', GOARCH => 'arm64' }, filename => 'dau' }, - mac_amd64 => { env => { GOOS => 'darwin', GOARCH => 'amd64' }, filename => 'dau' }, - mac_arm64 => { env => { GOOS => 'darwin', GOARCH => 'arm64' }, filename => 'dau' }, -); - -foreach my $type (keys %build) { - mkdir "release/$type"; -} - -add_extras(); - -foreach my $type (keys %build) { - print "building for $type\n"; - local $ENV{GOOS} = $build{$type}->{env}->{GOOS}; - local $ENV{GOARCH} = $build{$type}->{env}->{GOARCH}; - - unlink "resource.syso"; - - my @ldflags = (); - if ($type eq "win") { - # create the versioninfo.json based on the current version - my $tmp = Mojo::File->new("versioninfo.json-template")->slurp(); - my $vdata = decode_json($tmp); - $vdata->{FixedFileInfo}->{FileVersion}->{Major} = $version_parts[0] ; - $vdata->{FixedFileInfo}->{FileVersion}->{Minor} = $version_parts[1] ; - $vdata->{FixedFileInfo}->{FileVersion}->{Patch} = $version_parts[2] ; - $vdata->{FixedFileInfo}->{ProductVersion}->{Major} = $version_parts[0] ; - $vdata->{FixedFileInfo}->{ProductVersion}->{Minor} = $version_parts[1] ; - $vdata->{FixedFileInfo}->{ProductVersion}->{Patch} = $version_parts[2] ; - - $vdata->{StringFileInfo}->{ProductVersion} = $version; - - Mojo::File->new("versioninfo.json")->spurt(encode_json($vdata)); - - @ldflags = (qw/ -ldflags -H=windowsgui/); - system "go", "generate"; - } - warn join(' ', "go", "build", @ldflags, "-o", "release/$type/" . $build{$type}->{filename}); - system "go", "build", @ldflags, "-o", "release/$type/" . $build{$type}->{filename}; - system "zip", "-j", "dist/dau-$type-$version.zip", ( glob "release/$type/*" ); -} - -sub add_extras { - # we used to have a .bat file here, but no longer needed -} diff --git a/go.mod b/go.mod index 784a22d..880254a 100644 --- a/go.mod +++ b/go.mod @@ -11,5 +11,5 @@ require ( github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/stretchr/testify v1.6.1 // indirect golang.org/x/image v0.0.0-20210504121937-7319ad40d33e - golang.org/x/mod v0.4.2 + golang.org/x/mod v0.7.0 ) diff --git a/go.sum b/go.sum index c96ce8c..f9c6746 100644 --- a/go.sum +++ b/go.sum @@ -34,23 +34,35 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/image v0.0.0-20210504121937-7319ad40d33e h1:PzJMNfFQx+QO9hrC1GwZ4BoPGeNGhfeQEgcQFArEjPk= golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wBXhXNeUbB1XfN2vmTm0= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tools/windows_metadata/release.go b/tools/windows_metadata/release.go index f3d6096..f66dc88 100644 --- a/tools/windows_metadata/release.go +++ b/tools/windows_metadata/release.go @@ -63,7 +63,7 @@ func main() { panic("bad version" + version) } parts := strings.Split(version, ".") - if len(parts) != 3 { + if len(parts) < 3 { log.Fatalf("bad version: %s", version) } diff --git a/versioninfo.json-template b/versioninfo.json-template deleted file mode 100644 index fc6cb64..0000000 --- a/versioninfo.json-template +++ /dev/null @@ -1,43 +0,0 @@ -{ - "FixedFileInfo": { - "FileVersion": { - "Major": 0, - "Minor": 0, - "Patch": 0, - "Build": 0 - }, - "ProductVersion": { - "Major": 0, - "Minor": 0, - "Patch": 0, - "Build": 0 - }, - "FileFlagsMask": "3f", - "FileFlags ": "00", - "FileOS": "040004", - "FileType": "01", - "FileSubType": "00" - }, - "StringFileInfo": { - "Comments": "", - "CompanyName": "tardisx@github", - "FileDescription": "https://github.com/tardisx/discord-auto-upload", - "FileVersion": "", - "InternalName": "", - "LegalCopyright": "https://github.com/tardisx/discord-auto-upload/blob/master/LICENSE", - "LegalTrademarks": "", - "OriginalFilename": "", - "PrivateBuild": "", - "ProductName": "discord-auto-upload", - "ProductVersion": "v0.0.0", - "SpecialBuild": "" - }, - "VarFileInfo": { - "Translation": { - "LangID": "0409", - "CharsetID": "04B0" - } - }, - "IconPath": "dau.ico", - "ManifestPath": "" -}