commit 9c45c64fbc650be97b10ae4d121032df7caf2481
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Mar 18 15:29:42 2017 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Mar 18 15:43:47 2017 -0700
tree 0e071608049e28c3db5f448adf1c2821e5dad11a
parent 4d6c8e5edb9cf2ddf765b545a45f24ef3def2e76

Build script adjustments

Based on Apple's documentation (https://developer.apple.com/library/content/
documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html)
custom paths must not be used for binaries, as they are left unsigned by
codesign app.

Change-Id: I628a3a9da15dfdbbf515b4c16a3d38590ae433f5

src/tray-menu.cpp

diff --git a/src/tray-menu.cpp b/src/tray-menu.cpp
index 3a6d76c..de90134 100644
--- a/src/tray-menu.cpp
+++ b/src/tray-menu.cpp
@@ -199,7 +199,7 @@
 #ifdef OSX_BUILD
   QProcess* proc = new QProcess();
   connect(proc, SIGNAL(finished(int)), proc, SLOT(deleteLater()));
-  proc->startDetached((QCoreApplication::applicationDirPath() + "/../Platform/nfd"),
+  proc->startDetached((QCoreApplication::applicationDirPath() + "/../Helpers/nfd"),
                       QStringList()
                         << "--config"
                         << (QCoreApplication::applicationDirPath() + "/../etc/ndn/nfd.conf"));
@@ -255,7 +255,7 @@
 
   scheduleDelayedTask(std::chrono::seconds(2), [this] {
       appendNdnAutoConfigStatus("NDN auto configuration starting...\n");
-      m_acProc->start(QCoreApplication::applicationDirPath() + "/../Platform/ndn-autoconfig",
+      m_acProc->start(QCoreApplication::applicationDirPath() + "/../Helpers/ndn-autoconfig",
                       QStringList() << "--daemon");
       connect(m_acProc, SIGNAL(readyReadStandardOutput()), this, SLOT(processOutput()));
       connect(m_acProc, SIGNAL(readyReadStandardError()), this, SLOT(processOutput()));
@@ -394,7 +394,7 @@
               << "do shell script \""
                    "/bin/mkdir -vp /usr/local/bin; "
                    "/bin/ln -s -f '" +  QCoreApplication::applicationDirPath() +
-                     "/../Resources/ndn" + "' /usr/local/bin/ndn;"
+                     "/../Resources/bin/ndn" + "' /usr/local/bin/ndn;"
                    "\" with administrator privileges");
 #endif
 }