From 1afd02df546d3ddfce05c0cf522841e722e3cf77 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 2 Jun 2015 11:47:32 -0700 Subject: Path fix in Packages build file for Mac --- ext/installfiles/mac/ZeroTier One.pkgproj | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'ext') diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 93dba714..80cdac60 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -37,7 +37,7 @@ GID 80 PATH - /Users/api/Code/ZeroTierOne/ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app + ../../../ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app PATH_TYPE 0 PERMISSIONS @@ -79,7 +79,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/get-proxy-settings.sh + ../../../ext/installfiles/mac/get-proxy-settings.sh PATH_TYPE 0 PERMISSIONS @@ -95,7 +95,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/launch.sh + ../../../ext/installfiles/mac/launch.sh PATH_TYPE 0 PERMISSIONS @@ -111,7 +111,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ext/bin/tap-mac/tap.kext + ../../../ext/bin/tap-mac/tap.kext PATH_TYPE 0 PERMISSIONS @@ -130,7 +130,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ui/index.html + ../../../ui/index.html PATH_TYPE 0 PERMISSIONS @@ -146,7 +146,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ui/main.js + ../../../ui/main.js PATH_TYPE 0 PERMISSIONS @@ -162,7 +162,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ui/react.min.js + ../../../ui/react.min.js PATH_TYPE 0 PERMISSIONS @@ -178,7 +178,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ui/simpleajax.min.js + ../../../ui/simpleajax.min.js PATH_TYPE 0 PERMISSIONS @@ -194,7 +194,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ui/zerotier.css + ../../../ui/zerotier.css PATH_TYPE 0 PERMISSIONS @@ -210,7 +210,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ui/ztui.min.js + ../../../ui/ztui.min.js PATH_TYPE 0 PERMISSIONS @@ -240,7 +240,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/uninstall.sh + ../../../ext/installfiles/mac/uninstall.sh PATH_TYPE 0 PERMISSIONS @@ -256,7 +256,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/zerotier-one + ../../../zerotier-one PATH_TYPE 0 PERMISSIONS @@ -429,7 +429,7 @@ GID 0 PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/com.zerotier.one.plist + ../../../ext/installfiles/mac/com.zerotier.one.plist PATH_TYPE 0 PERMISSIONS @@ -734,14 +734,14 @@ POSTINSTALL_PATH PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/postinst.sh + ../../../ext/installfiles/mac/postinst.sh PATH_TYPE 0 PREINSTALL_PATH PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/preinst.sh + ../../../ext/installfiles/mac/preinst.sh PATH_TYPE 0 -- cgit v1.2.3 From 97dd8d864f0172fdba055f8d868079eec7a36933 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 2 Jun 2015 11:59:05 -0700 Subject: Fix paths again in Mac pkg build. --- ext/installfiles/mac/ZeroTier One.pkgproj | 42 +++++++++++++++---------------- make-mac.mk | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'ext') diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 80cdac60..556568e3 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -37,9 +37,9 @@ GID 80 PATH - ../../../ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app + ../../mac-ui-macgap1-wrapper/bin/ZeroTier One.app PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -79,9 +79,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/get-proxy-settings.sh + get-proxy-settings.sh PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -95,9 +95,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/launch.sh + launch.sh PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -111,9 +111,9 @@ GID 0 PATH - ../../../ext/bin/tap-mac/tap.kext + ../../bin/tap-mac/tap.kext PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -132,7 +132,7 @@ PATH ../../../ui/index.html PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -148,7 +148,7 @@ PATH ../../../ui/main.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -164,7 +164,7 @@ PATH ../../../ui/react.min.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -180,7 +180,7 @@ PATH ../../../ui/simpleajax.min.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -196,7 +196,7 @@ PATH ../../../ui/zerotier.css PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -212,7 +212,7 @@ PATH ../../../ui/ztui.min.js PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -240,9 +240,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/uninstall.sh + uninstall.sh PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -258,7 +258,7 @@ PATH ../../../zerotier-one PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE @@ -429,9 +429,9 @@ GID 0 PATH - ../../../ext/installfiles/mac/com.zerotier.one.plist + com.zerotier.one.plist PATH_TYPE - 0 + 1 PERMISSIONS 420 TYPE @@ -734,14 +734,14 @@ POSTINSTALL_PATH PATH - ../../../ext/installfiles/mac/postinst.sh + /Users/api/Code/ZeroTierOne/ext/installfiles/mac/postinst.sh PATH_TYPE 0 PREINSTALL_PATH PATH - ../../../ext/installfiles/mac/preinst.sh + /Users/api/Code/ZeroTierOne/ext/installfiles/mac/preinst.sh PATH_TYPE 0 diff --git a/make-mac.mk b/make-mac.mk index 48bfdd79..3bb0727a 100644 --- a/make-mac.mk +++ b/make-mac.mk @@ -62,7 +62,7 @@ selftest: $(OBJS) selftest.o # Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html mac-dist-pkg: FORCE - cd ext/installfiles/mac ; packagesbuild "ZeroTier One.pkgproj" + packagesbuild "ext/installfiles/mac/ZeroTier One.pkgproj" $(CODESIGN) -f -s $(CODESIGN_CERT) "ZeroTier One.pkg" $(CODESIGN) -vvv "ZeroTier One.pkg" -- cgit v1.2.3 From b8f40c0b916c31abd25b4c68ef0de3070a9e44bc Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 2 Jun 2015 12:01:00 -0700 Subject: Yet another /Users/api path in packages script. --- ext/installfiles/mac/ZeroTier One.pkgproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext') diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj index 556568e3..c917d824 100755 --- a/ext/installfiles/mac/ZeroTier One.pkgproj +++ b/ext/installfiles/mac/ZeroTier One.pkgproj @@ -734,16 +734,16 @@ POSTINSTALL_PATH PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/postinst.sh + postinst.sh PATH_TYPE - 0 + 1 PREINSTALL_PATH PATH - /Users/api/Code/ZeroTierOne/ext/installfiles/mac/preinst.sh + preinst.sh PATH_TYPE - 0 + 1 RESOURCES -- cgit v1.2.3