Skip to content

Commit

Permalink
Merge pull request #191 from Notifiarr/dn2_build_fixes
Browse files Browse the repository at this point in the history 
Fix build.
  • Loading branch information
@davidnewhall
davidnewhall authored Mar 16, 2022
2 parents 3ac75a3 + 9efc8af commit 4eb48f7
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 29 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ env:
- MAKEBUILD=deb
jobs:
include:
- if: tag IS present
os: osx
osx_image: xcode12
- os: osx
if: tag IS present
osx_image: xcode13.2
language: go
go: 1.17.x
- if: tag IS NOT present
Expand Down
26 changes: 18 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,21 +87,23 @@ release: clean linux_packages freebsd_packages windows
# Generating File Hashes
openssl dgst -r -sha256 $@/* | sed 's#release/##' | tee $@/checksums.sha256.txt

# DMG only makes a DMG file is MACAPP is set. Otherwise, it makes a gzipped binary for macOS.
# DMG only makes a DMG file if MACAPP is set. Otherwise, it makes a gzipped binary for macOS.
dmg: clean macapp
mkdir -p release
[ "$(MACAPP)" = "" ] || hdiutil create release/$(MACAPP).dmg -srcfolder $(MACAPP).app -ov
[ "$(MACAPP)" = "" ] || hdiutil create release/$(MACAPP).amd64.dmg -srcfolder $(MACAPP).amd64.app -ov
[ "$(MACAPP)" = "" ] || hdiutil create release/$(MACAPP).arm64.dmg -srcfolder $(MACAPP).arm64.app -ov
[ "$(MACAPP)" != "" ] || mv $(BINARY).*.macos release/
[ "$(MACAPP)" != "" ] || gzip -9r release/
openssl dgst -r -sha256 release/* | sed 's#release/##' | tee release/macos_checksum.sha256.txt


# Delete all build assets.
clean:
rm -f $(BINARY) $(BINARY).*.{macos,freebsd,linux,exe,upx}{,.gz,.zip} $(BINARY).1{,.gz} $(BINARY).rb
rm -f $(BINARY){_,-}*.{deb,rpm,txz} v*.tar.gz.sha256 examples/MANUAL .metadata.make rsrc_*.syso
rm -f cmd/$(BINARY)/README{,.html} README{,.html} ./$(BINARY)_manual.html rsrc.syso $(MACAPP).app.zip
rm -f cmd/$(BINARY)/README{,.html} README{,.html} ./$(BINARY)_manual.html rsrc.syso $(MACAPP).*.app.zip
rm -f $(BINARY).aur.install PKGBUILD $(BINARY).service pkg/bindata/bindata.go
rm -rf aur package_build_* release after-install-rendered.sh before-remove-rendered.sh $(MACAPP).app
rm -rf aur package_build_* release after-install-rendered.sh before-remove-rendered.sh $(MACAPP).*.app

####################
##### Sidecars #####
Expand Down Expand Up @@ -168,11 +170,15 @@ $(BINARY).armhf.linux: generate main.go
GOOS=linux GOARCH=arm GOARM=6 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) "
[ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@

macos: $(BINARY).amd64.macos
macos: $(BINARY).amd64.macos $(BINARY).arm64.macos
$(BINARY).amd64.macos: generate main.go
# Building darwin 64-bit x86 binary.
GOOS=darwin GOARCH=amd64 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) "
[ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@
$(BINARY).arm64.macos: generate main.go
# Building darwin 64-bit arm binary.
GOOS=darwin GOARCH=arm64 CGO_ENABLED=1 go build -o $@ -ldflags "-w -s $(VERSION_LDFLAGS) $(EXTRA_LDFLAGS) "
[ -z "$(UPXPATH)" ] || $(UPXPATH) -q9 $@

freebsd: $(BINARY).amd64.freebsd
$(BINARY).amd64.freebsd: generate main.go
Expand Down Expand Up @@ -202,11 +208,15 @@ linux_packages: rpm deb rpm386 deb386 debarm rpmarm debarmhf rpmarmhf

freebsd_packages: freebsd_pkg freebsd386_pkg freebsdarm_pkg

macapp: $(MACAPP).app
$(MACAPP).app: macos
macapp: $(MACAPP).arm64.app $(MACAPP).amd64.app
$(MACAPP).amd64.app: macos
[ -z "$(MACAPP)" ] || mkdir -p init/macos/$(MACAPP).app/Contents/MacOS
[ -z "$(MACAPP)" ] || cp $(BINARY).amd64.macos init/macos/$(MACAPP).app/Contents/MacOS/$(MACAPP)
[ -z "$(MACAPP)" ] || cp -rp init/macos/$(MACAPP).app $(MACAPP).app
[ -z "$(MACAPP)" ] || cp -rp init/macos/$(MACAPP).app $(MACAPP).amd64.app
$(MACAPP).arm64.app: macos
[ -z "$(MACAPP)" ] || mkdir -p init/macos/$(MACAPP).app/Contents/MacOS
[ -z "$(MACAPP)" ] || cp $(BINARY).arm64.macos init/macos/$(MACAPP).app/Contents/MacOS/$(MACAPP)
[ -z "$(MACAPP)" ] || cp -rp init/macos/$(MACAPP).app $(MACAPP).arm64.app

aur: PKGBUILD SRCINFO $(BINARY).aur.install
mkdir -p $@
Expand Down
36 changes: 19 additions & 17 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.17

// home grown goodness.
require (
golift.io/cnfg v0.1.1
golift.io/cnfg v0.2.0
golift.io/deluge v0.9.4-0.20220227105649-ad9ba0f3a138
golift.io/qbit v0.0.0-20220227110129-6f84c5d5fe6f
golift.io/rotatorr v0.0.0-20220126065426-d6b5acaac41c
Expand All @@ -24,12 +24,12 @@ require (
github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect
github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 // indirect
github.com/getlantern/systray v1.2.0
github.com/getlantern/systray v1.2.1
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gonutz/w32 v1.0.0
github.com/iamacarpet/go-win64api v0.0.0-20211130162011-82e31fe23f80
github.com/iamacarpet/go-win64api v0.0.0-20220314100901-d3a958911279
github.com/tadvi/systray v0.0.0-20190226123456-11a2b8fa57af // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
gopkg.in/toast.v1 v1.0.0-20180812000517-0a84660828b2 // indirect
Expand All @@ -42,7 +42,7 @@ require (
github.com/go-sql-driver/mysql v1.6.0
github.com/go-stack/stack v1.8.1 // indirect
github.com/google/cabbie v1.0.3 // indirect
github.com/google/glazier v0.0.0-20220224203032-9d92df0df765 // indirect
github.com/google/glazier v0.0.0-20220309125052-ca3c88631db6 // indirect
github.com/gopherjs/gopherjs v0.0.0-20220221023154-0b2280d3ff96 // indirect
github.com/gopherjs/gopherwasm v1.1.0 // indirect
github.com/gorilla/mux v1.8.0
Expand All @@ -52,28 +52,28 @@ require (
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
github.com/lestrrat-go/apache-logformat v0.0.0-20200929122403-cd9b7dc018c7
github.com/lestrrat-go/strftime v1.0.5 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/lufia/plan9stats v0.0.0-20220305071607-d0b38dbe16db // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d // indirect
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/scjalliance/comshim v0.0.0-20190308082608-cf06d2532c4e // indirect
github.com/shirou/gopsutil/v3 v3.22.1
github.com/shirou/gopsutil/v3 v3.22.2
github.com/spf13/pflag v1.0.6-0.20201009195203-85dd5c8bc61c
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.4.0 // indirect
golang.org/x/mod v0.5.1
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
howett.net/plist v1.0.0 // indirect
)

// zip extraction for databsae corruption checks.
require (
github.com/nwaples/rardecode v1.1.2 // indirect
github.com/nwaples/rardecode v1.1.3 // indirect
github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda // indirect
github.com/saracen/go7z-fixtures v0.0.0-20190623165746-aa6b8fba1d2f // indirect
github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f // indirect
Expand All @@ -87,18 +87,18 @@ require (
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/tools v0.1.9 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
lukechampine.com/uint128 v1.2.0 // indirect
modernc.org/cc/v3 v3.35.22 // indirect
modernc.org/ccgo/v3 v3.15.13 // indirect
modernc.org/libc v1.14.5 // indirect
modernc.org/cc/v3 v3.35.24 // indirect
modernc.org/ccgo/v3 v3.15.17 // indirect
modernc.org/libc v1.14.11 // indirect
modernc.org/mathutil v1.4.1 // indirect
modernc.org/memory v1.0.5 // indirect
modernc.org/memory v1.0.6 // indirect
modernc.org/opt v0.1.1 // indirect
modernc.org/sqlite v1.14.7
modernc.org/sqlite v1.15.1
modernc.org/strutil v1.1.1 // indirect
modernc.org/token v1.0.0 // indirect
)
Expand All @@ -111,7 +111,9 @@ require (
github.com/gorilla/securecookie v1.1.1
github.com/gorilla/websocket v1.5.0
github.com/nxadm/tail v1.4.8
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
golang.org/x/crypto v0.0.0-20220314234724-5d542ad81a58
golift.io/datacounter v1.0.3
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
)

require golift.io/cnfgfile v0.0.0-20220228094812-5864a2124d02
Loading

0 comments on commit 4eb48f7

Please sign in to comment.