From fceb5862c3c445873461ca8bd06b2cb84392db94 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 21 Sep 2018 11:39:52 -0500 Subject: [PATCH 1/6] Add vmPath variable --- desktop/package/osx/create_app.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/desktop/package/osx/create_app.sh b/desktop/package/osx/create_app.sh index 3bd54c848c8..8d86b20d0dd 100755 --- a/desktop/package/osx/create_app.sh +++ b/desktop/package/osx/create_app.sh @@ -35,11 +35,12 @@ java -jar ./package/osx/tools-1.0.jar $EXE_JAR echo SHA 256 after stripping jar file to get a deterministic jar: shasum -a256 $EXE_JAR | awk '{print $1}' | tee deploy/Bisq-$version.jar.txt - -linux32=/Volumes/vm_shared_ubuntu14_32bit -linux64=/Volumes/vm_shared_ubuntu -win32=/Volumes/vm_shared_windows_32bit -win64=/Volumes/vm_shared_windows +# vmPath=/Volumes +vmPath=/Users/dev +linux32=$vmPath/vm_shared_ubuntu14_32bit +linux64=$vmPath/vm_shared_ubuntu +win32=$vmPath/vm_shared_windows_32bit +win64=$vmPath/vm_shared_windows mkdir -p $linux32 $linux64 $win32 $win64 From 5b21d0cdba6e3d8ce86472f0408051b1adfbf2df Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 21 Sep 2018 11:40:44 -0500 Subject: [PATCH 2/6] Remove cleanup tasks --- desktop/package/osx/create_app.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/desktop/package/osx/create_app.sh b/desktop/package/osx/create_app.sh index 8d86b20d0dd..0882f132ca5 100755 --- a/desktop/package/osx/create_app.sh +++ b/desktop/package/osx/create_app.sh @@ -105,12 +105,6 @@ $JAVA_HOME/bin/javapackager \ -appclass bisq.desktop.app.BisqAppMain \ -outfile Bisq -rm "deploy/Bisq.html" -rm "deploy/Bisq.jnlp" - -mv "deploy/bundles/Bisq-$version.dmg" "deploy/Bisq-$version.dmg" -rm -r "deploy/bundles" - open deploy cd package/osx From d451db08c45852ae0c1abb50cbf8b1fb2522fc40 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 21 Sep 2018 12:24:49 -0500 Subject: [PATCH 3/6] Rename directory osx to macosx to include Info.plist file - Our Info.plist file was not included but an auto generated file was used instead. The app category entry was not set. The icon entry was wrong so I removed it here. --- desktop/package/{osx => macosx}/Bisq.icns | Bin .../{osx => macosx}/Bisq.iconset/icon_128x128.png | Bin .../Bisq.iconset/icon_128x128@2x.png | Bin .../{osx => macosx}/Bisq.iconset/icon_16x16.png | Bin .../{osx => macosx}/Bisq.iconset/icon_16x16@2x.png | Bin .../{osx => macosx}/Bisq.iconset/icon_256x256.png | Bin .../Bisq.iconset/icon_256x256@2x.png | Bin .../{osx => macosx}/Bisq.iconset/icon_32x32.png | Bin .../{osx => macosx}/Bisq.iconset/icon_32x32@2x.png | Bin .../{osx => macosx}/Bisq.iconset/icon_512x512.png | Bin .../Bisq.iconset/icon_512x512@2x.png | Bin .../{osx => macosx}/Bisq.iconset/icon_64x64.png | Bin .../{osx => macosx}/Bisq.iconset/icon_64x64@2x.png | Bin desktop/package/{osx => macosx}/Info.plist | 2 -- desktop/package/{osx => macosx}/create_app.sh | 6 +++--- desktop/package/{osx => macosx}/finalize.sh | 0 desktop/package/{osx => macosx}/tools-1.0.jar | Bin 17 files changed, 3 insertions(+), 5 deletions(-) rename desktop/package/{osx => macosx}/Bisq.icns (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_128x128.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_128x128@2x.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_16x16.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_16x16@2x.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_256x256.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_256x256@2x.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_32x32.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_32x32@2x.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_512x512.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_512x512@2x.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_64x64.png (100%) rename desktop/package/{osx => macosx}/Bisq.iconset/icon_64x64@2x.png (100%) rename desktop/package/{osx => macosx}/Info.plist (95%) rename desktop/package/{osx => macosx}/create_app.sh (96%) rename desktop/package/{osx => macosx}/finalize.sh (100%) rename desktop/package/{osx => macosx}/tools-1.0.jar (100%) diff --git a/desktop/package/osx/Bisq.icns b/desktop/package/macosx/Bisq.icns similarity index 100% rename from desktop/package/osx/Bisq.icns rename to desktop/package/macosx/Bisq.icns diff --git a/desktop/package/osx/Bisq.iconset/icon_128x128.png b/desktop/package/macosx/Bisq.iconset/icon_128x128.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_128x128.png rename to desktop/package/macosx/Bisq.iconset/icon_128x128.png diff --git a/desktop/package/osx/Bisq.iconset/icon_128x128@2x.png b/desktop/package/macosx/Bisq.iconset/icon_128x128@2x.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_128x128@2x.png rename to desktop/package/macosx/Bisq.iconset/icon_128x128@2x.png diff --git a/desktop/package/osx/Bisq.iconset/icon_16x16.png b/desktop/package/macosx/Bisq.iconset/icon_16x16.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_16x16.png rename to desktop/package/macosx/Bisq.iconset/icon_16x16.png diff --git a/desktop/package/osx/Bisq.iconset/icon_16x16@2x.png b/desktop/package/macosx/Bisq.iconset/icon_16x16@2x.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_16x16@2x.png rename to desktop/package/macosx/Bisq.iconset/icon_16x16@2x.png diff --git a/desktop/package/osx/Bisq.iconset/icon_256x256.png b/desktop/package/macosx/Bisq.iconset/icon_256x256.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_256x256.png rename to desktop/package/macosx/Bisq.iconset/icon_256x256.png diff --git a/desktop/package/osx/Bisq.iconset/icon_256x256@2x.png b/desktop/package/macosx/Bisq.iconset/icon_256x256@2x.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_256x256@2x.png rename to desktop/package/macosx/Bisq.iconset/icon_256x256@2x.png diff --git a/desktop/package/osx/Bisq.iconset/icon_32x32.png b/desktop/package/macosx/Bisq.iconset/icon_32x32.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_32x32.png rename to desktop/package/macosx/Bisq.iconset/icon_32x32.png diff --git a/desktop/package/osx/Bisq.iconset/icon_32x32@2x.png b/desktop/package/macosx/Bisq.iconset/icon_32x32@2x.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_32x32@2x.png rename to desktop/package/macosx/Bisq.iconset/icon_32x32@2x.png diff --git a/desktop/package/osx/Bisq.iconset/icon_512x512.png b/desktop/package/macosx/Bisq.iconset/icon_512x512.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_512x512.png rename to desktop/package/macosx/Bisq.iconset/icon_512x512.png diff --git a/desktop/package/osx/Bisq.iconset/icon_512x512@2x.png b/desktop/package/macosx/Bisq.iconset/icon_512x512@2x.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_512x512@2x.png rename to desktop/package/macosx/Bisq.iconset/icon_512x512@2x.png diff --git a/desktop/package/osx/Bisq.iconset/icon_64x64.png b/desktop/package/macosx/Bisq.iconset/icon_64x64.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_64x64.png rename to desktop/package/macosx/Bisq.iconset/icon_64x64.png diff --git a/desktop/package/osx/Bisq.iconset/icon_64x64@2x.png b/desktop/package/macosx/Bisq.iconset/icon_64x64@2x.png similarity index 100% rename from desktop/package/osx/Bisq.iconset/icon_64x64@2x.png rename to desktop/package/macosx/Bisq.iconset/icon_64x64@2x.png diff --git a/desktop/package/osx/Info.plist b/desktop/package/macosx/Info.plist similarity index 95% rename from desktop/package/osx/Info.plist rename to desktop/package/macosx/Info.plist index 452e30fa2e6..733327c31ee 100644 --- a/desktop/package/osx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -10,8 +10,6 @@ CFBundleExecutable Bisq - CFBundleIconFile - package/osx/Bisq.icns CFBundleName Bisq CFBundleIdentifier diff --git a/desktop/package/osx/create_app.sh b/desktop/package/macosx/create_app.sh similarity index 96% rename from desktop/package/osx/create_app.sh rename to desktop/package/macosx/create_app.sh index 0882f132ca5..5b5fab84161 100755 --- a/desktop/package/osx/create_app.sh +++ b/desktop/package/macosx/create_app.sh @@ -30,7 +30,7 @@ shasum -a256 $EXE_JAR | awk '{print $1}' # We make a deterministic jar by stripping out comments with date, etc. # jar file created from https://github.com/ManfredKarrer/tools -java -jar ./package/osx/tools-1.0.jar $EXE_JAR +java -jar ./package/macosx/tools-1.0.jar $EXE_JAR echo SHA 256 after stripping jar file to get a deterministic jar: shasum -a256 $EXE_JAR | awk '{print $1}' | tee deploy/Bisq-$version.jar.txt @@ -93,7 +93,7 @@ $JAVA_HOME/bin/javapackager \ -BappVersion=$version \ -Bmac.CFBundleIdentifier=io.bisq.CAT \ -Bmac.CFBundleName=Bisq \ - -Bicon=package/osx/Bisq.icns \ + -Bicon=package/macosx/Bisq.icns \ -Bruntime="$JAVA_HOME/jre" \ -native dmg \ -name Bisq \ @@ -107,4 +107,4 @@ $JAVA_HOME/bin/javapackager \ open deploy -cd package/osx +cd package/macosx diff --git a/desktop/package/osx/finalize.sh b/desktop/package/macosx/finalize.sh similarity index 100% rename from desktop/package/osx/finalize.sh rename to desktop/package/macosx/finalize.sh diff --git a/desktop/package/osx/tools-1.0.jar b/desktop/package/macosx/tools-1.0.jar similarity index 100% rename from desktop/package/osx/tools-1.0.jar rename to desktop/package/macosx/tools-1.0.jar From 147ba275bec7e023b0472a791b7d7447618549e7 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 21 Sep 2018 12:26:47 -0500 Subject: [PATCH 4/6] Update Info.plist - Order entries by importance/maintenance - Remove unneeded entries - Add version entries (need to be maintained) - Add NSHumanReadableCopyright --- desktop/package/macosx/Info.plist | 64 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index 733327c31ee..09f48d98098 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -2,51 +2,47 @@ - LSMinimumSystemVersion - 10.7.4 - CFBundleDevelopmentRegion - English - CFBundleAllowMixedLocalizations - + CFBundleVersion + 0.8.0 + + CFBundleShortVersionString + 0.8.0 + CFBundleExecutable Bisq + CFBundleName Bisq + CFBundleIdentifier io.bisq.CAT - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleShortVersionString - 1 - - CFBundleSignature - ???? + + CFBundleIconFile + Bisq.icns + LSApplicationCategoryType public.app-category.finance - CFBundleVersion - 1 + NSHumanReadableCopyright - Copyright (C) 2018 + Copyright © 2013-2018 - The Bisq developers + NSHighResolutionCapable true - JVMRuntime - .. - JVMMainClassName - bisq.desktop.app.BisqAppMain - JVMAppClasspath - - JVMMainJarName - Bisq-0.8.0.jar - JVMPreferencesID - bisq - JVMOptions - - - JVMUserOptions - - + + CFBundleAllowMixedLocalizations + + + LSMinimumSystemVersion + 10.7.4 + + CFBundleDevelopmentRegion + English + + CFBundleInfoDictionaryVersion + 6.0 + + CFBundlePackageType + APPL From bdf2a1b1d171c41a541a7549cb53aada59dc0c87 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 21 Sep 2018 12:27:39 -0500 Subject: [PATCH 5/6] Delete stresstest directory --- desktop/package/stresstest/cleanup.sh | 11 ----------- desktop/package/stresstest/copyDir.sh | 10 ---------- desktop/package/stresstest/init.sh | 22 ---------------------- desktop/package/stresstest/mac_cleanup.sh | 20 -------------------- desktop/package/stresstest/start.sh | 20 -------------------- 5 files changed, 83 deletions(-) delete mode 100755 desktop/package/stresstest/cleanup.sh delete mode 100755 desktop/package/stresstest/copyDir.sh delete mode 100755 desktop/package/stresstest/init.sh delete mode 100755 desktop/package/stresstest/mac_cleanup.sh delete mode 100755 desktop/package/stresstest/start.sh diff --git a/desktop/package/stresstest/cleanup.sh b/desktop/package/stresstest/cleanup.sh deleted file mode 100755 index 808543c8adc..00000000000 --- a/desktop/package/stresstest/cleanup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -cd /home/bs/.local/share - -find . -name \*.DS_Store -type f -delete -find . -name \*._.DS_Store -type f -delete -find . -name \*SequenceNumberMap -type f -delete -find . -name \*PersistedPeers -type f -delete -find . -name \*bisq.log -type f -delete -find . -name \*__MACOSX -type d -delete -find . -name \*backup -type d -exec rm -R -f {} + diff --git a/desktop/package/stresstest/copyDir.sh b/desktop/package/stresstest/copyDir.sh deleted file mode 100755 index 7bf03f3a3d0..00000000000 --- a/desktop/package/stresstest/copyDir.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -cd /Users/dev/Library/Application\ Support - -for i in `seq 101 500`; - do - dir=BS_$i - mkdir $dir - cp -av BS_/* $dir/ -done \ No newline at end of file diff --git a/desktop/package/stresstest/init.sh b/desktop/package/stresstest/init.sh deleted file mode 100755 index c9d3e004a30..00000000000 --- a/desktop/package/stresstest/init.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -cd ../../seednode/target - -logpath=/Users/dev/Documents/_intellij/bisq/logs -datapath="/Users/dev/Library/Application Support" -mkdir -p $logpath - -# rm "$datapath/bisq_seed_node_hlitt7z4bec4kdh4.onion_8000/db/SequenceNumberMap" -# rm "$datapath/bisq_seed_node_hlitt7z4bec4kdh4.onion_8000/db/PersistedPeers" - -# rm "$datapath/BS_arb/mainnet/db/SequenceNumberMap" -# rm "$datapath/BS_arb/mainnet/db/PersistedPeers" - -nohup bisq-seednode hlitt7z4bec4kdh4.onion:8000 0 500 >/dev/null 2>$logpath/ST_0_seednode.log & -sleep 40 - -cd ../../build -nohup build/app/bin/bisq-desktop --app.name=BS_arb --maxConnections=12 >/dev/null 2>$logpath/ST_0_arb.log & - -# kill `ps -ef | grep java | grep -v grep | awk '{print $2}'` - diff --git a/desktop/package/stresstest/mac_cleanup.sh b/desktop/package/stresstest/mac_cleanup.sh deleted file mode 100755 index a6f53fdfb2a..00000000000 --- a/desktop/package/stresstest/mac_cleanup.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -dir=/Users/dev/Desktop/10_offers - -for i in `seq 1 20`; - do - echo $i - rm $dir/BS_$i/mainnet/tor/tor.real - rm $dir/BS_$i/mainnet/tor/geoip - rm $dir/BS_$i/mainnet/tor/geoip6 - rm $dir/BS_$i/mainnet/tor/cached-microdescs - rm $dir/BS_$i/mainnet/tor/cached-microdesc-consensus - rm $dir/BS_$i/mainnet/db/SequenceNumberMap - rm $dir/BS_$i/mainnet/db/PersistedPeers - rm -R -f $dir/BS_$i/mainnet/tor/__MACOSX - rm -R -f $dir/BS_$i/mainnet/tor/hiddenservice/backup - rm -R -f $dir/BS_$i/mainnet/keys/backup - rm -R -f $dir/BS_$i/mainnet/db/backup - rm -R -f $dir/BS_$i/mainnet/bitcoin/backup - done \ No newline at end of file diff --git a/desktop/package/stresstest/start.sh b/desktop/package/stresstest/start.sh deleted file mode 100755 index 1d18e63ada6..00000000000 --- a/desktop/package/stresstest/start.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -logpath=/home/bs/bisq/logs -datapath=/home/bs/.local/share - -mkdir -p $logpath - -cd ../../build - -delay=40 -# edit start end index -for i in `seq 0 0`; - do - echo $i - nohup build/app/bin/bisq-desktop --app.name=BS_$i --maxConnections=12 >/dev/null 2>$logpath/ST_$i.log & - sleep $delay - done - -# kill `ps -ef | grep java | grep -v grep | awk '{print $2}'` - From dc175fa2a7509e29ce76f7c343fa7d1f1b24fe8c Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 21 Sep 2018 12:45:46 -0500 Subject: [PATCH 6/6] Add LSAppNapIsDisabled and NSSupportsAutomaticGraphicsSwitching --- desktop/package/macosx/Info.plist | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/desktop/package/macosx/Info.plist b/desktop/package/macosx/Info.plist index 09f48d98098..730c235fa3e 100644 --- a/desktop/package/macosx/Info.plist +++ b/desktop/package/macosx/Info.plist @@ -2,6 +2,8 @@ + + CFBundleVersion 0.8.0 @@ -26,6 +28,15 @@ NSHumanReadableCopyright Copyright © 2013-2018 - The Bisq developers + + LSAppNapIsDisabled + + + + NSSupportsAutomaticGraphicsSwitching + + NSHighResolutionCapable true @@ -43,6 +54,5 @@ CFBundlePackageType APPL -