Merge PR #9891: [CI] Build CoqIDE for macOS on Azure

Reviewed-by: SkySkimmer
Reviewed-by: ejgallego
Ack-by: ppedrot
Ack-by: vbgl

4 files changed, 46 insertions, 21 deletions

diff --git a/Makefile.ide b/Makefile.ide
index 908f5f6648..8f9088a04a 100644
--- a/Makefile.ide
+++ b/Makefile.ide
@@ -66,7 +66,7 @@ IDEFILES=$(wildcard ide/*.lang) ide/coq_style.xml ide/coq.png ide/MacOS/default_
 GTKSHARE=$(shell pkg-config --variable=prefix gtk+-3.0)/share
 GTKBIN=$(shell pkg-config --variable=prefix gtk+-3.0)/bin
 GTKLIBS=$(shell pkg-config --variable=libdir gtk+-3.0)
-PIXBUFBIN=$(shell pkg-config --variable=prefix gdk-pixbuf-3.0)/bin
+PIXBUFBIN=$(shell pkg-config --variable=prefix gdk-pixbuf-2.0)/bin
 SOURCEVIEWSHARE=$(shell pkg-config --variable=prefix gtksourceview-3.0)/share
 
 ###########################################################################
@@ -244,15 +244,15 @@ $(COQIDEAPP)/Contents:
 $(COQIDEINAPP): ide/macos_prehook.cmx $(LINKIDEOPT) | $(COQIDEAPP)/Contents
 	$(SHOW)'OCAMLOPT -o $@'
 	$(HIDE)$(OCAMLOPT) $(COQIDEFLAGS) $(OPTFLAGS) -o $@ \
-	        -linkpkg -package str,unix,dynlink,threads,lablgtk3.sourceview3 $(IDEFLAGS:.cma=.cmxa) $^
+	        -linkpkg -package str,unix,dynlink,threads,lablgtk3-sourceview3 $(IDEFLAGS:.cma=.cmxa) $^
 	$(STRIP_HIDE) $@
 
 $(COQIDEAPP)/Contents/Resources/share: $(COQIDEAPP)/Contents
 	$(MKDIR) $@/coq/
 	$(INSTALLLIB) ide/coq.png ide/*.lang ide/coq_style.xml $(IDEBINDINGS) $@/coq/
-	$(MKDIR) $@/gtksourceview-2.0/{language-specs,styles}
-	$(INSTALLLIB) "$(SOURCEVIEWSHARE)/"gtksourceview-2.0/language-specs/{def.lang,language2.rng} $@/gtksourceview-2.0/language-specs/
-	$(INSTALLLIB) "$(SOURCEVIEWSHARE)/"gtksourceview-2.0/styles/{styles.rng,classic.xml} $@/gtksourceview-2.0/styles/
+	$(MKDIR) $@/gtksourceview-3.0/{language-specs,styles}
+	$(INSTALLLIB) "$(SOURCEVIEWSHARE)/"gtksourceview-3.0/language-specs/{def.lang,language2.rng} $@/gtksourceview-3.0/language-specs/
+	$(INSTALLLIB) "$(SOURCEVIEWSHARE)/"gtksourceview-3.0/styles/{styles.rng,classic.xml} $@/gtksourceview-3.0/styles/
 	cp -R "$(GTKSHARE)/"locale $@
 	cp -R "$(GTKSHARE)/"themes $@
 
@@ -262,20 +262,20 @@ $(COQIDEAPP)/Contents/Resources/loaders: $(COQIDEAPP)/Contents
 
 $(COQIDEAPP)/Contents/Resources/immodules: $(COQIDEAPP)/Contents
 	$(MKDIR) $@
-	$(INSTALLLIB) "$(GTKLIBS)/gtk-2.0/2.10.0/immodules/"*.so $@
+	$(INSTALLLIB) "$(GTKLIBS)/gtk-3.0/3.0.0/immodules/"*.so $@
 
 
 $(COQIDEAPP)/Contents/Resources/etc: $(COQIDEAPP)/Contents/Resources/lib
 	$(MKDIR) $@/xdg/coq
 	$(INSTALLLIB) ide/MacOS/default_accel_map $@/xdg/coq/coqide.keys
-	$(MKDIR) $@/gtk-2.0
+	$(MKDIR) $@/gtk-3.0
 	{ "$(PIXBUFBIN)/gdk-pixbuf-query-loaders" $@/../loaders/*.so |\
 	 sed -e "s!/.*\(/loaders/.*.so\)!@executable_path/../Resources/\1!"; } \
-	> $@/gtk-2.0/gdk-pixbuf.loaders
-	{ "$(GTKBIN)/gtk-query-immodules-2.0" $@/../immodules/*.so |\
+	> $@/gtk-3.0/gdk-pixbuf.loaders
+	{ "$(GTKBIN)/gtk-query-immodules-3.0" $@/../immodules/*.so |\
 	 sed -e "s!/.*\(/immodules/.*.so\)!@executable_path/../Resources/\1!" |\
 	 sed -e "s!/.*\(/share/locale\)!@executable_path/../Resources/\1!"; } \
-	> $@/gtk-2.0/gtk-immodules.loaders
+	> $@/gtk-3.0/gtk-immodules.loaders
 	$(MKDIR) $@/pango
 	echo "[Pango]" > $@/pango/pangorc
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a8b42cc722..6fcc64f77e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -42,6 +42,9 @@ jobs:
   pool:
     vmImage: 'macOS-10.13'
 
+  variables:
+    MACOSX_DEPLOYMENT_TARGET: '10.12'
+
   steps:
   - checkout: self
     fetchDepth: 10
@@ -49,16 +52,20 @@ jobs:
   - script: |
       set -e
       brew update
-      brew unlink python
-      brew install gnu-time opam
+      brew install gnu-time opam pkg-config gtksourceview3
+      pip3 install macpack
+    displayName: 'Install system dependencies'
 
+  - script: |
+      set -e
+      export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
       opam init -a -j "$NJOBS" --compiler=$COMPILER
       opam switch set $COMPILER
       eval $(opam env)
       opam update
-      opam install -j "$NJOBS" num ocamlfind${FINDLIB_VER} ounit
+      opam install -j "$NJOBS" num ocamlfind${FINDLIB_VER} ounit lablgtk3-sourceview3
       opam list
-    displayName: 'Install dependencies'
+    displayName: 'Install OCaml dependencies'
     env:
       COMPILER: "4.07.1"
       FINDLIB_VER: ".1.8.0"
@@ -68,11 +75,30 @@ jobs:
       set -e
 
       eval $(opam env)
-      ./configure -local -warn-error yes -native-compiler no
+      ./configure -prefix '$(Build.BinariesDirectory)' -warn-error yes -native-compiler no -coqide opt
       make -j "$NJOBS"
     displayName: 'Build Coq'
 
   - script: |
       eval $(opam env)
-      make -j "$NJOBS" test-suite
+      make -j "$NJOBS" test-suite PRINT_LOGS=1
     displayName: 'Run Coq Test Suite'
+
+  - script: |
+      make install
+    displayName: 'Install Coq'
+
+  - script: |
+      set -e
+      eval $(opam env)
+      export PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
+      ./dev/build/osx/make-macos-dmg.sh
+      mv _build/*.dmg "$(Build.ArtifactStagingDirectory)/"
+    displayName: 'Create the dmg bundle'
+    env:
+      OUTDIR: '$(Build.BinariesDirectory)'
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+      pathtoPublish: '$(Build.ArtifactStagingDirectory)'
+      artifactName: coq-macOS-installer
diff --git a/dev/build/osx/make-macos-dmg.sh b/dev/build/osx/make-macos-dmg.sh
index c450e8157a..3a096fec06 100755
--- a/dev/build/osx/make-macos-dmg.sh
+++ b/dev/build/osx/make-macos-dmg.sh
@@ -4,7 +4,6 @@
 set -e
 
 # Configuration setup
-OUTDIR=$PWD/_install
 DMGDIR=$PWD/_dmg
 VERSION=$(sed -n -e '/^let coq_version/ s/^[^"]*"\([^"]*\)"$/\1/p' configure.ml)
 APP=bin/CoqIDE_${VERSION}.app
@@ -13,7 +12,7 @@ APP=bin/CoqIDE_${VERSION}.app
 make PRIVATEBINARIES="$APP" -j "$NJOBS" -l2 "$APP"
 
 # Add Coq to the .app file
-make OLDROOT="$OUTDIR" COQINSTALLPREFIX="$APP/Contents/Resources/" install-coq install-ide-toploop
+make OLDROOT="$OUTDIR" COQINSTALLPREFIX="$APP/Contents/Resources" install-coq install-ide-toploop
 
 # Create the dmg bundle
 mkdir -p "$DMGDIR"
diff --git a/ide/macos_prehook.ml b/ide/macos_prehook.ml
index d668788954..dc8fd0e85d 100644
--- a/ide/macos_prehook.ml
+++ b/ide/macos_prehook.ml
@@ -24,13 +24,13 @@ let () = Unix.putenv "GTK_DATA_PREFIX" resources_dir
 let () = Unix.putenv "GTK_EXE_PREFIX" resources_dir
 let () = Unix.putenv "GTK_PATH" resources_dir
 let () =
-  Unix.putenv "GTK2_RC_FILES" (Filename.concat etc_dir "gtk-2.0/gtkrc")
+  Unix.putenv "GTK3_RC_FILES" (Filename.concat etc_dir "gtk-3.0/gtkrc")
 let () =
   Unix.putenv "GTK_IM_MODULE_FILE"
-   (Filename.concat etc_dir "gtk-2.0/gtk-immodules.loaders")
+   (Filename.concat etc_dir "gtk-3.0/gtk-immodules.loaders")
 let () =
   Unix.putenv "GDK_PIXBUF_MODULE_FILE"
-   (Filename.concat etc_dir "gtk-2.0/gdk-pixbuf.loaders")
+   (Filename.concat etc_dir "gtk-3.0/gdk-pixbuf.loaders")
 let () = Unix.putenv "PANGO_LIBDIR" lib_dir
 let () = Unix.putenv "PANGO_SYSCONFIGDIR" etc_dir
 let () = Unix.putenv "CHARSETALIASDIR" lib_dir