17 Commits

Author SHA1 Message Date
99096b2360 doc/README: add v1.0.2 changelog 2021-04-12 18:01:46 +12:00
0e92459779 no-op merge with legacy-codesite branch 2021-04-12 17:52:00 +12:00
a13eaaf523 make: upx doesn't support current mxe mingw/qt linked binaries 2021-04-12 17:44:38 +12:00
dca8d277d3 make: option to build windows binary in docker 2021-04-12 17:44:17 +12:00
15c739c0b9 squash 2021-04-12 17:43:59 +12:00
fc2da972ef dummy-data: fix build for renamed bbolt package 2021-04-12 17:07:16 +12:00
e45eea7111 makefile: remove 'hg export' function 2021-04-12 17:04:40 +12:00
1e62d79c07 doc: delete TODO.txt (issues now being tracked in Gitea)
The new issue tracker is at https://git.ivysaur.me/code.ivysaur.me/qbolt/issues
2021-04-12 17:04:27 +12:00
c74c5ae5c0 doc: move README/TODO to top-level directory 2021-04-12 17:00:49 +12:00
b0092c4a6e vendor: switch bolt implementation to etcd-io/bbolt v1.3.5 2021-04-12 17:00:40 +12:00
5ce6368c4a qt: fix missing -lpthread on Debian Bullseye 2021-04-12 16:54:06 +12:00
3e7e54da4b go: add go.mod file for bolt dependency 2021-04-12 16:53:57 +12:00
9f80d687b2 hg2git: replace hgignore/hgtags files 2021-04-12 16:53:43 +12:00
96411e877f bump all versions to 1.0.2 2017-06-19 21:04:40 +12:00
ac7e078c02 Added tag release-1.0.1 for changeset 0528a0ab20b6 2017-06-19 21:04:23 +12:00
6fb8d1ba0c commit all archived files 2017-06-19 00:00:00 +00:00
8d8374be24 initial meta commit 2017-05-21 00:00:00 +00:00
12 changed files with 59 additions and 29 deletions

4
.gitignore vendored Normal file
View File

@@ -0,0 +1,4 @@
build-qbolt-*
dummy-data/dummy-data*
*.pro.user$
build/

View File

@@ -1,5 +0,0 @@
mode:regexp
^build-qbolt-
^dummy-data/dummy-data$
\.pro\.user$
^build/

View File

@@ -1 +0,0 @@
74cacbbe8f6cfb20a63902fb76e48c02d5cf2963 release-1.0.0

View File

@@ -1,7 +1,7 @@
export PATH := /usr/lib/mxe/usr/bin:$(PATH) export PATH := /usr/lib/mxe/usr/bin:$(PATH)
GOFLAGS := -ldflags='-s -w' -gcflags='-trimpath=$(CURDIR)' -asmflags='-trimpath=$(CURDIR)' GOFLAGS := -ldflags='-s -w' -gcflags='-trimpath=$(CURDIR)' -asmflags='-trimpath=$(CURDIR)'
VERSION := 1.0.1 VERSION := 1.0.2
.PHONY: all libs dist clean .PHONY: all libs dist clean
@@ -15,7 +15,6 @@ libs: \
dist: \ dist: \
build/dist/qbolt-${VERSION}-win32.zip \ build/dist/qbolt-${VERSION}-win32.zip \
build/dist/qbolt-${VERSION}-src.tar.gz \
build/dist/qbolt-${VERSION}-linux_amd64.tar.xz build/dist/qbolt-${VERSION}-linux_amd64.tar.xz
clean: clean:
@@ -51,18 +50,23 @@ build/dist/qbolt-${VERSION}-linux_amd64.tar.xz: build/linux/qbolt
build/win32/release/qbolt.exe: build/win32/qbolt.a qbolt/* build/win32/release/qbolt.exe: build/win32/qbolt.a qbolt/*
cd build/win32 && i686-w64-mingw32.static-qmake-qt5 ../../qbolt/qbolt.pro && make cd build/win32 && i686-w64-mingw32.static-qmake-qt5 ../../qbolt/qbolt.pro && make
# Dockerized Windows build
.PHONY: build-docker-build-environment
build-docker-build-environment:
cd docker && docker build -t win32-cross-qt-mxe:latest -f win32-cross-qt-mxe.Dockerfile
.PHONY: build-windows-in-docker
build-windows-in-docker:
docker run --rm -v $(CURDIR):/qbolt win32-cross-qt-mxe:latest /bin/sh -c 'cd /qbolt && make build/win32/release/qbolt.exe'
# Windows distribution # Windows distribution
build/win32/dist/qbolt.exe: build/win32/release/qbolt.exe build/win32/dist/qbolt.exe: build/win32/release/qbolt.exe
mkdir -p build/win32/dist mkdir -p build/win32/dist
cp build/win32/release/qbolt.exe build/win32/dist/qbolt.exe cp build/win32/release/qbolt.exe build/win32/dist/qbolt.exe
upx --lzma build/win32/dist/qbolt.exe # upx --lzma build/win32/dist/qbolt.exe
build/dist/qbolt-${VERSION}-win32.zip: build/win32/dist/qbolt.exe build/dist/qbolt-${VERSION}-win32.zip: build/win32/dist/qbolt.exe
mkdir -p build/dist mkdir -p build/dist
zip -0 -j build/dist/qbolt-${VERSION}-win32.zip build/win32/dist/qbolt.exe zip -0 -j build/dist/qbolt-${VERSION}-win32.zip build/win32/dist/qbolt.exe
# Source code archives
build/dist/qbolt-${VERSION}-src.tar.gz:
hg archive build/dist/qbolt-${VERSION}-src.tar.gz

View File

@@ -1,3 +1,5 @@
# qbolt
A graphical database manager for BoltDB. A graphical database manager for BoltDB.
QBolt allows you to graphically view and edit the content of Bolt databases. QBolt allows you to graphically view and edit the content of Bolt databases.
@@ -6,7 +8,7 @@ The project consists of two parts; a C binding (CGo) for the embeddable Bolt dat
Written in C++ (Qt), Golang (CGo) Written in C++ (Qt), Golang (CGo)
=FEATURES= ## Features
- Open existing database or create new database - Open existing database or create new database
- Option to open database as readonly for concurrent use - Option to open database as readonly for concurrent use
@@ -16,23 +18,32 @@ Written in C++ (Qt), Golang (CGo)
- 100% Bolt compatibility via the real codebase - 100% Bolt compatibility via the real codebase
- Tested working on both Windows and Linux - Tested working on both Windows and Linux
=LICENSE= ## License
Source code content of `qbolt-x.x.x-src.tar.gz` is released under the ISC license. Source code content of `qbolt-x.x.x-src.tar.gz` is released under the ISC license.
BoltDB is released under the MIT license. BoltDB is released under the MIT license.
The Windows binary is released under LGPL-3+ owing to the static copy of Qt. The Windows binary is released under LGPL-3+ owing to the static copy of Qt.
=SEE ALSO= ## See also
- BoltDB https://github.com/boltdb/bolt - BoltDB https://github.com/boltdb/bolt
=CHANGELOG= ## Changelog
2020-04-12 1.0.2
- Rebuild artefacts with etcd-io/bbolt v1.3.5, go 1.15, Qt 5.15, and new GCC versions
- Switch from hg to Git
- Use Go modules
- Add support for building Windows binary in Docker
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.2)
2017-06-19 1.0.1 2017-06-19 1.0.1
- Feature: Option to open database as read-only - Feature: Option to open database as read-only
- Fix an issue with support for bucket names and keys not surviving UTF-8 roundtrips (now binary-clean) - Fix an issue with support for bucket names and keys not surviving UTF-8 roundtrips (now binary-clean)
- Fix an issue with crashing when deleting a bucket other than the selected one - Fix an issue with crashing when deleting a bucket other than the selected one
- Fix a cosmetic issue with application icon on Windows - Fix a cosmetic issue with application icon on Windows
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.1)
2017-05-21 1.0.0 2017-05-21 1.0.0
- Initial public release - Initial public release
- [⬇ Download here](https://git.ivysaur.me/code.ivysaur.me/qbolt/releases/tag/v1.0.0)

View File

@@ -1,9 +0,0 @@
- Reduce unnecessary memory copies between QString/QByteArray
- Convert from item-based to model-based Qt widgets - needs deep integration with Bolt cursors...
- Rename buckets
- Delete multiple buckets

View File

@@ -0,0 +1,13 @@
FROM debian:bullseye
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
apt-get install -qyy gnupg2 golang-go ca-certificates
RUN DEBIAN_FRONTEND=noninteractive \
echo "deb https://pkg.mxe.cc/repos/apt buster main" >/etc/apt/sources.list.d/mxeapt.list && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 86B72ED9 && \
apt-get update && \
apt-get install -qyy mxe-i686-w64-mingw32.static-qt5 && \
apt-get clean
ENV PATH=/usr/lib/mxe/usr/bin:$PATH

View File

@@ -5,7 +5,7 @@ import (
"math/rand" "math/rand"
"os" "os"
"github.com/boltdb/bolt" bolt "github.com/boltdb/bolt"
) )
func random_name() string { func random_name() string {

7
go.mod Normal file
View File

@@ -0,0 +1,7 @@
module code.ivysaur.me/qbolt
go 1.15
require github.com/boltdb/bolt v1.3.1
replace github.com/boltdb/bolt => go.etcd.io/bbolt v1.3.5

5
go.sum Normal file
View File

@@ -0,0 +1,5 @@
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

View File

@@ -8,7 +8,7 @@ import (
"os" "os"
"time" "time"
"github.com/boltdb/bolt" bolt "github.com/boltdb/bolt"
) )
const ( const (

View File

@@ -26,6 +26,7 @@ win32: {
linux: { linux: {
QMAKE_LIBS += $$_PRO_FILE_PWD_/../build/linux/qbolt.a QMAKE_LIBS += $$_PRO_FILE_PWD_/../build/linux/qbolt.a
QMAKE_LIBS += -lpthread
} }
SOURCES += main.cpp\ SOURCES += main.cpp\