Attachment #765685 for bug #769341

Lines 523-532 globals.cmi : \ Link Here

(-)a/src/.depend (-4 lines)
523	path.cmi \	523	path.cmi \
524	lwt/lwt.cmi \	524	lwt/lwt.cmi \
525	common.cmi	525	common.cmi
526	linkgtk.cmo : \
527	main.cmo
528	linkgtk.cmx : \
529	main.cmx
530	linkgtk2.cmo : \	526	linkgtk2.cmo : \
531	uigtk2.cmi \	527	uigtk2.cmi \
532	main.cmo	528	main.cmo




# User interface style:
#   Legal values are
#     UISTYLE=text
#     UISTYLE=gtk
#     UISTYLE=gtk2
#     UISTYLE=mac
#
# This should be set to an appropriate value automatically, depending
# on whether the lablgtk library is available
LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3
##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
## at the moment and we don't want to confuse people by building it by default

  endif
endif

# Gtk GUI
ifeq ($(UISTYLE), gtk)
  CAMLFLAGS+=-I +lablgtk
  OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
  OCAMLLIBS+=lablgtk.cma
endif

# Gtk2 GUI
OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)


Lines 1-7 Link Here

(-)a/src/dune (-1 / +1 lines)
1	(library	1	(library
2	(name unison_lib)	2	(name unison_lib)
3	(wrapped false)	3	(wrapped false)
4	(modules :standard \ linktext linkgtk linkgtk2 uigtk2 uimacbridge uimacbridgenew test)	4	(modules :standard \ linktext linkgtk2 uigtk2 uimacbridge uimacbridgenew test)
5	(modules_without_implementation ui)	5	(modules_without_implementation ui)
6	(flags :standard	6	(flags :standard
7	-w -3-6-9-10-26-27-32-34-35-38-39-50-52	7	-w -3-6-9-10-26-27-32-34-35-38-39-50-52




(* Unison file synchronizer: src/linkgtk.ml *)
(* Copyright 1999-2020, Benjamin C. Pierce

    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
*)


module TopLevel = Main.Body(Uigtk.Body)

Return to bug 769341

Lines 66-78 OCAMLLIBDIR=$(shell ocamlc -v \| tail -1 \| sed -e 's/.* //g' \| tr '\\' '/' \| tr - Link Here

(-)a/src/Makefile.OCaml (-9 lines)
66	# User interface style:	66	# User interface style:
67	# Legal values are	67	# Legal values are
68	# UISTYLE=text	68	# UISTYLE=text
69	# UISTYLE=gtk
70	# UISTYLE=gtk2	69	# UISTYLE=gtk2
71	# UISTYLE=mac	70	# UISTYLE=mac
72	#	71	#
73	# This should be set to an appropriate value automatically, depending	72	# This should be set to an appropriate value automatically, depending
74	# on whether the lablgtk library is available	73	# on whether the lablgtk library is available
75	LABLGTKLIB=$(OCAMLLIBDIR)/lablgtk
76	LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3	74	LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3
77	##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well	75	##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
78	## at the moment and we don't want to confuse people by building it by default	76	## at the moment and we don't want to confuse people by building it by default
Lines 282-294 ifeq ($(OSARCH), win32) Link Here
282	endif	280	endif
283	endif	281	endif
284		282
285	# Gtk GUI
286	ifeq ($(UISTYLE), gtk)
287	CAMLFLAGS+=-I +lablgtk
288	OCAMLOBJS+=pixmaps.cmo uigtk.cmo linkgtk.cmo
289	OCAMLLIBS+=lablgtk.cma
290	endif
291
292	# Gtk2 GUI	283	# Gtk2 GUI
293	OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)	284	OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)
294		285

Lines 1-19 Link Here

(-)a/src/linkgtk.ml (-19 lines)
1	(* Unison file synchronizer: src/linkgtk.ml *)
2	(* Copyright 1999-2020, Benjamin C. Pierce
3
4	This program is free software: you can redistribute it and/or modify
5	it under the terms of the GNU General Public License as published by
6	the Free Software Foundation, either version 3 of the License, or
7	(at your option) any later version.
8
9	This program is distributed in the hope that it will be useful,
10	but WITHOUT ANY WARRANTY; without even the implied warranty of
11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	GNU General Public License for more details.
13
14	You should have received a copy of the GNU General Public License
15	along with this program. If not, see <http://www.gnu.org/licenses/>.
16	*)
17
18
19	module TopLevel = Main.Body(Uigtk.Body)