Browse Source

minor improvements to OS X installation routine (#373)

rcstuber 5 years ago
parent
commit
d5fb717ef4
2 changed files with 3 additions and 4 deletions
  1. 3 2
      Makefile
  2. 0 2
      other/azure-pipelines/build-mac.yml

+ 3 - 2
Makefile

@@ -114,6 +114,7 @@ endif
 all: libhl hl libs
 
 install:
+	$(UNAME)==Darwin && make uninstall
 	mkdir -p $(INSTALL_BIN_DIR)
 	cp hl $(INSTALL_BIN_DIR)
 	mkdir -p $(INSTALL_LIB_DIR)
@@ -208,12 +209,12 @@ release_osx:
 	rm -rf hl-$(HL_VER)
 
 codesign_osx:
+	sudo security delete-identity -c hl-cert || echo
 	echo "[req]\ndistinguished_name=codesign_dn\n[codesign_dn]\ncommonName=hl-cert\n[v3_req]\nkeyUsage=critical,digitalSignature\nextendedKeyUsage=critical,codeSigning" > openssl.cnf
 	openssl req -x509 -newkey rsa:4096 -keyout key.pem -nodes -days 365 -subj '/CN=hl-cert' -outform der -out cert.cer -extensions v3_req -config openssl.cnf
 	sudo security add-trusted-cert -d -k /Library/Keychains/System.keychain cert.cer
-	sudo security import key.pem -k /Library/Keychains/System.keychain
+	sudo security import key.pem -k /Library/Keychains/System.keychain -A
 	codesign --entitlements other/osx/entitlements.xml -fs hl-cert hl
-	sudo security delete-identity -c hl-cert
 	rm key.pem cert.cer openssl.cnf
 
 .SUFFIXES : .c .o

+ 0 - 2
other/azure-pipelines/build-mac.yml

@@ -29,8 +29,6 @@ jobs:
           displayName: CMake
         - script: make
           displayName: Build
-        - script: sudo make codesign_osx
-          displayName: Codesign
         - script: |
             set -ex
             otool -L ./bin/hl