Merge pull request #1289 from jagerman/merge-master

Merge master

.gitattributes

@@ -2,6 +2,3 @@ external/date/test export-ignore
 external/nlohmann/doc export-ignore
 external/nlohmann/test export-ignore
 external/nlohmann/benchmarks/data export-ignore
-*.exe export-ignore
-*.png export-ignore
-*.gif export-ignore

CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 
 set(PROJECT_NAME lokinet)
 project(${PROJECT_NAME}
-    VERSION 0.7.0
+    VERSION 0.7.1
     DESCRIPTION "lokinet - IP packet onion router"
     LANGUAGES C CXX)
 
@@ -321,3 +321,7 @@ add_subdirectory(docs)
 if(BUILD_PACKAGE)
     include(cmake/installer.cmake)
 endif()
+
+if(BUILD_PACKAGE)
+    include(cmake/installer.cmake)
+endif()

Makefile

@@ -290,6 +290,16 @@ windows-release: windows-release-configure
 
 windows: windows-release
 
+mac-release-configure: $(LIBUV_PREFIX)
+	mkdir -p '$(BUILD_ROOT)'
+	$(CONFIG_CMD) -DNATIVE_BUILD=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_PACKAGE=ON -DCMAKE_ASM_FLAGS='$(ASFLAGS)' -DCMAKE_C_FLAGS='$(CFLAGS)' -DCMAKE_CXX_FLAGS='$(CXXFLAGS)' -DLIBUV_ROOT='$(LIBUV_PREFIX)' -DWITH_TESTS=OFF '$(REPO)'
+
+mac-release: mac-release-configure
+	$(MAKE) -C '$(BUILD_ROOT)'
+
+mac: mac-release
+	$(MAKE) -C '$(BUILD_ROOT)' package
+
 mac-release-configure: $(LIBUV_PREFIX)
 	mkdir -p '$(BUILD_ROOT)'
 	$(CONFIG_CMD) -DNATIVE_BUILD=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_PACKAGE=ON -DCMAKE_ASM_FLAGS='$(ASFLAGS)' -DCMAKE_C_FLAGS='$(CFLAGS)' -DCMAKE_CXX_FLAGS='$(CXXFLAGS)' -DLIBUV_ROOT='$(LIBUV_PREFIX)' -DWITH_TESTS=OFF '$(REPO)'

contrib/macos/lokinet_macos_daemon_script.sh

@@ -39,7 +39,7 @@ fi
 
 networksetup -setdnsservers "$SERVICE_NAME" 127.0.0.1
 
-/opt/lokinet/bin/lokinet /var/lib/lokinet/lokinet.ini
+trap "networksetup -setdnsservers \"$SERVICE_NAME\" $OLD_SERVERS" INT TERM EXIT
 
-networksetup -setdnsservers "$SERVICE_NAME" $OLD_SERVERS
+/opt/lokinet/bin/lokinet /var/lib/lokinet/lokinet.ini
 

contrib/macos/lokinet_uninstall.sh

@@ -1,8 +1,10 @@
 #!/bin/sh
-launchctl stop network.loki.lokinet.daemon
-launchctl unload /Library/LaunchDaemons/network.loki.lokinet.daemon.plist
 
+touch /var/lib/lokinet/suspend-launchd-service # Prevent restarting on exit
 killall lokinet
+sleep 5  # Give it some time to shut down before we bring launchd into this
+launchctl stop network.loki.lokinet.daemon
+launchctl unload /Library/LaunchDaemons/network.loki.lokinet.daemon.plist
 
 rm -rf /Library/LaunchDaemons/network.loki.lokinet.daemon.plist
 rm -rf /Applications/LokinetGUI.app