Skip to content

Commit

Permalink
Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
ananthakumaran committed Aug 26, 2024
1 parent a4f52d7 commit 5fd2d45
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/linux-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
wails doctor
wails build -tags webkit2_40
cp build/bin/Paisa build/linux/usr/local/bin
cp -r build/linux paisa_0.6.9_amd64
dpkg --build paisa_0.6.9_amd64
cp -r build/linux paisa_0.7.0_amd64
dpkg --build paisa_0.7.0_amd64
cd ..
mv desktop/paisa_0.6.9_amd64.deb paisa-app-linux-amd64.deb
mv desktop/paisa_0.7.0_amd64.deb paisa-app-linux-amd64.deb
- name: Release
uses: softprops/action-gh-release@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CHANGELOG

### 0.6.9 (2024-08-26)
### 0.7.0 (2024-08-26)

* Add [docker image variant](https://github.com/ananthakumaran/paisa/pull/274) for hledger and beancount
* Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.all
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/ananthakumaran/paisa:v0.6.9
FROM docker.io/ananthakumaran/paisa:v0.7.0

RUN apk --no-cache add hledger beancount

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.beancount
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/ananthakumaran/paisa:v0.6.9
FROM docker.io/ananthakumaran/paisa:v0.7.0

RUN apk --no-cache add beancount

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.hledger
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/ananthakumaran/paisa:v0.6.9
FROM docker.io/ananthakumaran/paisa:v0.7.0

RUN apk --no-cache add hledger

Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var versionCmd = &cobra.Command{
Use: "version",
Short: "Print the version information",
Run: func(cmd *cobra.Command, args []string) {
fmt.Println("Version:", "0.6.9")
fmt.Println("Version:", "0.7.0")
},
}

Expand Down
2 changes: 1 addition & 1 deletion desktop/build/linux/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: paisa
Version: 0.6.9
Version: 0.7.0
Section: misc
Priority: optional
Architecture: amd64
Expand Down
2 changes: 1 addition & 1 deletion desktop/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func main() {
Mac: &mac.Options{
About: &mac.AboutInfo{
Title: "Paisa",
Message: "Version 0.6.9 \nCopyright © 2022 - 2024 \nAnantha Kumaran",
Message: "Version 0.7.0 \nCopyright © 2022 - 2024 \nAnantha Kumaran",
Icon: icon,
},
},
Expand Down
2 changes: 1 addition & 1 deletion desktop/wails.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Info": {
"companyName": "Paisa",
"productName": "Paisa",
"productVersion": "0.6.9",
"productVersion": "0.7.0",
"copyright": "Copyright © 2022 - 2024 Anantha Kumaran",
"comments": "Personal finance manager"
}
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
packages.default = pkgs.buildGoModule {
pname = "paisa-cli";
meta.mainProgram = "paisa";
version = "0.6.9";
version = "0.7.0";

src = ./.;

Expand Down
48 changes: 39 additions & 9 deletions ledger.rb
Original file line number Diff line number Diff line change
@@ -1,34 +1,54 @@
class Ledger < Formula
desc "Command-line, double-entry accounting tool"
homepage "https://ledger-cli.org/"
url "https://github.com/ledger/ledger/archive/v3.3.2.tar.gz"
sha256 "555296ee1e870ff04e2356676977dcf55ebab5ad79126667bc56464cb1142035"
license "BSD-3-Clause"
revision 1
revision 6
head "https://github.com/ledger/ledger.git", branch: "master"

stable do
url "https://github.com/ledger/ledger/archive/refs/tags/v3.3.2.tar.gz"
sha256 "555296ee1e870ff04e2356676977dcf55ebab5ad79126667bc56464cb1142035"

# Support building with mandoc
# Remove with v3.4.x
patch do
url "https://github.com/ledger/ledger/commit/f40cee6c3af4c9cec05adf520fc7077a45060434.patch?full_index=1"
sha256 "d5be89dbadff7e564a750c10cdb04b83e875452071a2115dd70aae6e7a8ee76c"
end
patch do
url "https://github.com/ledger/ledger/commit/14b90d8d952b40e0a474223e7f74a1e6505d5450.patch?full_index=1"
sha256 "d250557e385163e3ad3002117ebe985af040d915aab49ae1ea342db82398aeda"
end

# Backport fix to build with `boost` 1.85.0
patch do
url "https://github.com/ledger/ledger/commit/46207852174feb5c76c7ab894bc13b4f388bf501.patch?full_index=1"
sha256 "8aaf8daf4748f359946c64488c96345f4a4bdf928f6ec7a1003610174428599f"
end
end

livecheck do
url :stable
regex(/^v?(\d+(?:\.\d+)+)$/i)
end

depends_on "boost"
depends_on "boost@1.85"
depends_on "gmp"
depends_on "mpfr"
depends_on "python@3.11" => :build
depends_on "python@3.12" => :build
depends_on "cmake" => :build

patch :DATA

def install
ENV.cxx11
ENV.prepend_path "PATH", Formula["python@3.11"].opt_libexec/"bin"
ENV.prepend_path "PATH", Formula["python@3.12"].opt_libexec/"bin"

args = %W[
--jobs=#{ENV.make_jobs}
--output=build
--prefix=#{prefix}
--boost=#{Formula["boost"].opt_prefix}
--boost=#{Formula["boost@1.85"].opt_prefix}
--
-DCMAKE_FIND_LIBRARY_SUFFIXES=.a
-DBUILD_SHARED_LIBS:BOOL=OFF
Expand All @@ -39,9 +59,19 @@ def install
-DBUILD_LIBRARY:BOOL=OFF
-DBoost_USE_STATIC_LIBS:BOOL=ON
] + std_cmake_args
system "./acprep", "make", *args
system "./acprep", "make", "install", *args

system "./acprep", "opt", "make", *args
system "./acprep", "opt", "make", "install", *args
end

test do
balance = testpath/"output"
system bin/"ledger",
"--args-only",
"--file", pkgshare/"examples/sample.dat",
"--output", balance,
"balance", "--collapse", "equity"
assert_equal " $-2,500.00 Equity", balance.read.chomp
end
end

Expand Down
2 changes: 1 addition & 1 deletion src/routes/(app)/more/about/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<div><Logo size={128} /></div>
<div class="is-size-3 is-primary-color">Paisa</div>
<div>
Version: <b>0.6.9</b>
Version: <b>0.7.0</b>
</div>
</div>

Expand Down

0 comments on commit 5fd2d45

Please sign in to comment.