Fix binary generation and prepare for 0.2.1 release
Change-Id: Ifd34ded0147a2848c24f5a70cfcb7081358fe997
diff --git a/.waf-tools/osx-frameworks.py b/.waf-tools/osx-frameworks.py
index 254fa8a..9936778 100644
--- a/.waf-tools/osx-frameworks.py
+++ b/.waf-tools/osx-frameworks.py
@@ -54,7 +54,6 @@
if not os.path.exists("osx/Frameworks"):
os.mkdir ("osx/Frameworks")
os.rename("build/Sparkle/Sparkle.framework", "osx/Frameworks/Sparkle.framework")
- shutil.rmtree("build/Sparkle", ignore_errors=True)
check_sparkle(cxxflags="-F%s/osx/Frameworks/" % conf.path.abspath(),
linkflags="-F%s/osx/Frameworks/" % conf.path.abspath())
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 972ffb4..7edf6b0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,12 @@
Release Notes
=============
+## Version 0.2.1
+
+Changes since version 0.2.0:
+
+- Fix interpreter path for the bundled shell-based tools
+
## Version 0.2.0
Changes since version 0.1.0:
diff --git a/docs/intro.md b/docs/intro.md
index 441f9aa..817b8aa 100644
--- a/docs/intro.md
+++ b/docs/intro.md
@@ -3,7 +3,7 @@
{align="right" style="max-width:60%"}
-NFD Control Center is a software module for desktop systems to manage local instance of Named Data Forwarding Daemon (NFD). The current released macOS version of the NFD Control Center (0.2.0) is built with newest ndn-cxx (0.5.1) and bundles in a newest version of NFD (0.5.1) and NDN Essential tools (0.4). NFD Control Center provides macOS users a simple way to get NDN connectivity and keep up with the latest updates of NFD. The NFD Control Center supplies various features, such as:
+NFD Control Center is a software module for desktop systems to manage local instance of Named Data Forwarding Daemon (NFD). The current released macOS version of the NFD Control Center (0.2.1) is built with newest ndn-cxx (0.5.1) and bundles in a newest version of NFD (0.5.1) and NDN Essential tools (0.4). NFD Control Center provides macOS users a simple way to get NDN connectivity and keep up with the latest updates of NFD. The NFD Control Center supplies various features, such as:
- Start Control Center as soon as computers starts
- Start NFD daemon as soon as Control Center starts
@@ -20,7 +20,7 @@
- macOS 10.12
- * [Version 0.2.0](https://named-data.net/binaries/NFD-Control-Center/NDN-0.2.0.dmg)
+ * [Version 0.2.1](https://named-data.net/binaries/NFD-Control-Center/NDN-0.2.1.dmg)
- Source
diff --git a/make-deps.sh b/make-deps.sh
index 9378aca..4cb7600 100755
--- a/make-deps.sh
+++ b/make-deps.sh
@@ -1,5 +1,9 @@
#!/usr/bin/env bash
+# Avoid dependency on non-standard tools
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+export PKGCONFIG=/usr/local/bin/pkg-config
+
NDN_CXX_COMMIT=${NDN_CXX_COMMIT:-ndn-cxx-0.5.1}
NFD_COMMIT=${NFD_COMMIT:-NFD-0.5.1}
NDN_TOOLS_COMMIT=${NDN_TOOLS_COMMIT:-ndn-tools-0.4}
diff --git a/make-osx-bundle.py b/make-osx-bundle.py
index 6677d32..ca34843 100755
--- a/make-osx-bundle.py
+++ b/make-osx-bundle.py
@@ -409,3 +409,5 @@
print ' * Signing .dmg with identity `%s\'' % options.codesign
codesign(fn)
print ''
+
+Popen('tail -n +3 RELEASE_NOTES.md | pandoc -f markdown -t html > build/release-notes-%s.html' % ver, shell=True).wait()
diff --git a/ndn-control-center.xml b/ndn-control-center.xml
index bda595f..adc2f05 100644
--- a/ndn-control-center.xml
+++ b/ndn-control-center.xml
@@ -18,5 +18,17 @@
length="27627391"
type="application/octet-stream" />
</item>
+ <item>
+ <title>Version 0.2.1 (ndn-cxx version 0.5.1, NFD version 0.5.1, ndn-tools version 0.4)</title>
+ <sparkle:releaseNotesLink>
+ https://named-data.net/binaries/NFD-Control-Center/release-notes-0.2.1.html
+ </sparkle:releaseNotesLink>
+ <pubDate>Thu, 9 Feb 2017 15:55:00 +0000</pubDate>
+ <enclosure url="https://named-data.net/binaries/NFD-Control-Center/NDN-0.2.1.dmg"
+ sparkle:version="0.2.1"
+ sparkle:dsaSignature="MCwCFAD66xeADU9oA3mzU7/XiGvyuVipAhRcBNwHTXDoyEjo+jR0UJJuAztz8g=="
+ length="27883199"
+ type="application/octet-stream" />
+ </item>
</channel>
</rss>
diff --git a/wscript b/wscript
index d3fae49..2a59b8e 100644
--- a/wscript
+++ b/wscript
@@ -1,5 +1,5 @@
# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-VERSION='0.2.0'
+VERSION='0.2.1'
APPNAME='nfd-control-center'
APPCAST='https://named-data.net/binaries/NFD-Control-Center/ndn-control-center.xml'