Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix setup #108

Merged
merged 3 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.0.10+1

- Fix: setup commands error on linux

## 1.0.10

- Fix: memory leak caused by cvstatus
Expand Down
10 changes: 4 additions & 6 deletions bin/setup_commands.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'package:archive/archive_io.dart';
import 'package:args/command_runner.dart';
import 'package:path/path.dart' as p;
import 'package:stack_trace/stack_trace.dart';
import 'package:yaml/yaml.dart';

const setupPkgName = "opencv_dart";
const baseUrl = "https://github.com/rainyl/opencv_dart/releases/download";

abstract class BaseSetupCommand extends Command {
@override
Expand All @@ -31,14 +31,12 @@ abstract class BaseSetupCommand extends Command {
final opencvRoot = pkgRoot;
print(asInfo('Using package:$setupPkgName from $opencvRoot'));

final doc = loadYaml(File(p.join(opencvRoot, "pubspec.yaml")).readAsStringSync());
// ignore: avoid_dynamic_calls
final String version = doc["binary_version"] as String;
final String version = File(p.join(opencvRoot, "binary.version")).readAsStringSync();
final libTarName = "libopencv_dart-$os-$downArch.tar.gz";

extractPath ??= switch (os) {
OS.windows => p.join(opencvRoot, "windows"),
OS.linux => p.join(opencvRoot, "windows"),
OS.linux => p.join(opencvRoot, "linux"),
OS.android => p.join(opencvRoot, "android", "src", "main", "jniLibs", downArch),
OS.macos => p.join(opencvRoot, "macos"),
OS.ios => p.join(opencvRoot, "ios"),
Expand All @@ -55,7 +53,7 @@ abstract class BaseSetupCommand extends Command {
if (force || !saveFile.existsSync()) {
if (!saveFile.parent.existsSync()) saveFile.parent.createSync(recursive: true);

final String url = "https://github.com/rainyl/opencv_dart/releases/download/v$version/$libTarName";
final String url = "$baseUrl/v$version/$libTarName";
print(asInfo("Downloading $url"));
try {
final request = await HttpClient().getUrl(Uri.parse(url));
Expand Down
9 changes: 4 additions & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import conan.tools.files as cfiles
import tarfile
from pathlib import Path
import yaml

OPENCV_VERSION = "4.10.0+2"
OPENCV_FILES_URL = (
Expand Down Expand Up @@ -61,10 +60,10 @@ class OcvDartDesktop(ConanFile):

def __init__(self, display_name=""):
super().__init__(display_name)
pubspec = Path(str(self.options.get_safe("package_root", "."))) / "pubspec.yaml"
with open(pubspec, "r") as f:
doc = yaml.safe_load(f)
self.version = doc["binary_version"]
version_file = Path(str(self.options.get_safe("package_root", "."))) / "binary.version"
with open(version_file, "r") as f:
binary_version = f.read()
self.version = binary_version

def requirements(self):
out_dir = os.path.abspath(str(self.options.get_safe("output_dir")))
Expand Down
4 changes: 1 addition & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: opencv_dart
description: "OpenCV4 bindings for Dart language and Flutter, using dart:ffi. The most complete OpenCV bindings for Dart!"
version: 1.0.10
binary_version: 1.0.10
version: 1.0.10+1
homepage: https://github.com/rainyl/opencv_dart

environment:
Expand All @@ -14,7 +13,6 @@ dependencies:
plugin_platform_interface: ^2.1.8
ffi: ^2.1.0
equatable: ^2.0.5
yaml: ^3.1.2
path: ^1.9.0
args: ^2.5.0
archive: ^3.5.1
Expand Down
Loading