Repository.mk | 1 +
static/CustomTarget_wasm-qt5-mandelbrot_moc.mk | 18 +++++++++---------
static/Executable_wasm-qt5-mandelbrot.mk | 8 ++++----
static/Module_static.mk | 2 ++
wasm-qt/Makefile | 13 -------------
wasm-qt/Module_wasm-qt.mk | 20 --------------------
6 files changed, 16 insertions(+), 46 deletions(-)
New commits:
commit 49ebfdd9b7cf9c5363e3e06765b3fae284ab0379
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sun Jan 9 02:15:12 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed Jan 19 20:18:29 2022 +0100
WASM merge wasm-qt into static module
Change-Id: I1ed26685561fd79d26cc0844faa3dfe4c00d439a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128625
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/Repository.mk b/Repository.mk
index 6b88ec6cfc2a..4cf3aa6d3f48 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
visualbackendtest \
listfonts \
$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))),
gtktiledviewer) \
+ $(if $(filter EMSCRIPTEN,$(OS)),wasm-qt5-mandelbrot) \
))
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
diff --git a/wasm-qt/CustomTarget_wasm-qt5-mandelbrot_moc.mk
b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
similarity index 64%
rename from wasm-qt/CustomTarget_wasm-qt5-mandelbrot_moc.mk
rename to static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
index 6267db3f5b8d..d3da8235c5f9 100644
--- a/wasm-qt/CustomTarget_wasm-qt5-mandelbrot_moc.mk
+++ b/static/CustomTarget_wasm-qt5-mandelbrot_moc.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_CustomTarget_CustomTarget,wasm-qt/qt5-mandelbrot))
+$(eval $(call gb_CustomTarget_CustomTarget,static/qt5-mandelbrot))
-$(call gb_CustomTarget_get_target,wasm-qt/qt5-mandelbrot) : \
- $(call
gb_CustomTarget_get_workdir,wasm-qt/qt5-mandelbrot)/renderthread.moc \
- $(call
gb_CustomTarget_get_workdir,wasm-qt/qt5-mandelbrot)/mandelbrotwidget.moc \
+$(call gb_CustomTarget_get_target,static/qt5-mandelbrot) : \
+ $(call
gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/renderthread.moc \
+ $(call
gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/mandelbrotwidget.moc \
-qt5_mandelbrot_MOCDEFS_H := $(call
gb_CustomTarget_get_workdir,wasm-qt/qt5-mandelbrot)/moc_predefs.h
-qt5_mandelbrot_MOCDEFS_CXX := $(call
gb_CustomTarget_get_workdir,wasm-qt/qt5-mandelbrot)/moc_dummy.cxx
-qt5_mandelbrot_WORKDIR := $(call
gb_CustomTarget_get_workdir,wasm-qt/qt5-mandelbrot)/.dir
+qt5_mandelbrot_MOCDEFS_H := $(call
gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/moc_predefs.h
+qt5_mandelbrot_MOCDEFS_CXX := $(call
gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/moc_dummy.cxx
+qt5_mandelbrot_WORKDIR := $(call
gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/.dir
$(qt5_mandelbrot_MOCDEFS_CXX): | $(qt5_mandelbrot_WORKDIR)
touch $@
@@ -26,8 +26,8 @@ $(qt5_mandelbrot_MOCDEFS_H): $(qt5_mandelbrot_MOCDEFS_CXX) |
$(qt5_mandelbrot_WO
$(CXX) -pipe -O2 -std=gnu++11 -fno-exceptions $(gb_EMSCRIPTEN_CPPFLAGS)
-dM -E -o $@ $<
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MOC)
-$(call gb_CustomTarget_get_workdir,wasm-qt/qt5-mandelbrot)/%.moc : \
- $(SRCDIR)/wasm-qt/source/qt5-mandelbrot/%.h \
+$(call gb_CustomTarget_get_workdir,static/qt5-mandelbrot)/%.moc : \
+ $(SRCDIR)/static/source/qt5-mandelbrot/%.h \
$(qt5_mandelbrot_MOCDEFS_H) | $(qt5_mandelbrot_WORKDIR)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
diff --git a/wasm-qt/Executable_wasm-qt5-mandelbrot.mk
b/static/Executable_wasm-qt5-mandelbrot.mk
similarity index 81%
rename from wasm-qt/Executable_wasm-qt5-mandelbrot.mk
rename to static/Executable_wasm-qt5-mandelbrot.mk
index 040fad441219..e7eac989110e 100644
--- a/wasm-qt/Executable_wasm-qt5-mandelbrot.mk
+++ b/static/Executable_wasm-qt5-mandelbrot.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Executable_Executable,wasm-qt5-mandelbrot))
-$(eval $(call
gb_Executable_use_custom_headers,wasm-qt5-mandelbrot,wasm-qt/qt5-mandelbrot))
+$(eval $(call
gb_Executable_use_custom_headers,wasm-qt5-mandelbrot,static/qt5-mandelbrot))
$(eval $(call gb_Executable_use_externals,wasm-qt5-mandelbrot,\
graphite \
@@ -20,9 +20,9 @@ $(eval $(call
gb_Executable_use_externals,wasm-qt5-mandelbrot,\
))
$(eval $(call gb_Executable_add_exception_objects,wasm-qt5-mandelbrot,\
- wasm-qt/source/qt5-mandelbrot/main \
- wasm-qt/source/qt5-mandelbrot/mandelbrotwidget \
- wasm-qt/source/qt5-mandelbrot/renderthread \
+ static/source/qt5-mandelbrot/main \
+ static/source/qt5-mandelbrot/mandelbrotwidget \
+ static/source/qt5-mandelbrot/renderthread \
))
$(eval $(call gb_Executable_add_defs,wasm-qt5-mandelbrot,\
diff --git a/static/Module_static.mk b/static/Module_static.mk
index 3c323d6c0e7c..a21b2355741b 100644
--- a/static/Module_static.mk
+++ b/static/Module_static.mk
@@ -18,6 +18,8 @@ $(eval $(call gb_Module_add_targets,static,\
ifeq (EMSCRIPTEN,$(OS))
$(eval $(call gb_Module_add_targets,static,\
CustomTarget_emscripten_fs_image \
+ CustomTarget_wasm-qt5-mandelbrot_moc \
+ Executable_wasm-qt5-mandelbrot \
))
endif
diff --git a/wasm-qt/README.md b/static/README.wasm.md
similarity index 100%
rename from wasm-qt/README.md
rename to static/README.wasm.md
diff --git a/wasm-qt/source/qt5-mandelbrot/main.cxx
b/static/source/qt5-mandelbrot/main.cxx
similarity index 100%
rename from wasm-qt/source/qt5-mandelbrot/main.cxx
rename to static/source/qt5-mandelbrot/main.cxx
diff --git a/wasm-qt/source/qt5-mandelbrot/mandelbrotwidget.cxx
b/static/source/qt5-mandelbrot/mandelbrotwidget.cxx
similarity index 100%
rename from wasm-qt/source/qt5-mandelbrot/mandelbrotwidget.cxx
rename to static/source/qt5-mandelbrot/mandelbrotwidget.cxx
diff --git a/wasm-qt/source/qt5-mandelbrot/mandelbrotwidget.h
b/static/source/qt5-mandelbrot/mandelbrotwidget.h
similarity index 100%
rename from wasm-qt/source/qt5-mandelbrot/mandelbrotwidget.h
rename to static/source/qt5-mandelbrot/mandelbrotwidget.h
diff --git a/wasm-qt/source/qt5-mandelbrot/renderthread.cxx
b/static/source/qt5-mandelbrot/renderthread.cxx
similarity index 100%
rename from wasm-qt/source/qt5-mandelbrot/renderthread.cxx
rename to static/source/qt5-mandelbrot/renderthread.cxx
diff --git a/wasm-qt/source/qt5-mandelbrot/renderthread.h
b/static/source/qt5-mandelbrot/renderthread.h
similarity index 100%
rename from wasm-qt/source/qt5-mandelbrot/renderthread.h
rename to static/source/qt5-mandelbrot/renderthread.h
diff --git a/wasm-qt/Makefile b/wasm-qt/Makefile
deleted file mode 100644
index 0c6f47b1790f..000000000000
--- a/wasm-qt/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/wasm-qt/Module_wasm-qt.mk b/wasm-qt/Module_wasm-qt.mk
deleted file mode 100644
index 8e86df4e8baa..000000000000
--- a/wasm-qt/Module_wasm-qt.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_Module_Module,wasm-qt))
-
-ifeq ($(OS),EMSCRIPTEN)
-
-$(eval $(call gb_Module_add_targets,wasm-qt,\
- CustomTarget_wasm-qt5-mandelbrot_moc \
- Executable_wasm-qt5-mandelbrot \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
