Parcourir la source

app: enable-filelog feature flag

darkfi il y a 1 an
Parent
commit
f3e2fce9c1
5 fichiers modifiés avec 21 ajouts et 11 suppressions
  1. 1 0
      bin/app/Cargo.toml
  2. 3 3
      bin/app/Makefile
  3. 14 0
      bin/app/release/macos/make-app.sh
  4. 2 7
      bin/app/src/logger.rs
  5. 1 1
      bin/app/src/text/mod.rs

+ 1 - 0
bin/app/Cargo.toml

@@ -51,6 +51,7 @@ regex = "1.11"
 [features]
 emulate-android = []
 enable-plugins = []
+enable-filelog = []
 # Network debugging. Should be disabled in release.
 enable-netdebug = []
 

+ 3 - 3
bin/app/Makefile

@@ -12,9 +12,9 @@ SRC = \
 
 RELEASE_FEATURES = --features=enable-plugins
 
-#FEATURES = --features=emulate-android
-#FEATURES = --features=enable-netdebug,enable-plugins
-DEV_FEATURES = --features=enable-netdebug
+#FEATURES = --features=enable-filelog,enable-netdebug,emulate-android
+#FEATURES = --features=enable-filelog,enable-netdebug,enable-plugins
+DEV_FEATURES = --features=enable-filelog,enable-netdebug
 
 all: $(SRC) fonts
 	cargo build --release $(RELEASE_FEATURES)

+ 14 - 0
bin/app/release/macos/make-app.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+APPDIR=darkfi.app/
+rm -fr $APPDIR
+mkdir $APPDIR
+cp -r Contents $APPDIR
+
+cp ../../darkfi-app.macos $APPDIR/darkfi
+cp ../../data/res/mipmap-xxxhdpi/ic_launcher.png $APPDIR/darkfi.png
+cp -r ../../assets $APPDIR
+
+hdiutil create -volname darkfi -srcfolder $APPDIR -ov -format UDZO darkfi.dmg
+#zip -r darkfi.app.zip $APPDIR
+

+ 2 - 7
bin/app/src/logger.rs

@@ -6,12 +6,6 @@ use simplelog::{
 };
 use std::{path::PathBuf, thread::sleep, time::Duration};
 
-#[cfg(target_os = "android")]
-const LOGS_ENABLED: bool = true;
-
-#[cfg(not(target_os = "android"))]
-const LOGS_ENABLED: bool = true;
-
 // Measured in bytes
 const LOGFILE_MAXSIZE: usize = 5_000_000;
 
@@ -176,7 +170,8 @@ pub fn setup_logging() {
 
     let cfg = ConfigBuilder::new().build();
 
-    if LOGS_ENABLED {
+    #[cfg(feature = "enable-filelog")]
+    {
         let log_file = FileRotate::new(
             logfile_path(),
             AppendCount::new(0),

+ 1 - 1
bin/app/src/text/mod.rs

@@ -53,7 +53,7 @@ fn custom_font_path() -> PathBuf {
 }
 #[cfg(not(target_os = "android"))]
 fn custom_font_path() -> PathBuf {
-    dirs::data_local_dir().unwrap().join("darkfi/font")
+    dirs::data_local_dir().unwrap().join("darkfi/app/font")
 }
 
 // From https://sourceforge.net/projects/freetype/files/freetype2/2.6/