diff options
Diffstat (limited to 'buildinstaller.sh')
-rwxr-xr-x | buildinstaller.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/buildinstaller.sh b/buildinstaller.sh index 7eb2c243..74e6f360 100755 --- a/buildinstaller.sh +++ b/buildinstaller.sh @@ -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 ;; |