Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 769341 | Differences between
and this patch

Collapse All | Expand All

(-)a/.github/workflows/CICD.yml (-2 / +2 lines)
Lines 153-163 jobs: Link Here
153
    - if: steps.vars.outputs.STATIC != 'true' ## unable to build static gtk for linux or windows/Cygwin MinGW platforms
153
    - if: steps.vars.outputs.STATIC != 'true' ## unable to build static gtk for linux or windows/Cygwin MinGW platforms
154
      shell: bash
154
      shell: bash
155
      run: |
155
      run: |
156
        opam exec -- make src OSTYPE=$OSTYPE UISTYLE=gtk2 STATIC=${{ steps.vars.outputs.STATIC }}
156
        opam exec -- make src OSTYPE=$OSTYPE UISTYLE=gtk3 STATIC=${{ steps.vars.outputs.STATIC }}
157
        # stage
157
        # stage
158
        # * copy only main/first project binary
158
        # * copy only main/first project binary
159
        project_exe_stem=${PROJECT_EXES%% *}
159
        project_exe_stem=${PROJECT_EXES%% *}
160
        cp "src/${project_exe_stem}${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/${project_exe_stem}-gtk2${{ steps.vars.outputs.EXE_suffix }}"
160
        cp "src/${project_exe_stem}${{ steps.vars.outputs.EXE_suffix }}" "${{ steps.vars.outputs.PKG_DIR }}/bin/${project_exe_stem}-gtk3${{ steps.vars.outputs.EXE_suffix }}"
161
161
162
    - uses: actions/upload-artifact@v2
162
    - uses: actions/upload-artifact@v2
163
      with:
163
      with:
(-)a/src/.depend (-9 / +9 lines)
Lines 503-513 globals.cmi : \ Link Here
503
    path.cmi \
503
    path.cmi \
504
    lwt/lwt.cmi \
504
    lwt/lwt.cmi \
505
    common.cmi
505
    common.cmi
506
linkgtk2.cmo : \
506
linkgtk3.cmo : \
507
    uigtk2.cmi \
507
    uigtk3.cmi \
508
    main.cmo
508
    main.cmo
509
linkgtk2.cmx : \
509
linkgtk3.cmx : \
510
    uigtk2.cmx \
510
    uigtk3.cmx \
511
    main.cmx
511
    main.cmx
512
linktext.cmo : \
512
linktext.cmo : \
513
    uitext.cmi \
513
    uitext.cmi \
Lines 1196-1202 uicommon.cmi : \ Link Here
1196
    path.cmi \
1196
    path.cmi \
1197
    lwt/lwt.cmi \
1197
    lwt/lwt.cmi \
1198
    common.cmi
1198
    common.cmi
1199
uigtk2.cmo : \
1199
uigtk3.cmo : \
1200
    uutil.cmi \
1200
    uutil.cmi \
1201
    ubase/util.cmi \
1201
    ubase/util.cmi \
1202
    update.cmi \
1202
    update.cmi \
Lines 1222-1229 uigtk2.cmo : \ Link Here
1222
    common.cmi \
1222
    common.cmi \
1223
    clroot.cmi \
1223
    clroot.cmi \
1224
    case.cmi \
1224
    case.cmi \
1225
    uigtk2.cmi
1225
    uigtk3.cmi
1226
uigtk2.cmx : \
1226
uigtk3.cmx : \
1227
    uutil.cmx \
1227
    uutil.cmx \
1228
    ubase/util.cmx \
1228
    ubase/util.cmx \
1229
    update.cmx \
1229
    update.cmx \
Lines 1249-1256 uigtk2.cmx : \ Link Here
1249
    common.cmx \
1249
    common.cmx \
1250
    clroot.cmx \
1250
    clroot.cmx \
1251
    case.cmx \
1251
    case.cmx \
1252
    uigtk2.cmi
1252
    uigtk3.cmi
1253
uigtk2.cmi : \
1253
uigtk3.cmi : \
1254
    uicommon.cmi
1254
    uicommon.cmi
1255
uimacbridge.cmo : \
1255
uimacbridge.cmo : \
1256
    xferhint.cmi \
1256
    xferhint.cmi \
(-)a/src/Makefile.OCaml (-10 / +10 lines)
Lines 69-91 OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | tr '\\' '/' | tr - Link Here
69
# User interface style:
69
# User interface style:
70
#   Legal values are
70
#   Legal values are
71
#     UISTYLE=text
71
#     UISTYLE=text
72
#     UISTYLE=gtk2
72
#     UISTYLE=gtk3
73
#     UISTYLE=mac
73
#     UISTYLE=mac
74
#
74
#
75
# This should be set to an appropriate value automatically, depending
75
# This should be set to an appropriate value automatically, depending
76
# on whether the lablgtk library is available
76
# on whether the lablgtk library is available
77
LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3
77
LABLGTK3LIB=$(OCAMLLIBDIR)/lablgtk3
78
##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
78
##BCP [3/2007]: Removed temporarily, since the OSX UI is not working well
79
## at the moment and we don't want to confuse people by building it by default
79
## at the moment and we don't want to confuse people by building it by default
80
ifeq ($(OSARCH),osx)
80
ifeq ($(OSARCH),osx)
81
  UISTYLE=mac
81
  UISTYLE=mac
82
else
82
else
83
  ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB))
83
  ifeq ($(wildcard $(LABLGTK3LIB)),$(LABLGTK3LIB))
84
    UISTYLE=gtk2
84
    UISTYLE=gtk3
85
  else
85
  else
86
    LABLGTK2LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk3)
86
    LABLGTK3LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk3)
87
    ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB))
87
    ifeq ($(wildcard $(LABLGTK3LIB)),$(LABLGTK3LIB))
88
      UISTYLE=gtk2
88
      UISTYLE=gtk3
89
    else
89
    else
90
      UISTYLE=text
90
      UISTYLE=text
91
    endif
91
    endif
Lines 260-275 endif Link Here
260
#    CFLAGS+=-cclib /subsystem:windows
260
#    CFLAGS+=-cclib /subsystem:windows
261
#  endif
261
#  endif
262
262
263
# Gtk2 GUI
263
# Gtk3 GUI
264
OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)
264
OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null)
265
265
266
ifeq ($(UISTYLE), gtk2)
266
ifeq ($(UISTYLE), gtk3)
267
  ifndef OCAMLFIND
267
  ifndef OCAMLFIND
268
    CAMLFLAGS+=-I +lablgtk3
268
    CAMLFLAGS+=-I +lablgtk3
269
  else
269
  else
270
    CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk3 )
270
    CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk3 )
271
  endif
271
  endif
272
  OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo
272
  OCAMLOBJS+=pixmaps.cmo uigtk3.cmo linkgtk3.cmo
273
  OCAMLLIBS+=lablgtk3.cma
273
  OCAMLLIBS+=lablgtk3.cma
274
endif
274
endif
275
275
(-)a/src/dune (-4 / +4 lines)
Lines 1-7 Link Here
1
(library
1
(library
2
 (name unison_lib)
2
 (name unison_lib)
3
 (wrapped false)
3
 (wrapped false)
4
 (modules :standard \ linktext linkgtk2 uigtk2 uimacbridge uimacbridgenew test)
4
 (modules :standard \ linktext linkgtk3 uigtk3 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
Lines 20-27 Link Here
20
 (libraries unison_lib))
20
 (libraries unison_lib))
21
21
22
(executable
22
(executable
23
 (name linkgtk2)
23
 (name linkgtk3)
24
 (public_name unison-gtk2)
24
 (public_name unison-gtk3)
25
 (flags :standard -w -3-6-9-27-32-52)
25
 (flags :standard -w -3-6-9-27-32-52)
26
 (modules linkgtk2 uigtk2)
26
 (modules linkgtk3 uigtk3)
27
 (libraries threads unison_lib lablgtk3))
27
 (libraries threads unison_lib lablgtk3))
(-)a/src/linkgtk2.ml (-2 / +2 lines)
Lines 1-4 Link Here
1
(* Unison file synchronizer: src/linkgtk2.ml *)
1
(* Unison file synchronizer: src/linkgtk3.ml *)
2
(* Copyright 1999-2020, Benjamin C. Pierce
2
(* Copyright 1999-2020, Benjamin C. Pierce
3
3
4
    This program is free software: you can redistribute it and/or modify
4
    This program is free software: you can redistribute it and/or modify
Lines 16-19 Link Here
16
*)
16
*)
17
17
18
18
19
module TopLevel = Main.Body(Uigtk2.Body)
19
module TopLevel = Main.Body(Uigtk3.Body)
(-)a/src/uigtk2.ml (-1 / +1 lines)
Lines 1-4 Link Here
1
(* Unison file synchronizer: src/uigtk2.ml *)
1
(* Unison file synchronizer: src/uigtk3.ml *)
2
(* Copyright 1999-2020, Benjamin C. Pierce
2
(* Copyright 1999-2020, Benjamin C. Pierce
3
3
4
    This program is free software: you can redistribute it and/or modify
4
    This program is free software: you can redistribute it and/or modify
(-)a/src/uigtk2.mli (-1 / +1 lines)
Lines 1-4 Link Here
1
(* Unison file synchronizer: src/uigtk2.mli *)
1
(* Unison file synchronizer: src/uigtk3.mli *)
2
(* Copyright 1999-2020, Benjamin C. Pierce (see COPYING for details) *)
2
(* Copyright 1999-2020, Benjamin C. Pierce (see COPYING for details) *)
3
3
4
module Body : Uicommon.UI
4
module Body : Uicommon.UI

Return to bug 769341