void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Installer builder for mac.

Browse source
This commit is contained in:
Adam Ierymenko 2013-12-11 16:31:00 -08:00
parent 7eac53a178
commit 8c58635ea7
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildinstaller.sh
View file

@ -57,7 +57,6 @@ case "$system" in
./file2lz4c ext/installfiles/linux/init.d/zerotier-one linux__init_d__zerotier_one >installer-build/linux__init_d__zerotier_one.h ./file2lz4c ext/installfiles/linux/init.d/zerotier-one linux__init_d__zerotier_one >installer-build/linux__init_d__zerotier_one.h
g++ -Os -o "zt1-${vmajor}_${vminor}_${revision}-linux-${machine}-install" installer.cpp ext/lz4/lz4.o ext/lz4/lz4hc.o g++ -Os -o "zt1-${vmajor}_${vminor}_${revision}-linux-${machine}-install" installer.cpp ext/lz4/lz4.o ext/lz4/lz4hc.o
ls -l zt1-*-install ls -l zt1-*-install
;; ;;
@ -65,6 +64,13 @@ case "$system" in
Darwin) Darwin)
echo "Assembling OSX installer for x86/x64 (combined) and ZT1 version $vmajor.$vminor.$revision" echo "Assembling OSX installer for x86/x64 (combined) and ZT1 version $vmajor.$vminor.$revision"
./file2lz4c ext/installfiles/linux/uninstall.sh uninstall_sh >installer-build/uninstall_sh.h
./file2lz4c ext/bin/tap-mac/tap.kext/Contents/Info.plist tap_mac__Info_plist >installer-build/tap_mac__Info_plist.h
./file2lz4c ext/bin/tap-mac/tap.kext/Contents/MacOS/tap tap_mac__tap >installer-build/tap_mac__tap.h
g++ -Os -arch i386 -o "zt1-${vmajor}_${vminor}_${revision}-mac-combined-install" installer.cpp ext/lz4/lz4.o ext/lz4/lz4hc.o
ls -l zt1-*-install
;; ;;
*) *)

6
installer.cpp
View file

@ -211,17 +211,17 @@ int main(int argc,char **argv)
#ifdef __APPLE__ #ifdef __APPLE__
// Write tap.kext into home folder // Write tap.kext into home folder
sprintf(buf,"%s/tap.kext"); sprintf(buf,"%s/tap.kext",zthome);
mkdir(buf,0755); mkdir(buf,0755);
chmod(buf,0755); chmod(buf,0755);
chown(buf,0,0); chown(buf,0,0);
printf("mkdir %s\n",buf); printf("mkdir %s\n",buf);
sprintf(buf,"%s/tap.kext/Contents"); sprintf(buf,"%s/tap.kext/Contents",zthome);
mkdir(buf,0755); mkdir(buf,0755);
chmod(buf,0755); chmod(buf,0755);
chown(buf,0,0); chown(buf,0,0);
printf("mkdir %s\n",buf); printf("mkdir %s\n",buf);
sprintf(buf,"%s/tap.kext/Contents/MacOS"); sprintf(buf,"%s/tap.kext/Contents/MacOS",zthome);
mkdir(buf,0755); mkdir(buf,0755);
chmod(buf,0755); chmod(buf,0755);
chown(buf,0,0); chown(buf,0,0);

2
make-mac.mk
View file

@ -43,6 +43,6 @@ file2lz4c: ext/lz4/lz4hc.o FORCE
$(CXX) $(CXXFLAGS) -o file2lz4c file2lz4c.cpp node/Utils.cpp node/Salsa20.cpp ext/lz4/lz4hc.o $(CXX) $(CXXFLAGS) -o file2lz4c file2lz4c.cpp node/Utils.cpp node/Salsa20.cpp ext/lz4/lz4hc.o
clean: clean:
rm -rf *.dSYM build-ZeroTierUI-* $(OBJS) file2lz4c zerotier-* installer-build rm -rf *.dSYM build-ZeroTierUI-* $(OBJS) file2lz4c zerotier-* installer-build zt1-*-install
FORCE: FORCE: