Browse Source

Fix paths again in Mac pkg build.

Adam Ierymenko 10 years ago
parent
commit
97dd8d864f
2 changed files with 22 additions and 22 deletions
  1. 21 21
      ext/installfiles/mac/ZeroTier One.pkgproj
  2. 1 1
      make-mac.mk

+ 21 - 21
ext/installfiles/mac/ZeroTier One.pkgproj

@@ -37,9 +37,9 @@
 								<key>GID</key>
 								<key>GID</key>
 								<integer>80</integer>
 								<integer>80</integer>
 								<key>PATH</key>
 								<key>PATH</key>
-								<string>../../../ext/mac-ui-macgap1-wrapper/bin/ZeroTier One.app</string>
+								<string>../../mac-ui-macgap1-wrapper/bin/ZeroTier One.app</string>
 								<key>PATH_TYPE</key>
 								<key>PATH_TYPE</key>
-								<integer>0</integer>
+								<integer>1</integer>
 								<key>PERMISSIONS</key>
 								<key>PERMISSIONS</key>
 								<integer>493</integer>
 								<integer>493</integer>
 								<key>TYPE</key>
 								<key>TYPE</key>
@@ -79,9 +79,9 @@
 														<key>GID</key>
 														<key>GID</key>
 														<integer>0</integer>
 														<integer>0</integer>
 														<key>PATH</key>
 														<key>PATH</key>
-														<string>../../../ext/installfiles/mac/get-proxy-settings.sh</string>
+														<string>get-proxy-settings.sh</string>
 														<key>PATH_TYPE</key>
 														<key>PATH_TYPE</key>
-														<integer>0</integer>
+														<integer>1</integer>
 														<key>PERMISSIONS</key>
 														<key>PERMISSIONS</key>
 														<integer>493</integer>
 														<integer>493</integer>
 														<key>TYPE</key>
 														<key>TYPE</key>
@@ -95,9 +95,9 @@
 														<key>GID</key>
 														<key>GID</key>
 														<integer>0</integer>
 														<integer>0</integer>
 														<key>PATH</key>
 														<key>PATH</key>
-														<string>../../../ext/installfiles/mac/launch.sh</string>
+														<string>launch.sh</string>
 														<key>PATH_TYPE</key>
 														<key>PATH_TYPE</key>
-														<integer>0</integer>
+														<integer>1</integer>
 														<key>PERMISSIONS</key>
 														<key>PERMISSIONS</key>
 														<integer>493</integer>
 														<integer>493</integer>
 														<key>TYPE</key>
 														<key>TYPE</key>
@@ -111,9 +111,9 @@
 														<key>GID</key>
 														<key>GID</key>
 														<integer>0</integer>
 														<integer>0</integer>
 														<key>PATH</key>
 														<key>PATH</key>
-														<string>../../../ext/bin/tap-mac/tap.kext</string>
+														<string>../../bin/tap-mac/tap.kext</string>
 														<key>PATH_TYPE</key>
 														<key>PATH_TYPE</key>
-														<integer>0</integer>
+														<integer>1</integer>
 														<key>PERMISSIONS</key>
 														<key>PERMISSIONS</key>
 														<integer>493</integer>
 														<integer>493</integer>
 														<key>TYPE</key>
 														<key>TYPE</key>
@@ -132,7 +132,7 @@
 																<key>PATH</key>
 																<key>PATH</key>
 																<string>../../../ui/index.html</string>
 																<string>../../../ui/index.html</string>
 																<key>PATH_TYPE</key>
 																<key>PATH_TYPE</key>
-																<integer>0</integer>
+																<integer>1</integer>
 																<key>PERMISSIONS</key>
 																<key>PERMISSIONS</key>
 																<integer>420</integer>
 																<integer>420</integer>
 																<key>TYPE</key>
 																<key>TYPE</key>
@@ -148,7 +148,7 @@
 																<key>PATH</key>
 																<key>PATH</key>
 																<string>../../../ui/main.js</string>
 																<string>../../../ui/main.js</string>
 																<key>PATH_TYPE</key>
 																<key>PATH_TYPE</key>
-																<integer>0</integer>
+																<integer>1</integer>
 																<key>PERMISSIONS</key>
 																<key>PERMISSIONS</key>
 																<integer>420</integer>
 																<integer>420</integer>
 																<key>TYPE</key>
 																<key>TYPE</key>
@@ -164,7 +164,7 @@
 																<key>PATH</key>
 																<key>PATH</key>
 																<string>../../../ui/react.min.js</string>
 																<string>../../../ui/react.min.js</string>
 																<key>PATH_TYPE</key>
 																<key>PATH_TYPE</key>
-																<integer>0</integer>
+																<integer>1</integer>
 																<key>PERMISSIONS</key>
 																<key>PERMISSIONS</key>
 																<integer>420</integer>
 																<integer>420</integer>
 																<key>TYPE</key>
 																<key>TYPE</key>
@@ -180,7 +180,7 @@
 																<key>PATH</key>
 																<key>PATH</key>
 																<string>../../../ui/simpleajax.min.js</string>
 																<string>../../../ui/simpleajax.min.js</string>
 																<key>PATH_TYPE</key>
 																<key>PATH_TYPE</key>
-																<integer>0</integer>
+																<integer>1</integer>
 																<key>PERMISSIONS</key>
 																<key>PERMISSIONS</key>
 																<integer>420</integer>
 																<integer>420</integer>
 																<key>TYPE</key>
 																<key>TYPE</key>
@@ -196,7 +196,7 @@
 																<key>PATH</key>
 																<key>PATH</key>
 																<string>../../../ui/zerotier.css</string>
 																<string>../../../ui/zerotier.css</string>
 																<key>PATH_TYPE</key>
 																<key>PATH_TYPE</key>
-																<integer>0</integer>
+																<integer>1</integer>
 																<key>PERMISSIONS</key>
 																<key>PERMISSIONS</key>
 																<integer>420</integer>
 																<integer>420</integer>
 																<key>TYPE</key>
 																<key>TYPE</key>
@@ -212,7 +212,7 @@
 																<key>PATH</key>
 																<key>PATH</key>
 																<string>../../../ui/ztui.min.js</string>
 																<string>../../../ui/ztui.min.js</string>
 																<key>PATH_TYPE</key>
 																<key>PATH_TYPE</key>
-																<integer>0</integer>
+																<integer>1</integer>
 																<key>PERMISSIONS</key>
 																<key>PERMISSIONS</key>
 																<integer>420</integer>
 																<integer>420</integer>
 																<key>TYPE</key>
 																<key>TYPE</key>
@@ -240,9 +240,9 @@
 														<key>GID</key>
 														<key>GID</key>
 														<integer>0</integer>
 														<integer>0</integer>
 														<key>PATH</key>
 														<key>PATH</key>
-														<string>../../../ext/installfiles/mac/uninstall.sh</string>
+														<string>uninstall.sh</string>
 														<key>PATH_TYPE</key>
 														<key>PATH_TYPE</key>
-														<integer>0</integer>
+														<integer>1</integer>
 														<key>PERMISSIONS</key>
 														<key>PERMISSIONS</key>
 														<integer>493</integer>
 														<integer>493</integer>
 														<key>TYPE</key>
 														<key>TYPE</key>
@@ -258,7 +258,7 @@
 														<key>PATH</key>
 														<key>PATH</key>
 														<string>../../../zerotier-one</string>
 														<string>../../../zerotier-one</string>
 														<key>PATH_TYPE</key>
 														<key>PATH_TYPE</key>
-														<integer>0</integer>
+														<integer>1</integer>
 														<key>PERMISSIONS</key>
 														<key>PERMISSIONS</key>
 														<integer>493</integer>
 														<integer>493</integer>
 														<key>TYPE</key>
 														<key>TYPE</key>
@@ -429,9 +429,9 @@
 										<key>GID</key>
 										<key>GID</key>
 										<integer>0</integer>
 										<integer>0</integer>
 										<key>PATH</key>
 										<key>PATH</key>
-										<string>../../../ext/installfiles/mac/com.zerotier.one.plist</string>
+										<string>com.zerotier.one.plist</string>
 										<key>PATH_TYPE</key>
 										<key>PATH_TYPE</key>
-										<integer>0</integer>
+										<integer>1</integer>
 										<key>PERMISSIONS</key>
 										<key>PERMISSIONS</key>
 										<integer>420</integer>
 										<integer>420</integer>
 										<key>TYPE</key>
 										<key>TYPE</key>
@@ -734,14 +734,14 @@
 			<key>POSTINSTALL_PATH</key>
 			<key>POSTINSTALL_PATH</key>
 			<dict>
 			<dict>
 				<key>PATH</key>
 				<key>PATH</key>
-				<string>../../../ext/installfiles/mac/postinst.sh</string>
+				<string>/Users/api/Code/ZeroTierOne/ext/installfiles/mac/postinst.sh</string>
 				<key>PATH_TYPE</key>
 				<key>PATH_TYPE</key>
 				<integer>0</integer>
 				<integer>0</integer>
 			</dict>
 			</dict>
 			<key>PREINSTALL_PATH</key>
 			<key>PREINSTALL_PATH</key>
 			<dict>
 			<dict>
 				<key>PATH</key>
 				<key>PATH</key>
-				<string>../../../ext/installfiles/mac/preinst.sh</string>
+				<string>/Users/api/Code/ZeroTierOne/ext/installfiles/mac/preinst.sh</string>
 				<key>PATH_TYPE</key>
 				<key>PATH_TYPE</key>
 				<integer>0</integer>
 				<integer>0</integer>
 			</dict>
 			</dict>

+ 1 - 1
make-mac.mk

@@ -62,7 +62,7 @@ selftest: $(OBJS) selftest.o
 
 
 # Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html
 # Requires Packages: http://s.sudre.free.fr/Software/Packages/about.html
 mac-dist-pkg: FORCE
 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) -f -s $(CODESIGN_CERT) "ZeroTier One.pkg"
 	$(CODESIGN) -vvv "ZeroTier One.pkg"
 	$(CODESIGN) -vvv "ZeroTier One.pkg"