Sfoglia il codice sorgente

app: make tweaks to build and release workflow for win/mac

darkfi 9 mesi fa
parent
commit
06ae05d11f
3 ha cambiato i file con 8 aggiunte e 8 eliminazioni
  1. 2 2
      bin/app/Makefile
  2. 2 2
      bin/app/release/macos/make-app.sh
  3. 4 4
      bin/app/src/main.rs

+ 2 - 2
bin/app/Makefile

@@ -45,10 +45,10 @@ win-release: $(SRC) fonts
 win-debug: $(SRC) fonts
 	$(CARGO) build $(DEBUG_FEATURES)
 	-mv target/debug/darkfi-app.exe .
-android-release: $(SRC) fonts forest_720x1080
+android-release: $(SRC) fonts forest_720x1280
 	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build --release $(RELEASE_FEATURES)
 	-mv $(RELEASE_APK) darkfi-app.apk
-android-debug: $(SRC) fonts forest_720x1080
+android-debug: $(SRC) fonts forest_720x1280
 	podman run -v $(shell pwd)/../../:/root/darkfi -w /root/darkfi/bin/app/ -t apk cargo quad-apk build $(DEBUG_FEATURES)
 	-mv $(DEBUG_APK) darkfi-app_debug.apk
 

+ 2 - 2
bin/app/release/macos/make-app.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-APPDIR=darkfi.app/
+APPDIR=DarkFi.app/
 rm -fr $APPDIR
 mkdir $APPDIR
 cp -r Contents $APPDIR
@@ -9,6 +9,6 @@ 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
+hdiutil create -volname DarkFi -srcfolder $APPDIR -ov -format UDZO darkfi.dmg
 #zip -r darkfi.app.zip $APPDIR
 

+ 4 - 4
bin/app/src/main.rs

@@ -16,6 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+// Hides the cmd.exe terminal on Windows.
+// Enable this when making release builds.
+#![cfg_attr(target_os = "windows", windows_subsystem = "windows")]
+
 use clap::Parser;
 use darkfi::system::CondVar;
 use std::sync::{Arc, OnceLock};
@@ -87,10 +91,6 @@ macro_rules! d { ($($arg:tt)*) => { trace!(target: "main", $($arg)*); } }
 #[cfg(feature = "enable-plugins")]
 macro_rules! i { ($($arg:tt)*) => { trace!(target: "main", $($arg)*); } }
 
-// Hides the cmd.exe terminal on Windows.
-// Enable this when making release builds.
-//#![windows_subsystem = "windows"]
-
 fn panic_hook(panic_info: &std::panic::PanicHookInfo) {
     error!("panic occurred: {panic_info}");
     error!("{}", std::backtrace::Backtrace::force_capture().to_string());