From bb02de806e813b4c9a5b61861fc4f44536f7a856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B5ivo=20Leedj=C3=A4rv?= <69477666+tleedjarv@users.noreply.github.com> Date: Wed, 14 Jul 2021 20:38:12 +0200 Subject: [PATCH] uigtk2 -> uigtk3 --- .github/workflows/CICD.yml | 4 ++-- src/.depend | 18 +++++++++--------- src/Makefile.OCaml | 20 ++++++++++---------- src/dune | 8 ++++---- src/{linkgtk2.ml => linkgtk3.ml} | 4 ++-- src/{uigtk2.ml => uigtk3.ml} | 2 +- src/{uigtk2.mli => uigtk3.mli} | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) rename src/{linkgtk2.ml => linkgtk3.ml} (88%) rename src/{uigtk2.ml => uigtk3.ml} (99%) rename src/{uigtk2.mli => uigtk3.mli} (67%) diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml index 11db0d752..339afa0a5 100644 --- a/.github/workflows/CICD.yml +++ b/.github/workflows/CICD.yml @@ -153,11 +153,11 @@ jobs: - if: steps.vars.outputs.STATIC != 'true' ## unable to build static gtk for linux or windows/Cygwin MinGW platforms shell: bash run: | - opam exec -- make src OSTYPE=$OSTYPE UISTYLE=gtk2 STATIC=${{ steps.vars.outputs.STATIC }} + opam exec -- make src OSTYPE=$OSTYPE UISTYLE=gtk3 STATIC=${{ steps.vars.outputs.STATIC }} # stage # * copy only main/first project binary project_exe_stem=${PROJECT_EXES%% *} - 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 }}" + 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 }}" - uses: actions/upload-artifact@v2 with: diff --git a/src/.depend b/src/.depend index dd6781641..1688a3db9 100644 --- a/src/.depend +++ b/src/.depend @@ -503,11 +503,11 @@ globals.cmi : \ path.cmi \ lwt/lwt.cmi \ common.cmi -linkgtk2.cmo : \ - uigtk2.cmi \ +linkgtk3.cmo : \ + uigtk3.cmi \ main.cmo -linkgtk2.cmx : \ - uigtk2.cmx \ +linkgtk3.cmx : \ + uigtk3.cmx \ main.cmx linktext.cmo : \ uitext.cmi \ @@ -1196,7 +1196,7 @@ uicommon.cmi : \ path.cmi \ lwt/lwt.cmi \ common.cmi -uigtk2.cmo : \ +uigtk3.cmo : \ uutil.cmi \ ubase/util.cmi \ update.cmi \ @@ -1222,8 +1222,8 @@ uigtk2.cmo : \ common.cmi \ clroot.cmi \ case.cmi \ - uigtk2.cmi -uigtk2.cmx : \ + uigtk3.cmi +uigtk3.cmx : \ uutil.cmx \ ubase/util.cmx \ update.cmx \ @@ -1249,8 +1249,8 @@ uigtk2.cmx : \ common.cmx \ clroot.cmx \ case.cmx \ - uigtk2.cmi -uigtk2.cmi : \ + uigtk3.cmi +uigtk3.cmi : \ uicommon.cmi uimacbridge.cmo : \ xferhint.cmi \ diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml index 0c0186177..b62996e44 100644 --- a/src/Makefile.OCaml +++ b/src/Makefile.OCaml @@ -69,23 +69,23 @@ OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | tr '\\' '/' | tr - # User interface style: # Legal values are # UISTYLE=text -# UISTYLE=gtk2 +# UISTYLE=gtk3 # UISTYLE=mac # # This should be set to an appropriate value automatically, depending # on whether the lablgtk library is available -LABLGTK2LIB=$(OCAMLLIBDIR)/lablgtk3 +LABLGTK3LIB=$(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 ifeq ($(OSARCH),osx) UISTYLE=mac else - ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) - UISTYLE=gtk2 + ifeq ($(wildcard $(LABLGTK3LIB)),$(LABLGTK3LIB)) + UISTYLE=gtk3 else - LABLGTK2LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk3) - ifeq ($(wildcard $(LABLGTK2LIB)),$(LABLGTK2LIB)) - UISTYLE=gtk2 + LABLGTK3LIB=$(abspath $(OCAMLLIBDIR)/../lablgtk3) + ifeq ($(wildcard $(LABLGTK3LIB)),$(LABLGTK3LIB)) + UISTYLE=gtk3 else UISTYLE=text endif @@ -260,16 +260,16 @@ endif # CFLAGS+=-cclib /subsystem:windows # endif -# Gtk2 GUI +# Gtk3 GUI OCAMLFIND := $(shell command -v ocamlfind 2> /dev/null) -ifeq ($(UISTYLE), gtk2) +ifeq ($(UISTYLE), gtk3) ifndef OCAMLFIND CAMLFLAGS+=-I +lablgtk3 else CAMLFLAGS+=$(shell $(OCAMLFIND) query -i-format lablgtk3 ) endif - OCAMLOBJS+=pixmaps.cmo uigtk2.cmo linkgtk2.cmo + OCAMLOBJS+=pixmaps.cmo uigtk3.cmo linkgtk3.cmo OCAMLLIBS+=lablgtk3.cma endif diff --git a/src/dune b/src/dune index 7dbc4b4df..f64c34f08 100644 --- a/src/dune +++ b/src/dune @@ -1,7 +1,7 @@ (library (name unison_lib) (wrapped false) - (modules :standard \ linktext linkgtk2 uigtk2 uimacbridge uimacbridgenew test) + (modules :standard \ linktext linkgtk3 uigtk3 uimacbridge uimacbridgenew test) (modules_without_implementation ui) (flags :standard -w -3-6-9-10-26-27-32-34-35-38-39-50-52 @@ -20,8 +20,8 @@ (libraries unison_lib)) (executable - (name linkgtk2) - (public_name unison-gtk2) + (name linkgtk3) + (public_name unison-gtk3) (flags :standard -w -3-6-9-27-32-52) - (modules linkgtk2 uigtk2) + (modules linkgtk3 uigtk3) (libraries threads unison_lib lablgtk3)) diff --git a/src/linkgtk2.ml b/src/linkgtk3.ml similarity index 88% rename from src/linkgtk2.ml rename to src/linkgtk3.ml index ddc889d4c..c527ae44f 100644 --- a/src/linkgtk2.ml +++ b/src/linkgtk3.ml @@ -1,4 +1,4 @@ -(* Unison file synchronizer: src/linkgtk2.ml *) +(* Unison file synchronizer: src/linkgtk3.ml *) (* Copyright 1999-2020, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify @@ -16,4 +16,4 @@ *) -module TopLevel = Main.Body(Uigtk2.Body) +module TopLevel = Main.Body(Uigtk3.Body) diff --git a/src/uigtk2.ml b/src/uigtk3.ml similarity index 99% rename from src/uigtk2.ml rename to src/uigtk3.ml index 9b5354d90..527ec477a 100644 --- a/src/uigtk2.ml +++ b/src/uigtk3.ml @@ -1,4 +1,4 @@ -(* Unison file synchronizer: src/uigtk2.ml *) +(* Unison file synchronizer: src/uigtk3.ml *) (* Copyright 1999-2020, Benjamin C. Pierce This program is free software: you can redistribute it and/or modify diff --git a/src/uigtk2.mli b/src/uigtk3.mli similarity index 67% rename from src/uigtk2.mli rename to src/uigtk3.mli index 4da1eac65..4998e8101 100644 --- a/src/uigtk2.mli +++ b/src/uigtk3.mli @@ -1,4 +1,4 @@ -(* Unison file synchronizer: src/uigtk2.mli *) +(* Unison file synchronizer: src/uigtk3.mli *) (* Copyright 1999-2020, Benjamin C. Pierce (see COPYING for details) *) module Body : Uicommon.UI