diff options
| author | Michael Soegtrop | 2021-01-13 21:36:07 +0100 |
|---|---|---|
| committer | Michael Soegtrop | 2021-01-13 21:36:07 +0100 |
| commit | b8a3ebaa9695596f062298f5913ae4f4debb0124 (patch) | |
| tree | 072e700bdb5b5470ac2b9e40b19b0717b646812d | |
| parent | 223843c2cda13c9646c123dc19b4af1983d88561 (diff) | |
| parent | d784ac437a3924324f88f1e06e398d326f847ab4 (diff) | |
Merge PR #13740: [osx] macpack also coqidetop (for libgmp)
Reviewed-by: MSoegtropIMC
| -rw-r--r-- | Makefile.ide | 5 | ||||
| -rwxr-xr-x | dev/build/osx/make-macos-dmg.sh | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.ide b/Makefile.ide index 54bf0b6a4e..6e3713c7bf 100644 --- a/Makefile.ide +++ b/Makefile.ide @@ -233,7 +233,6 @@ install-ide-info: .PHONY: $(COQIDEAPP)/Contents $(COQIDEAPP)/Contents: - rm -rdf $@ $(MKDIR) $@ sed -e "s/VERSION/$(VERSION4MACOS)/g" ide/coqide/MacOS/Info.plist.template > $@/Info.plist $(MKDIR) "$@/MacOS" @@ -282,6 +281,10 @@ $(COQIDEAPP)/Contents/Resources/etc: $(COQIDEAPP)/Contents/Resources/lib $(COQIDEAPP)/Contents/Resources/lib: $(COQIDEAPP)/Contents/Resources/immodules $(COQIDEAPP)/Contents/Resources/loaders $(COQIDEAPP)/Contents $(COQIDEINAPP) $(MKDIR) $@ macpack -d ../Resources/lib $(COQIDEINAPP) + for i in $@/../bin/*; \ + do \ + macpack -d ../lib $$i; \ + done for i in $@/../loaders/*.so $@/../immodules/*.{dylib,so}; \ do \ macpack -d ../lib $$i; \ diff --git a/dev/build/osx/make-macos-dmg.sh b/dev/build/osx/make-macos-dmg.sh index 35d0379008..2550cbb31c 100755 --- a/dev/build/osx/make-macos-dmg.sh +++ b/dev/build/osx/make-macos-dmg.sh @@ -8,12 +8,12 @@ DMGDIR=$PWD/_dmg VERSION=$(sed -n -e '/^let coq_version/ s/^[^"]*"\([^"]*\)"$/\1/p' configure.ml) APP=bin/CoqIDE_${VERSION}.app -# Create a .app file with CoqIDE, without signing it -make PRIVATEBINARIES="$APP" -j "$NJOBS" -l2 "$APP" - -# Add Coq to the .app file +# Install Coq into the .app file make OLDROOT="$OUTDIR" COQINSTALLPREFIX="$APP/Contents/Resources" install-coq install-ide-toploop +# Fill .app file with metadata and other .app specific stuff (like non-system .so) +make PRIVATEBINARIES="$APP" -j 1 -l2 "$APP" VERBOSE=1 + # Create the dmg bundle mkdir -p "$DMGDIR" ln -sf /Applications "$DMGDIR/Applications" |