Installer work, change to plain C, work for OSX installation.

This commit is contained in:
Adam Ierymenko 2013-12-13 13:49:46 -08:00
commit 8cc9692cd9
4 changed files with 64 additions and 42 deletions

View file

@ -56,20 +56,28 @@ case "$system" in
./file2lz4c ext/installfiles/linux/uninstall.sh uninstall_sh >installer-build/uninstall_sh.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
ls -l zt1-*-install
targ="zt1-${vmajor}_${vminor}_${revision}-linux-${machine}-install"
gcc -Os -o $targ installer.c ext/lz4/lz4.o ext/lz4/lz4hc.o
strip --strip-all $targ
ls -l $targ
;;
Darwin)
echo "Assembling OSX installer for x86/x64 (combined) and ZT1 version $vmajor.$vminor.$revision"
echo "Assembling mac 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
targ="zt1-${vmajor}_${vminor}_${revision}-mac-combined-install"
# Installer can be i386-only to save space, but installs combined
# x86/x64 binaries for ZT1 itself.
clang -Os -arch i386 -o $targ installer.c ext/lz4/lz4.o ext/lz4/lz4hc.o
strip $targ
ls -l $targ
;;