From c68305ad6081436ff88df3e6120ff0108617958e Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Thu, 17 Mar 2022 14:19:37 +0530 Subject: [PATCH 01/17] stage1 --- tinyphone-osx/.gitignore | 6 + tinyphone-osx/Podfile | 7 + tinyphone-osx/Podfile.lock | 16 ++ tinyphone-osx/README.md | 26 ++ .../Tinyphone.xcodeproj/project.pbxproj | 241 +++++------------- .../xcshareddata/xcschemes/Tinyphone.xcscheme | 2 +- .../tinyphone/Custom Views/LoadableView.swift | 2 +- tinyphone-osx/tinyphone/Info.plist | 2 + tinyphone-osx/vendor/boost | 2 +- 9 files changed, 122 insertions(+), 182 deletions(-) create mode 100644 tinyphone-osx/Podfile create mode 100644 tinyphone-osx/Podfile.lock create mode 100644 tinyphone-osx/README.md diff --git a/tinyphone-osx/.gitignore b/tinyphone-osx/.gitignore index f4f9250..31d3035 100644 --- a/tinyphone-osx/.gitignore +++ b/tinyphone-osx/.gitignore @@ -25,3 +25,9 @@ DerivedData/ ## Gcc Patch /*.gcno *.dmg + + +#xcode +Pods/ +Tinyphone.xcworkspace/ + diff --git a/tinyphone-osx/Podfile b/tinyphone-osx/Podfile new file mode 100644 index 0000000..80e4b63 --- /dev/null +++ b/tinyphone-osx/Podfile @@ -0,0 +1,7 @@ +platform :macos, '10.14' + +target 'Tinyphone' do + pod 'pjsip', '~> 2.9' + # pod 'libopus' + # pod 'libopus-static' +end \ No newline at end of file diff --git a/tinyphone-osx/Podfile.lock b/tinyphone-osx/Podfile.lock new file mode 100644 index 0000000..1495dd2 --- /dev/null +++ b/tinyphone-osx/Podfile.lock @@ -0,0 +1,16 @@ +PODS: + - pjsip (2.9.0.2) + +DEPENDENCIES: + - pjsip (~> 2.9) + +SPEC REPOS: + trunk: + - pjsip + +SPEC CHECKSUMS: + pjsip: faa8aa0e79b341155801b87c2ea3015003d05ed9 + +PODFILE CHECKSUM: ae0244a99ed166a49ad7975cf5bd1d0a75278dd4 + +COCOAPODS: 1.11.3 diff --git a/tinyphone-osx/README.md b/tinyphone-osx/README.md new file mode 100644 index 0000000..b5c9603 --- /dev/null +++ b/tinyphone-osx/README.md @@ -0,0 +1,26 @@ +# Building for macOS + +```bash +#install dependencies +brew install autoconf automake libtool + + +wget https://raw.githubusercontent.com/Homebrew/linuxbrew-core/f204b6b30d3981259a764a29dca1a4b403524c9d/Formula/cryptopp.rb +//incase you get error this errpr "Error: cryptopp: Calling bottle :disable is disabled! There is no replacement.", remove the line +brew install --build-from-source -f cryptopp.rb + +#build dependencies + + +#boost +cd tinyphone-osx/vendor/boost +./boost.sh -macos --boost-version 1.68.0 + +#statsd +cd tinyphone/lib/statsd-cpp/build-osx +cmake .. +make + +``` + + diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index 0d56826..0e2c94b 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -18,56 +18,18 @@ B327CAFE2551784A0092FDB7 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAEE2551784A0092FDB7 /* utils.cpp */; }; B327CAFF2551784A0092FDB7 /* net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAF02551784A0092FDB7 /* net.cpp */; }; B327CB032551973A0092FDB7 /* libstatsd_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB01255195BD0092FDB7 /* libstatsd_static.a */; }; - B327CB0E2551A0130092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */; }; - B327CB0F2551A0350092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB04255197CC0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */; }; - B327CB102551A0410092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0C25519FFC0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */; }; - B327CB112551A0410092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0D25519FFC0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */; }; - B327CB122551A0410092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0A25519FFC0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */; }; - B327CB132551A0410092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0B25519FFC0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */; }; - B327CB142551A0410092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */; }; - B327CB1A2551A0530092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB162551A0510092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */; }; - B327CB1B2551A0530092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB172551A0510092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */; }; - B327CB1C2551A0530092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB152551A0510092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */; }; - B327CB1D2551A0530092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB182551A0510092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */; }; - B327CB1E2551A0530092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB192551A0510092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */; }; - B327CB202551A05E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB1F2551A05B0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */; }; - B327CB362551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB212551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */; }; - B327CB372551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB222551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a */; }; - B327CB382551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB232551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a */; }; - B327CB392551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB242551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */; }; - B327CB3A2551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB252551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a */; }; - B327CB3B2551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB262551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */; }; - B327CB3C2551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB272551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */; }; - B327CB3D2551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB282551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a */; }; - B327CB3E2551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB292551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */; }; - B327CB3F2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2A2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */; }; - B327CB402551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2B2551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */; }; - B327CB412551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2C2551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a */; }; - B327CB422551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2D2551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a */; }; - B327CB432551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2E2551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */; }; - B327CB442551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB2F2551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */; }; - B327CB452551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB302551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a */; }; - B327CB462551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB312551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a */; }; - B327CB472551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB322551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a */; }; - B327CB482551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB332551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */; }; - B327CB492551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB342551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */; }; - B327CB4A2551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB352551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */; }; B327CB502551A2940092FDB7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB4D2551A2940092FDB7 /* CoreAudio.framework */; }; B327CB522551A2F40092FDB7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB512551A2F40092FDB7 /* AudioUnit.framework */; }; B327CB542551A2FD0092FDB7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B327CB532551A2FD0092FDB7 /* AudioToolbox.framework */; }; - B33839072551C692000D6F04 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B33839062551C692000D6F04 /* libopus.a */; }; B33839092551D3EF000D6F04 /* osxapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B33839082551D3EF000D6F04 /* osxapp.cpp */; }; - B392C7A6255408B70068492F /* boost.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B8EE172552A26D00B903D1 /* boost.xcframework */; }; - B392C7AB255409390068492F /* libboost_date_time.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A8255409390068492F /* libboost_date_time.dylib */; }; - B392C7AC255409390068492F /* libboost_date_time.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A8255409390068492F /* libboost_date_time.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - B392C7AD255409390068492F /* libboost_filesystem.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A9255409390068492F /* libboost_filesystem.dylib */; }; - B392C7AE255409390068492F /* libboost_filesystem.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7A9255409390068492F /* libboost_filesystem.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - B392C7AF255409390068492F /* libboost_system.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7AA255409390068492F /* libboost_system.dylib */; }; - B392C7B0255409390068492F /* libboost_system.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7AA255409390068492F /* libboost_system.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + B36B645B27E30DB100B011C9 /* libopencore-amrnb.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */; }; + B36B645C27E30DB100B011C9 /* libopencore-amrwb.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */; }; B392C7B9255412560068492F /* libcryptopp.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7B8255412560068492F /* libcryptopp.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - B392C7BB255412770068492F /* libopus.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B392C7BA255412770068492F /* libopus.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B39C3B442552C3CE00BBD999 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B39C3B432552C3CE00BBD999 /* libresolv.tbd */; }; B39C3B4B2552E1E700BBD999 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B39C3B4A2552E1E700BBD999 /* AppKit.framework */; }; + B3AD62C827E3174300F6A499 /* boost.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B8EE172552A26D00B903D1 /* boost.xcframework */; }; + B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B3B92C3E2568152A0095EF2C /* mod_notify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3B92C3D2568152A0095EF2C /* mod_notify.cpp */; }; B3D53FC92551696600523D5F /* AccountsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3D53FC82551696600523D5F /* AccountsView.xib */; }; B3D53FCC255169CF00523D5F /* AccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCB255169CF00523D5F /* AccountsView.swift */; }; @@ -77,6 +39,7 @@ B3DDA56125515DF900D269C9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B3DDA56025515DF900D269C9 /* Assets.xcassets */; }; B3DDA56425515DF900D269C9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B3DDA56225515DF900D269C9 /* Main.storyboard */; }; B3F31832256EC23E00A3B272 /* baseapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F31831256EC23D00A3B272 /* baseapp.cpp */; }; + FF4A1511DBA29F101E5C99FB /* libPods-Tinyphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D391468F3860917F60DFFF21 /* libPods-Tinyphone.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -86,11 +49,9 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - B392C7BB255412770068492F /* libopus.0.dylib in Embed Frameworks */, + B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */, + B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */, B392C7B9255412560068492F /* libcryptopp.dylib in Embed Frameworks */, - B392C7AE255409390068492F /* libboost_filesystem.dylib in Embed Frameworks */, - B392C7AC255409390068492F /* libboost_date_time.dylib in Embed Frameworks */, - B392C7B0255409390068492F /* libboost_system.dylib in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -98,6 +59,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.release.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.release.xcconfig"; sourceTree = ""; }; + 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.debug.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.debug.xcconfig"; sourceTree = ""; }; B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Tinyphone-OC.mm"; sourceTree = ""; }; B3025C1F25530D7E00C331CA /* Tinyphone-OC.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "Tinyphone-OC.hpp"; sourceTree = ""; }; B327CAD0255178470092FDB7 /* Tinyphone-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tinyphone-Bridging-Header.h"; sourceTree = ""; }; @@ -129,52 +92,16 @@ B327CAF02551784A0092FDB7 /* net.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = net.cpp; path = ../../tinyphone/net.cpp; sourceTree = ""; }; B327CAF12551784A0092FDB7 /* metrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = metrics.h; path = ../../tinyphone/metrics.h; sourceTree = ""; }; B327CB01255195BD0092FDB7 /* libstatsd_static.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstatsd_static.a; path = "../lib/statsd-cpp/build-osx/lib/libstatsd_static.a"; sourceTree = ""; }; - B327CB04255197CC0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpj-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjlib/lib/libpj-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua2-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsua2-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0A25519FFC0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsip-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0B25519FFC0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0C25519FFC0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-simple-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsip-simple-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB0D25519FFC0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-ua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjsip/lib/libpjsip-ua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB152551A0510092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB162551A0510092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB172551A0510092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB182551A0510092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjmedia-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB192551A0510092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsdp-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjmedia/lib/libpjsdp-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB1F2551A05B0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjlib-util-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/pjlib-util/lib/libpjlib-util-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB212551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-videodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB222551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libyuv-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libyuv-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB232551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libresample-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libresample-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB242551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-codec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB252551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libgsmcodec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libgsmcodec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB262551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsdp-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsdp-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB272551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsip-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB282551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libilbccodec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libilbccodec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB292551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-ua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsip-ua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2A2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsua-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2B2551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsua2-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsua2-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2C2551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libspeex-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libspeex-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2D2551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjnath-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjnath-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2E2551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB2F2551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpj-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpj-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB302551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwebrtc-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libwebrtc-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB312551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libg7221codec-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libg7221codec-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB322551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsrtp-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libsrtp-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB332551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjsip-simple-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjsip-simple-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB342551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjlib-util-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjlib-util-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; - B327CB352551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; path = "../lib/pjproject/lib/libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a"; sourceTree = ""; }; B327CB4B2551A2940092FDB7 /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; B327CB4C2551A2940092FDB7 /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; B327CB4D2551A2940092FDB7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; B327CB512551A2F40092FDB7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; B327CB532551A2FD0092FDB7 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; B337E2C32554468C001696B7 /* config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = config.json; path = ../config.json; sourceTree = ""; }; - B33839062551C692000D6F04 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = ../lib/opus/libopus.a; sourceTree = ""; }; B33839082551D3EF000D6F04 /* osxapp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = osxapp.cpp; sourceTree = ""; }; - B392C7A8255409390068492F /* libboost_date_time.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_date_time.dylib; path = /usr/local/opt/boost/lib/libboost_date_time.dylib; sourceTree = ""; }; - B392C7A9255409390068492F /* libboost_filesystem.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_filesystem.dylib; path = /usr/local/opt/boost/lib/libboost_filesystem.dylib; sourceTree = ""; }; - B392C7AA255409390068492F /* libboost_system.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_system.dylib; path = /usr/local/opt/boost/lib/libboost_system.dylib; sourceTree = ""; }; + B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopencore-amrnb.0.dylib"; path = "/usr/local/opt/opencore-amr/lib/libopencore-amrnb.0.dylib"; sourceTree = ""; }; + B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopencore-amrwb.0.dylib"; path = "/usr/local/opt/opencore-amr/lib/libopencore-amrwb.0.dylib"; sourceTree = ""; }; B392C7B8255412560068492F /* libcryptopp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcryptopp.dylib; path = /usr/local/opt/cryptopp/lib/libcryptopp.dylib; sourceTree = ""; }; - B392C7BA255412770068492F /* libopus.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopus.0.dylib; path = /usr/local/opt/opus/lib/libopus.0.dylib; sourceTree = ""; }; B39C3B432552C3CE00BBD999 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; B39C3B4A2552E1E700BBD999 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; B39C3B562552EF1900BBD999 /* Tinyphone-C-Interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Tinyphone-C-Interface.h"; sourceTree = ""; }; @@ -194,6 +121,7 @@ B3F3182F256EC23100A3B272 /* osxapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osxapp.h; sourceTree = ""; }; B3F31831256EC23D00A3B272 /* baseapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = baseapp.cpp; path = ../../tinyphone/baseapp.cpp; sourceTree = ""; }; B3F31833256EC2E100A3B272 /* app.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = app.hpp; path = ../../tinyphone/app.hpp; sourceTree = ""; }; + D391468F3860917F60DFFF21 /* libPods-Tinyphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tinyphone.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -201,50 +129,15 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B36B645B27E30DB100B011C9 /* libopencore-amrnb.0.dylib in Frameworks */, + FF4A1511DBA29F101E5C99FB /* libPods-Tinyphone.a in Frameworks */, + B36B645C27E30DB100B011C9 /* libopencore-amrwb.0.dylib in Frameworks */, B39C3B4B2552E1E700BBD999 /* AppKit.framework in Frameworks */, B39C3B442552C3CE00BBD999 /* libresolv.tbd in Frameworks */, B327CB542551A2FD0092FDB7 /* AudioToolbox.framework in Frameworks */, B327CB522551A2F40092FDB7 /* AudioUnit.framework in Frameworks */, + B3AD62C827E3174300F6A499 /* boost.xcframework in Frameworks */, B327CB502551A2940092FDB7 /* CoreAudio.framework in Frameworks */, - B327CB1A2551A0530092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB1B2551A0530092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB122551A0410092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB362551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB372551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB382551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB392551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3A2551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3B2551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3C2551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3D2551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3E2551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB3F2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB402551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7A6255408B70068492F /* boost.xcframework in Frameworks */, - B327CB412551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB422551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB432551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB442551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7AB255409390068492F /* libboost_date_time.dylib in Frameworks */, - B327CB452551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB462551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB472551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB482551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB492551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB4A2551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB202551A05E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7AF255409390068492F /* libboost_system.dylib in Frameworks */, - B327CB1C2551A0530092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB142551A0410092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB0E2551A0130092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB102551A0410092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB1E2551A0530092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB112551A0410092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB0F2551A0350092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB132551A0410092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a in Frameworks */, - B327CB1D2551A0530092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a in Frameworks */, - B392C7AD255409390068492F /* libboost_filesystem.dylib in Frameworks */, - B33839072551C692000D6F04 /* libopus.a in Frameworks */, B327CB032551973A0092FDB7 /* libstatsd_static.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -255,6 +148,8 @@ 9EDB4E7B95299CB02F683BF7 /* Pods */ = { isa = PBXGroup; children = ( + 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */, + 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -270,7 +165,6 @@ B3025C1F25530D7E00C331CA /* Tinyphone-OC.hpp */, B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */, B39C3B562552EF1900BBD999 /* Tinyphone-C-Interface.h */, - B3B8EE192552A6D400B903D1 /* app.h */, B327CADE255178490092FDB7 /* account.cpp */, B327CAD4255178480092FDB7 /* account.h */, B327CAD2255178480092FDB7 /* call.cpp */, @@ -307,52 +201,16 @@ B327CB00255195BC0092FDB7 /* Frameworks */ = { isa = PBXGroup; children = ( - B392C7A8255409390068492F /* libboost_date_time.dylib */, - B392C7A9255409390068492F /* libboost_filesystem.dylib */, - B392C7AA255409390068492F /* libboost_system.dylib */, B39C3B4A2552E1E700BBD999 /* AppKit.framework */, B39C3B432552C3CE00BBD999 /* libresolv.tbd */, B3B8EE172552A26D00B903D1 /* boost.xcframework */, - B33839062551C692000D6F04 /* libopus.a */, B327CB532551A2FD0092FDB7 /* AudioToolbox.framework */, B327CB512551A2F40092FDB7 /* AudioUnit.framework */, B327CB4D2551A2940092FDB7 /* CoreAudio.framework */, B327CB4C2551A2940092FDB7 /* CoreAudioKit.framework */, B327CB4B2551A2940092FDB7 /* CoreAudioTypes.framework */, - B327CB1F2551A05B0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */, - B327CB162551A0510092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */, - B327CB312551A18E0092FDB7 /* libg7221codec-x86_64-apple-darwin18.7.0.a */, - B327CB252551A18E0092FDB7 /* libgsmcodec-x86_64-apple-darwin18.7.0.a */, - B327CB282551A18E0092FDB7 /* libilbccodec-x86_64-apple-darwin18.7.0.a */, - B327CB2F2551A18E0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */, - B327CB342551A18E0092FDB7 /* libpjlib-util-x86_64-apple-darwin18.7.0.a */, - B327CB352551A18E0092FDB7 /* libpjmedia-audiodev-x86_64-apple-darwin18.7.0.a */, - B327CB172551A0510092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */, - B327CB242551A18E0092FDB7 /* libpjmedia-codec-x86_64-apple-darwin18.7.0.a */, - B327CB152551A0510092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */, - B327CB182551A0510092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */, - B327CB2E2551A18E0092FDB7 /* libpjmedia-x86_64-apple-darwin18.7.0.a */, - B327CB2D2551A18E0092FDB7 /* libpjnath-x86_64-apple-darwin18.7.0.a */, - B327CB192551A0510092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */, - B327CB0C25519FFC0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */, - B327CB332551A18E0092FDB7 /* libpjsip-simple-x86_64-apple-darwin18.7.0.a */, - B327CB0D25519FFC0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */, - B327CB292551A18E0092FDB7 /* libpjsip-ua-x86_64-apple-darwin18.7.0.a */, - B327CB0A25519FFC0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */, - B327CB0B25519FFC0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */, - B327CB0925519FFC0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */, - B327CB04255197CC0092FDB7 /* libpj-x86_64-apple-darwin18.7.0.a */, - B327CB212551A18E0092FDB7 /* libpjmedia-videodev-x86_64-apple-darwin18.7.0.a */, - B327CB262551A18E0092FDB7 /* libpjsdp-x86_64-apple-darwin18.7.0.a */, - B327CB272551A18E0092FDB7 /* libpjsip-x86_64-apple-darwin18.7.0.a */, - B327CB2A2551A18E0092FDB7 /* libpjsua-x86_64-apple-darwin18.7.0.a */, - B327CB2B2551A18E0092FDB7 /* libpjsua2-x86_64-apple-darwin18.7.0.a */, - B327CB232551A18E0092FDB7 /* libresample-x86_64-apple-darwin18.7.0.a */, - B327CB2C2551A18E0092FDB7 /* libspeex-x86_64-apple-darwin18.7.0.a */, - B327CB322551A18E0092FDB7 /* libsrtp-x86_64-apple-darwin18.7.0.a */, - B327CB302551A18E0092FDB7 /* libwebrtc-x86_64-apple-darwin18.7.0.a */, - B327CB222551A18E0092FDB7 /* libyuv-x86_64-apple-darwin18.7.0.a */, B327CB01255195BD0092FDB7 /* libstatsd_static.a */, + D391468F3860917F60DFFF21 /* libPods-Tinyphone.a */, ); name = Frameworks; sourceTree = ""; @@ -370,8 +228,9 @@ B3DDA55025515DF700D269C9 = { isa = PBXGroup; children = ( + B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */, + B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */, B337E2C32554468C001696B7 /* config.json */, - B392C7BA255412770068492F /* libopus.0.dylib */, B392C7B8255412560068492F /* libcryptopp.dylib */, B327CACF255178050092FDB7 /* src */, B3DDA55B25515DF700D269C9 /* tinyphone */, @@ -410,11 +269,12 @@ isa = PBXNativeTarget; buildConfigurationList = B3DDA56925515DF900D269C9 /* Build configuration list for PBXNativeTarget "Tinyphone" */; buildPhases = ( + 023F5C8B0DBB33BA59EBED3F /* [CP] Check Pods Manifest.lock */, B3DDA55525515DF700D269C9 /* Sources */, B3DDA55625515DF700D269C9 /* Frameworks */, B3DDA55725515DF700D269C9 /* Resources */, B327CB0825519E550092FDB7 /* Embed Frameworks */, - B392C7A52554035D0068492F /* ShellScript */, + B392C7A52554035D0068492F /* Run Script */, ); buildRules = ( ); @@ -432,7 +292,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1110; - LastUpgradeCheck = 1110; + LastUpgradeCheck = 1320; ORGANIZATIONNAME = "Kinshuk Bairagi"; TargetAttributes = { B3DDA55825515DF700D269C9 = { @@ -474,7 +334,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - B392C7A52554035D0068492F /* ShellScript */ = { + 023F5C8B0DBB33BA59EBED3F /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -482,14 +342,37 @@ inputFileListPaths = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Tinyphone-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + B392C7A52554035D0068492F /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run Script"; outputFileListPaths = ( ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nEXECFILE=${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\ndeclare -a TARGETS=(\"libcryptopp.dylib\" \"libopus.0.dylib\" \"libboost_filesystem.dylib\" \"libboost_system.dylib\" \"libboost_date_time.dylib\")\nfor TARGET in \"${TARGETS[@]}\" ; do\necho \"Running for $TARGET\"\nFULLTARGET=`otool -LD ${EXECFILE} | grep $TARGET | awk '{ print $1 }'`\necho $FULLTARGET\ninstall_name_tool -change ${FULLTARGET} \"@rpath/${TARGET}\" ${EXECFILE}\ndone\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nEXECFILE=${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\ndeclare -a TARGETS=(\"libcryptopp.dylib\" \"libopencore-amrnb.0.dylib\" \"libopencore-amrwb.0.dylib\") # \"libopus.0.dylib\"\nfor TARGET in \"${TARGETS[@]}\" ; do\necho \"Running for $TARGET\"\nFULLTARGET=`otool -LD ${EXECFILE} | grep $TARGET | awk '{ print $1 }'`\necho $FULLTARGET\ninstall_name_tool -change ${FULLTARGET} \"@rpath/${TARGET}\" ${EXECFILE}\ndone\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -557,6 +440,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -597,7 +481,7 @@ ../lib/portaudio/include, ); LIBRARY_SEARCH_PATHS = /usr/local/lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -637,6 +521,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -671,7 +556,7 @@ ../lib/portaudio/include, ); LIBRARY_SEARCH_PATHS = /usr/local/lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = ( @@ -686,6 +571,7 @@ }; B3DDA56A25515DF900D269C9 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; @@ -706,21 +592,19 @@ "$(inherited)", /usr/local/lib, "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", - /Volumes/Workspace/code/voice/tinyphone/lib/pjproject/lib, - /usr/local/Cellar/boost/1.72.0_3/lib, + "/usr/local/opt/opencore-amr/lib", ); + MACOSX_DEPLOYMENT_TARGET = 10.14; MARKETING_VERSION = 36.0.0.81; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DBOOST_SYSTEM_DYN_LINK", ); OTHER_LDFLAGS = ( + "$(inherited)", "-lcryptopp", "-lcurl", "-lpthread", - "-lboost_filesystem", - "-lboost_system", - "-lboost_date_time", ); PRODUCT_BUNDLE_IDENTIFIER = com.github.voiceip.tphone; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -733,6 +617,7 @@ }; B3DDA56B25515DF900D269C9 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; @@ -752,21 +637,19 @@ "$(inherited)", /usr/local/lib, "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", - /Volumes/Workspace/code/voice/tinyphone/lib/pjproject/lib, - /usr/local/Cellar/boost/1.72.0_3/lib, + "/usr/local/opt/opencore-amr/lib", ); + MACOSX_DEPLOYMENT_TARGET = 10.14; MARKETING_VERSION = 36.0.0.81; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", "-DBOOST_SYSTEM_DYN_LINK", ); OTHER_LDFLAGS = ( + "$(inherited)", "-lcryptopp", "-lcurl", "-lpthread", - "-lboost_filesystem", - "-lboost_system", - "-lboost_date_time", ); PRODUCT_BUNDLE_IDENTIFIER = com.github.voiceip.tphone; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme b/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme index caa126f..14bf2df 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme +++ b/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme @@ -1,6 +1,6 @@ Bool func add(toView parentView: NSView) } diff --git a/tinyphone-osx/tinyphone/Info.plist b/tinyphone-osx/tinyphone/Info.plist index 7a3fd19..99ad014 100644 --- a/tinyphone-osx/tinyphone/Info.plist +++ b/tinyphone-osx/tinyphone/Info.plist @@ -20,6 +20,8 @@ $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) + LSApplicationCategoryType + public.app-category.utilities LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) LSUIElement diff --git a/tinyphone-osx/vendor/boost b/tinyphone-osx/vendor/boost index 1878bd3..c1fd07d 160000 --- a/tinyphone-osx/vendor/boost +++ b/tinyphone-osx/vendor/boost @@ -1 +1 @@ -Subproject commit 1878bd324c33c7b171c015efe4f92eab3bb18ea2 +Subproject commit c1fd07de22e8597c9bc57ba1290d7652faae874f From a94127305f2029d46c09480e15fa8876949a23b6 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Thu, 17 Mar 2022 17:10:04 +0530 Subject: [PATCH 02/17] 2 --- tinyphone-osx/Podfile | 11 +++-- tinyphone-osx/Podfile.lock | 21 ++++++++-- .../Tinyphone.xcodeproj/project.pbxproj | 40 ++++++++++++++----- 3 files changed, 54 insertions(+), 18 deletions(-) diff --git a/tinyphone-osx/Podfile b/tinyphone-osx/Podfile index 80e4b63..2624d56 100644 --- a/tinyphone-osx/Podfile +++ b/tinyphone-osx/Podfile @@ -1,7 +1,10 @@ -platform :macos, '10.14' +platform :macos, '10.15' +use_frameworks! target 'Tinyphone' do - pod 'pjsip', '~> 2.9' - # pod 'libopus' + pod 'YbridOpus' # pod 'libopus-static' -end \ No newline at end of file + # pod 'pjsip', '~> 2.9.0.2' + pod 'pjsip', :git => 'https://github.com/voiceip/cocoapod-pjsip' , :branch => 'no-libopus' +end + diff --git a/tinyphone-osx/Podfile.lock b/tinyphone-osx/Podfile.lock index 1495dd2..e0ba66b 100644 --- a/tinyphone-osx/Podfile.lock +++ b/tinyphone-osx/Podfile.lock @@ -1,16 +1,29 @@ PODS: - pjsip (2.9.0.2) + - YbridOpus (0.8.0) DEPENDENCIES: - - pjsip (~> 2.9) + - pjsip (from `https://github.com/voiceip/cocoapod-pjsip`, branch `no-libopus`) + - YbridOpus SPEC REPOS: trunk: - - pjsip + - YbridOpus + +EXTERNAL SOURCES: + pjsip: + :branch: no-libopus + :git: https://github.com/voiceip/cocoapod-pjsip + +CHECKOUT OPTIONS: + pjsip: + :commit: 80a177661d3ec4bfe3aa6be2d2767c62871c4965 + :git: https://github.com/voiceip/cocoapod-pjsip SPEC CHECKSUMS: - pjsip: faa8aa0e79b341155801b87c2ea3015003d05ed9 + pjsip: d74b5ea51bd4181581049de2833a61b060dd5063 + YbridOpus: e9af373b9b38acff3702d9a3bd97cae3c232887c -PODFILE CHECKSUM: ae0244a99ed166a49ad7975cf5bd1d0a75278dd4 +PODFILE CHECKSUM: 33875e5fc3d98200609b13b063ae004b7b7b6c59 COCOAPODS: 1.11.3 diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index 0e2c94b..b569cff 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 6B07F5E2BD9B3AE651158F53 /* Pods_Tinyphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */; }; B3025C2025530D7E00C331CA /* Tinyphone-OC.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */; }; B327CAF32551784A0092FDB7 /* call.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAD2255178480092FDB7 /* call.cpp */; }; B327CAF52551784A0092FDB7 /* microtar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAD8255178480092FDB7 /* microtar.cpp */; }; @@ -31,6 +32,7 @@ B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B3B92C3E2568152A0095EF2C /* mod_notify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3B92C3D2568152A0095EF2C /* mod_notify.cpp */; }; + B3C9365527E34ED300CE2CDB /* Pods_Tinyphone.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; B3D53FC92551696600523D5F /* AccountsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3D53FC82551696600523D5F /* AccountsView.xib */; }; B3D53FCC255169CF00523D5F /* AccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCB255169CF00523D5F /* AccountsView.swift */; }; B3D53FCE25516A4200523D5F /* LoadableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCD25516A4200523D5F /* LoadableView.swift */; }; @@ -39,7 +41,6 @@ B3DDA56125515DF900D269C9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B3DDA56025515DF900D269C9 /* Assets.xcassets */; }; B3DDA56425515DF900D269C9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B3DDA56225515DF900D269C9 /* Main.storyboard */; }; B3F31832256EC23E00A3B272 /* baseapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F31831256EC23D00A3B272 /* baseapp.cpp */; }; - FF4A1511DBA29F101E5C99FB /* libPods-Tinyphone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D391468F3860917F60DFFF21 /* libPods-Tinyphone.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -49,6 +50,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + B3C9365527E34ED300CE2CDB /* Pods_Tinyphone.framework in Embed Frameworks */, B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */, B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */, B392C7B9255412560068492F /* libcryptopp.dylib in Embed Frameworks */, @@ -60,6 +62,7 @@ /* Begin PBXFileReference section */ 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.release.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.release.xcconfig"; sourceTree = ""; }; + 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tinyphone.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.debug.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.debug.xcconfig"; sourceTree = ""; }; B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Tinyphone-OC.mm"; sourceTree = ""; }; B3025C1F25530D7E00C331CA /* Tinyphone-OC.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "Tinyphone-OC.hpp"; sourceTree = ""; }; @@ -121,7 +124,6 @@ B3F3182F256EC23100A3B272 /* osxapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osxapp.h; sourceTree = ""; }; B3F31831256EC23D00A3B272 /* baseapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = baseapp.cpp; path = ../../tinyphone/baseapp.cpp; sourceTree = ""; }; B3F31833256EC2E100A3B272 /* app.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = app.hpp; path = ../../tinyphone/app.hpp; sourceTree = ""; }; - D391468F3860917F60DFFF21 /* libPods-Tinyphone.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tinyphone.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -130,7 +132,6 @@ buildActionMask = 2147483647; files = ( B36B645B27E30DB100B011C9 /* libopencore-amrnb.0.dylib in Frameworks */, - FF4A1511DBA29F101E5C99FB /* libPods-Tinyphone.a in Frameworks */, B36B645C27E30DB100B011C9 /* libopencore-amrwb.0.dylib in Frameworks */, B39C3B4B2552E1E700BBD999 /* AppKit.framework in Frameworks */, B39C3B442552C3CE00BBD999 /* libresolv.tbd in Frameworks */, @@ -139,6 +140,7 @@ B3AD62C827E3174300F6A499 /* boost.xcframework in Frameworks */, B327CB502551A2940092FDB7 /* CoreAudio.framework in Frameworks */, B327CB032551973A0092FDB7 /* libstatsd_static.a in Frameworks */, + 6B07F5E2BD9B3AE651158F53 /* Pods_Tinyphone.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -210,7 +212,7 @@ B327CB4C2551A2940092FDB7 /* CoreAudioKit.framework */, B327CB4B2551A2940092FDB7 /* CoreAudioTypes.framework */, B327CB01255195BD0092FDB7 /* libstatsd_static.a */, - D391468F3860917F60DFFF21 /* libPods-Tinyphone.a */, + 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */, ); name = Frameworks; sourceTree = ""; @@ -275,6 +277,7 @@ B3DDA55725515DF700D269C9 /* Resources */, B327CB0825519E550092FDB7 /* Embed Frameworks */, B392C7A52554035D0068492F /* Run Script */, + 627FED5B7A017D9C4A84B04C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -356,6 +359,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + 627FED5B7A017D9C4A84B04C /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Tinyphone/Pods-Tinyphone-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Tinyphone/Pods-Tinyphone-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Tinyphone/Pods-Tinyphone-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; B392C7A52554035D0068492F /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -589,12 +609,12 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - /usr/local/lib, "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", + "$(inherited)", "/usr/local/opt/opencore-amr/lib", + /usr/local/lib, ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 36.0.0.81; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", @@ -634,12 +654,12 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - /usr/local/lib, "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", + "$(inherited)", "/usr/local/opt/opencore-amr/lib", + /usr/local/lib, ); - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.15; MARKETING_VERSION = 36.0.0.81; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", From b1fbcf4eedc7e3bf7d29692a0504984bc7cc61fa Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Thu, 17 Mar 2022 20:00:27 +0530 Subject: [PATCH 03/17] Update project.pbxproj --- tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index b569cff..44b5b61 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -471,6 +471,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + EXCLUDED_ARCHS = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -501,7 +502,7 @@ ../lib/portaudio/include, ); LIBRARY_SEARCH_PATHS = /usr/local/lib; - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -512,6 +513,7 @@ SDKROOT = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = 6; }; name = Debug; }; @@ -552,6 +554,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = arm64; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -576,9 +579,10 @@ ../lib/portaudio/include, ); LIBRARY_SEARCH_PATHS = /usr/local/lib; - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 10.15; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = ( "-lcryptopp", "-lcurl", @@ -586,6 +590,7 @@ SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = 6; }; name = Release; }; @@ -632,6 +637,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 6; }; name = Debug; }; @@ -676,6 +682,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = 6; }; name = Release; }; From d192a636531af0f368a7ed231d085fbce3e1f58d Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Thu, 17 Mar 2022 20:02:19 +0530 Subject: [PATCH 04/17] Update README.md --- tinyphone-osx/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tinyphone-osx/README.md b/tinyphone-osx/README.md index b5c9603..dc858f0 100644 --- a/tinyphone-osx/README.md +++ b/tinyphone-osx/README.md @@ -4,14 +4,13 @@ #install dependencies brew install autoconf automake libtool - +# cryptopp wget https://raw.githubusercontent.com/Homebrew/linuxbrew-core/f204b6b30d3981259a764a29dca1a4b403524c9d/Formula/cryptopp.rb //incase you get error this errpr "Error: cryptopp: Calling bottle :disable is disabled! There is no replacement.", remove the line brew install --build-from-source -f cryptopp.rb #build dependencies - #boost cd tinyphone-osx/vendor/boost ./boost.sh -macos --boost-version 1.68.0 @@ -21,6 +20,9 @@ cd tinyphone/lib/statsd-cpp/build-osx cmake .. make -``` +#lets install the pods +pod install +#now open the `Tinyphone.xcworkspace` file and compile! +``` From 16e8451a64cdfdb1f1e9badc1223858385506ae6 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 11:56:34 +0530 Subject: [PATCH 05/17] macOS CI attempt 1 --- .github/workflows/main.yml | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e34c1b6..7608a4b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -78,3 +78,50 @@ jobs: draft: true allowUpdates: true token: ${{ secrets.GH_TOKEN }} + + tinyphone_osx_job: + name: Build Tinyphone macOS + runs-on: macos-10.15 + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Checkout submodules # checkout rest + shell: bash + run: | + git config --global url."https://github.com/".insteadOf "git@github.com:" + auth_header="$(git config --local --get http.https://github.com/.extraheader)" + git submodule sync --recursive + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 + - name: Install dependencies + shell: bash + run : | + brew install autoconf automake libtool tree wget + wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb + brew install --build-from-source -f cryptopp.rb + - name: Compile Libraries + run : | + #boost + pushd tinyphone-osx/vendor/boost + ./boost.sh -macos --boost-version 1.68.0 + popd + + #stastd + pushd tinyphone/lib/statsd-cpp/build-osx + cmake .. + make + popd + + - name: Build Project + run : | + pod install + + xcode-select --print-path + + xcodebuild build -workspace Tinyphone.xcworkspace -scheme Tinyphone + + # - name: Upload Artifacts + # uses: actions/upload-artifact@v2 + # with: + # name: tinyphone + # path: | + # ./tinyphone-installer/bin/Release/tinyphone_installer.msi \ No newline at end of file From d05cd8d4c523cc17e0cab72afa6aae25d5039c26 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 12:19:30 +0530 Subject: [PATCH 06/17] a --- .github/workflows/main.yml | 9 ++++++--- tinyphone-osx/.xcconfig | 0 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 tinyphone-osx/.xcconfig diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7608a4b..40a7f27 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -95,18 +95,23 @@ jobs: - name: Install dependencies shell: bash run : | + export HOMEBREW_NO_INSTALL_CLEANUP=true brew install autoconf automake libtool tree wget wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb brew install --build-from-source -f cryptopp.rb - name: Compile Libraries run : | + + #xcode needs to be proper at this point + xcode-select --print-path + #boost pushd tinyphone-osx/vendor/boost ./boost.sh -macos --boost-version 1.68.0 popd #stastd - pushd tinyphone/lib/statsd-cpp/build-osx + pushd lib/statsd-cpp/build-osx cmake .. make popd @@ -115,8 +120,6 @@ jobs: run : | pod install - xcode-select --print-path - xcodebuild build -workspace Tinyphone.xcworkspace -scheme Tinyphone # - name: Upload Artifacts diff --git a/tinyphone-osx/.xcconfig b/tinyphone-osx/.xcconfig new file mode 100644 index 0000000..e69de29 From b2cb009b964e65fdad2b4d43731a915d2a8d7283 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 12:57:00 +0530 Subject: [PATCH 07/17] build --- .github/workflows/main.yml | 15 ++++++++------- tinyphone-osx/.xcconfig | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 40a7f27..c71161c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -119,12 +119,13 @@ jobs: - name: Build Project run : | pod install + xcodebuild build -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release -xcconfig .xcconfig + ./package.sh - xcodebuild build -workspace Tinyphone.xcworkspace -scheme Tinyphone + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: tinyphone.dmg + path: | + ./tinyphone.dmg - # - name: Upload Artifacts - # uses: actions/upload-artifact@v2 - # with: - # name: tinyphone - # path: | - # ./tinyphone-installer/bin/Release/tinyphone_installer.msi \ No newline at end of file diff --git a/tinyphone-osx/.xcconfig b/tinyphone-osx/.xcconfig index e69de29..84a13c4 100644 --- a/tinyphone-osx/.xcconfig +++ b/tinyphone-osx/.xcconfig @@ -0,0 +1 @@ +BUILT_PRODUCTS_DIR = $(SRCROOT)/build/$CONFIGURATION From 48778816c1957a49eeb546cbdc8af59d4e0da156 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 12:58:54 +0530 Subject: [PATCH 08/17] Update .xcconfig --- tinyphone-osx/.xcconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tinyphone-osx/.xcconfig b/tinyphone-osx/.xcconfig index 84a13c4..f647d5f 100644 --- a/tinyphone-osx/.xcconfig +++ b/tinyphone-osx/.xcconfig @@ -1 +1,8 @@ +// Intermediate build files go here +PROJECT_TEMP_DIR = $(SRCROOT)/build/$(PROJECT_NAME).build + +// Build-related files for the active build configuration go here +CONFIGURATION_BUILD_DIR = $(SRCROOT)/build/$CONFIGURATION + +// The final product executables and other build products go here BUILT_PRODUCTS_DIR = $(SRCROOT)/build/$CONFIGURATION From c9cecb164dd089ebabe2eb36a43f208da4ebd4f9 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 13:41:35 +0530 Subject: [PATCH 09/17] 3 --- .github/workflows/main.yml | 5 ++++- tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c71161c..c4fd7f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,6 +99,7 @@ jobs: brew install autoconf automake libtool tree wget wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb brew install --build-from-source -f cryptopp.rb + npm install -g appdmg - name: Compile Libraries run : | @@ -111,7 +112,9 @@ jobs: popd #stastd - pushd lib/statsd-cpp/build-osx + pushd lib/statsd-cpp + mkdir build-osx + cd build-osx cmake .. make popd diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index 44b5b61..c9a8992 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -614,7 +614,7 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( - "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", + "../lib/statsd-cpp/build-osx/lib", "$(inherited)", "/usr/local/opt/opencore-amr/lib", /usr/local/lib, @@ -660,7 +660,7 @@ "@executable_path/../Frameworks", ); LIBRARY_SEARCH_PATHS = ( - "/Volumes/Workspace/code/voice/tinyphone/lib/statsd-cpp/build-osx/lib", + "../lib/statsd-cpp/build-osx/lib", "$(inherited)", "/usr/local/opt/opencore-amr/lib", /usr/local/lib, From 5135eee528a43d930516f53eb2ce96078e75ce3e Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 14:22:47 +0530 Subject: [PATCH 10/17] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4fd7f0..83cd10a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -121,6 +121,7 @@ jobs: - name: Build Project run : | + pushd tinyphone-osx pod install xcodebuild build -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release -xcconfig .xcconfig ./package.sh From c69cae10b9b8356f165287323504ac2e10576441 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 14:37:54 +0530 Subject: [PATCH 11/17] try 1 --- .github/workflows/main.yml | 2 +- tinyphone-osx/.xcconfig | 8 -------- tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj | 2 ++ 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 tinyphone-osx/.xcconfig diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83cd10a..65ce8a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -123,7 +123,7 @@ jobs: run : | pushd tinyphone-osx pod install - xcodebuild build -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release -xcconfig .xcconfig + xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release ./package.sh - name: Upload Artifacts diff --git a/tinyphone-osx/.xcconfig b/tinyphone-osx/.xcconfig deleted file mode 100644 index f647d5f..0000000 --- a/tinyphone-osx/.xcconfig +++ /dev/null @@ -1,8 +0,0 @@ -// Intermediate build files go here -PROJECT_TEMP_DIR = $(SRCROOT)/build/$(PROJECT_NAME).build - -// Build-related files for the active build configuration go here -CONFIGURATION_BUILD_DIR = $(SRCROOT)/build/$CONFIGURATION - -// The final product executables and other build products go here -BUILT_PRODUCTS_DIR = $(SRCROOT)/build/$CONFIGURATION diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index c9a8992..30fb1dc 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -637,6 +637,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; + SYMROOT = $SRCROOT/build; TARGETED_DEVICE_FAMILY = 6; }; name = Debug; @@ -682,6 +683,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_VERSION = 5.0; + SYMROOT = $SRCROOT/build; TARGETED_DEVICE_FAMILY = 6; }; name = Release; From 8d95f17497be75aa15a28079b98e75c0c8c8ca11 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 15:13:02 +0530 Subject: [PATCH 12/17] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 65ce8a6..8a69960 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,12 +118,12 @@ jobs: cmake .. make popd - + - name: Build Project run : | pushd tinyphone-osx pod install - xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release + xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ./package.sh - name: Upload Artifacts From 54bc678ad8ff8ce3851112622e0a6269b88d9efb Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 15:53:31 +0530 Subject: [PATCH 13/17] addopencore-amr dep --- .github/workflows/main.yml | 2 +- tinyphone-osx/README.md | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8a69960..06bd8d9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -96,7 +96,7 @@ jobs: shell: bash run : | export HOMEBREW_NO_INSTALL_CLEANUP=true - brew install autoconf automake libtool tree wget + brew install autoconf automake libtool tree wget opencore-amr wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb brew install --build-from-source -f cryptopp.rb npm install -g appdmg diff --git a/tinyphone-osx/README.md b/tinyphone-osx/README.md index dc858f0..0105d0a 100644 --- a/tinyphone-osx/README.md +++ b/tinyphone-osx/README.md @@ -2,12 +2,7 @@ ```bash #install dependencies -brew install autoconf automake libtool - -# cryptopp -wget https://raw.githubusercontent.com/Homebrew/linuxbrew-core/f204b6b30d3981259a764a29dca1a4b403524c9d/Formula/cryptopp.rb -//incase you get error this errpr "Error: cryptopp: Calling bottle :disable is disabled! There is no replacement.", remove the line -brew install --build-from-source -f cryptopp.rb +brew install autoconf automake libtool opencore-amr cryptopp #build dependencies From a4abe5a1ee7139620ad76d001ccaa201aa672160 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 16:19:43 +0530 Subject: [PATCH 14/17] Cache boost --- .github/workflows/main.yml | 39 ++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 06bd8d9..2e52224 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,9 +100,15 @@ jobs: wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb brew install --build-from-source -f cryptopp.rb npm install -g appdmg - - name: Compile Libraries + - name: Restore Boost Framework + uses: actions/cache@v2 + id: cache-boost + with: + path: vendor/boost/dist + key: boost-osx + - name: Create Boost Framework + if: steps.cache-boost.outputs.cache-hit != 'true' run : | - #xcode needs to be proper at this point xcode-select --print-path @@ -111,6 +117,8 @@ jobs: ./boost.sh -macos --boost-version 1.68.0 popd + - name: Compile Libraries + run : | #stastd pushd lib/statsd-cpp mkdir build-osx @@ -119,17 +127,20 @@ jobs: make popd - - name: Build Project - run : | - pushd tinyphone-osx - pod install - xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO - ./package.sh + # - name: Build Project + # run : | + # #xcode needs to be proper at this point + # xcode-select --print-path - - name: Upload Artifacts - uses: actions/upload-artifact@v2 - with: - name: tinyphone.dmg - path: | - ./tinyphone.dmg + # pushd tinyphone-osx + # pod install + # xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + # ./package.sh + + # - name: Upload Artifacts + # uses: actions/upload-artifact@v2 + # with: + # name: tinyphone.dmg + # path: | + # ./tinyphone.dmg From bc736f1e9b65912ea688a02fc3ec36409de1c952 Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 16:57:38 +0530 Subject: [PATCH 15/17] copy final product --- .github/workflows/main.yml | 28 +++++++++---------- .../Tinyphone.xcodeproj/project.pbxproj | 2 -- .../xcshareddata/xcschemes/Tinyphone.xcscheme | 20 ++++++++++++- tinyphone-osx/release-spec.json | 2 +- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e52224..c2ee332 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -127,20 +127,20 @@ jobs: make popd - # - name: Build Project - # run : | - # #xcode needs to be proper at this point - # xcode-select --print-path + - name: Build Project + run : | + #xcode needs to be proper at this point + xcode-select --print-path - # pushd tinyphone-osx - # pod install - # xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO - # ./package.sh + pushd tinyphone-osx + pod install + xcodebuild -workspace Tinyphone.xcworkspace -scheme Tinyphone -configuration Release CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO + ./package.sh - # - name: Upload Artifacts - # uses: actions/upload-artifact@v2 - # with: - # name: tinyphone.dmg - # path: | - # ./tinyphone.dmg + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: tinyphone.dmg + path: | + ./tinyphone.dmg diff --git a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj index 30fb1dc..c9a8992 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj +++ b/tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj @@ -637,7 +637,6 @@ SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - SYMROOT = $SRCROOT/build; TARGETED_DEVICE_FAMILY = 6; }; name = Debug; @@ -683,7 +682,6 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "src/Tinyphone-Bridging-Header.h"; SWIFT_VERSION = 5.0; - SYMROOT = $SRCROOT/build; TARGETED_DEVICE_FAMILY = 6; }; name = Release; diff --git a/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme b/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme index 14bf2df..bdd8aa6 100644 --- a/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme +++ b/tinyphone-osx/Tinyphone.xcodeproj/xcshareddata/xcschemes/Tinyphone.xcscheme @@ -1,10 +1,28 @@ + version = "1.7"> + + + + + + + + + + Date: Fri, 18 Mar 2022 17:03:12 +0530 Subject: [PATCH 16/17] Update main.yml --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2ee332..267fdec 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,14 +100,14 @@ jobs: wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb brew install --build-from-source -f cryptopp.rb npm install -g appdmg - - name: Restore Boost Framework - uses: actions/cache@v2 - id: cache-boost - with: - path: vendor/boost/dist - key: boost-osx + # - name: Restore Boost Framework + # uses: actions/cache@v2 + # id: cache-boost + # with: + # path: vendor/boost/dist + # key: boost-osx - name: Create Boost Framework - if: steps.cache-boost.outputs.cache-hit != 'true' + # if: steps.cache-boost.outputs.cache-hit != 'true' run : | #xcode needs to be proper at this point xcode-select --print-path From 0ad470af9c086444de5eaa60e28246debf69da5e Mon Sep 17 00:00:00 2001 From: Kinshuk Bairagi Date: Fri, 18 Mar 2022 17:18:00 +0530 Subject: [PATCH 17/17] Update main.yml --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 267fdec..c86848a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -100,12 +100,12 @@ jobs: wget https://gist.githubusercontent.com/kingster/1954ead3c38a40cac88c5c1311bb39c5/raw/343da2c7a2a52ee5a1c03902cc5e44ed83b1dd5d/cryptopp.rb brew install --build-from-source -f cryptopp.rb npm install -g appdmg - # - name: Restore Boost Framework - # uses: actions/cache@v2 - # id: cache-boost - # with: - # path: vendor/boost/dist - # key: boost-osx + - name: Restore Boost Framework + uses: actions/cache@v2 + id: cache-boost + with: + path: vendor/boost + key: boost-osx - name: Create Boost Framework # if: steps.cache-boost.outputs.cache-hit != 'true' run : | @@ -142,5 +142,5 @@ jobs: with: name: tinyphone.dmg path: | - ./tinyphone.dmg + ./tinyphone-osx/tinyphone.dmg