Skip to content

Commit

Permalink
chore: add go mod support (linuxdeepin#92)
Browse files Browse the repository at this point in the history
add go mod support

Log: add go mod support
  • Loading branch information
Decodetalkers authored Apr 6, 2023
1 parent e892aa5 commit f13dfbb
Show file tree
Hide file tree
Showing 21 changed files with 371 additions and 24 deletions.
5 changes: 5 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,8 @@ License: CC0-1.0
Files: misc/*
Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

# gomod files
Files: go.mod go.sum
Copyright: None
License: CC0-1.0
72 changes: 65 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,59 @@ SYSTEMD_SERVICE_DIR = ${SYSTEMD_LIB_DIR}/systemd/system/
GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build
export GO111MODULE=off

TESTS = \
${GOPKG_PREFIX}/adjust-grub-theme \
${GOPKG_PREFIX}/blurimage \
${GOPKG_PREFIX}/cursor-helper \
${GOPKG_PREFIX}/dde-open \
${GOPKG_PREFIX}/deepin-shutdown-sound \
${GOPKG_PREFIX}/device \
${GOPKG_PREFIX}/drandr \
${GOPKG_PREFIX}/dxinput \
${GOPKG_PREFIX}/dxinput/common \
${GOPKG_PREFIX}/dxinput/kwayland \
${GOPKG_PREFIX}/dxinput/utils \
${GOPKG_PREFIX}/graphic \
${GOPKG_PREFIX}/grub_theme/font \
${GOPKG_PREFIX}/grub_theme/themetxt \
${GOPKG_PREFIX}/gtk-thumbnailer \
${GOPKG_PREFIX}/hans2pinyin \
${GOPKG_PREFIX}/huangli \
${GOPKG_PREFIX}/huangli-generator \
${GOPKG_PREFIX}/i18n_dependent \
${GOPKG_PREFIX}/image-blur \
${GOPKG_PREFIX}/image-blur-helper \
${GOPKG_PREFIX}/inhibit_hint \
${GOPKG_PREFIX}/lang_info \
${GOPKG_PREFIX}/language_support \
${GOPKG_PREFIX}/locale-helper \
${GOPKG_PREFIX}/lunar-calendar \
${GOPKG_PREFIX}/polkit \
${GOPKG_PREFIX}/powersupply \
${GOPKG_PREFIX}/powersupply/battery \
${GOPKG_PREFIX}/session \
${GOPKG_PREFIX}/sound-theme-player \
${GOPKG_PREFIX}/soundutils \
${GOPKG_PREFIX}/theme_thumb \
${GOPKG_PREFIX}/theme_thumb/common \
${GOPKG_PREFIX}/theme_thumb/cursor \
${GOPKG_PREFIX}/theme_thumb/gtk \
${GOPKG_PREFIX}/theme_thumb/icon \
${GOPKG_PREFIX}/themes \
${GOPKG_PREFIX}/themes/scanner \
${GOPKG_PREFIX}/thumbnailer \
${GOPKG_PREFIX}/thumbnails \
${GOPKG_PREFIX}/thumbnails/cursor \
${GOPKG_PREFIX}/thumbnails/font \
${GOPKG_PREFIX}/thumbnails/gtk \
${GOPKG_PREFIX}/thumbnails/icon \
${GOPKG_PREFIX}/thumbnails/images \
${GOPKG_PREFIX}/thumbnails/loader \
${GOPKG_PREFIX}/thumbnails/pdf \
${GOPKG_PREFIX}/thumbnails/text \
${GOPKG_PREFIX}/userenv \
${GOPKG_PREFIX}/validator

LIBRARIES = \
thumbnails \
themes \
Expand All @@ -19,10 +72,15 @@ LIBRARIES = \
i18n_dependent \
session \
language_support \
userenv \
inhibit_hint \
powersupply \
polkit
userenv \
inhibit_hint \
powersupply \
polkit \

ININSTALLS = \
${LIBRARIES} \
go.sum \
go.mod

BINARIES = \
device \
Expand All @@ -35,7 +93,7 @@ BINARIES = \
sound-theme-player \
deepin-shutdown-sound \
dde-open \
adjust-grub-theme \
adjust-grub-theme \
image-blur \
image-blur-helper
#lunar-calendar \
Expand Down Expand Up @@ -105,7 +163,7 @@ install/lib/%:
mkdir -pv ${DESTDIR}${GOSITE_DIR}/src/${GOPKG_PREFIX}
cp -R ${CURDIR}/${GOBUILD_DIR}/src/${GOPKG_PREFIX}/${@F} ${DESTDIR}${GOSITE_DIR}/src/${GOPKG_PREFIX}

install-dev: ${addprefix install/lib/, ${LIBRARIES}}
install-dev: ${addprefix install/lib/, ${ININSTALLS}}

install: install-binary install-dev

Expand All @@ -118,7 +176,7 @@ check_code_quality: prepare
env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go vet ./...

test: prepare
env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go test -v ./...
env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go test -v ${TESTS}

print_gopath: prepare
GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}"
Expand Down
2 changes: 1 addition & 1 deletion cursor-helper/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"sync"
"time"

"github.com/godbus/dbus"
"github.com/godbus/dbus/v5"
"github.com/linuxdeepin/dde-api/themes"
"github.com/linuxdeepin/go-lib/dbusutil"
"github.com/linuxdeepin/go-lib/log"
Expand Down
2 changes: 1 addition & 1 deletion dde-open/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"os"
"path/filepath"

"github.com/godbus/dbus"
"github.com/godbus/dbus/v5"
startmanager "github.com/linuxdeepin/go-dbus-factory/session/org.deepin.dde.startmanager1"
gio "github.com/linuxdeepin/go-gir/gio-2.0"
"github.com/linuxdeepin/go-lib/log"
Expand Down
2 changes: 1 addition & 1 deletion device/device.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os/exec"
"sync"

"github.com/godbus/dbus"
"github.com/godbus/dbus/v5"
"github.com/linuxdeepin/go-lib/dbusutil"

polkit "github.com/linuxdeepin/go-dbus-factory/system/org.freedesktop.policykit1"
Expand Down
2 changes: 1 addition & 1 deletion dxinput/kwayland/inputdevice.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strconv"
"strings"

"github.com/godbus/dbus"
"github.com/godbus/dbus/v5"
. "github.com/linuxdeepin/dde-api/dxinput/common"
kwin "github.com/linuxdeepin/go-dbus-factory/session/org.kde.kwin"
)
Expand Down
30 changes: 30 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module github.com/linuxdeepin/dde-api

go 1.15

replace github.com/linuxdeepin/go-lib => github.com/Decodetalkers/go-lib v0.0.0-20230404025406-a17a10117d09

replace github.com/linuxdeepin/go-dbus-factory => github.com/Decodetalkers/go-dbus-factory v0.0.0-20230404030011-0eb743393708

require (
github.com/disintegration/imaging v1.6.2
github.com/fogleman/gg v1.3.0
github.com/godbus/dbus/v5 v5.1.0
github.com/gosexy/gettext v0.0.0-20160830220431-74466a0a0c4a
github.com/jinzhu/gorm v1.9.16
github.com/linuxdeepin/go-dbus-factory v0.0.0-20230208033821-bda82fd6525e
github.com/linuxdeepin/go-lib v0.0.0-00010101000000-000000000000
github.com/linuxdeepin/go-x11-client v0.0.0-20230131052004-7503e2337ee1
github.com/mattn/go-sqlite3 v1.14.16
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/rickb777/date v1.20.1
github.com/stretchr/testify v1.8.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)

require (
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/linuxdeepin/go-gir v0.0.0-20230331033513-a8d7a9e89f9b
github.com/zaf/g711 v0.0.0-20220109202201-cf0017bf0359 // indirect
golang.org/x/sys v0.3.0 // indirect
)
Loading

0 comments on commit f13dfbb

Please sign in to comment.