vcl/CustomTarget_afm_hash.mk | 12 vcl/Library_vcl.mk | 14 vcl/generic/fontmanager/adobe_encoding_table.hxx | 1078 --------- vcl/generic/fontmanager/afm_keyword_list | 62 vcl/generic/fontmanager/fontcache.cxx | 740 ------ vcl/generic/fontmanager/fontconfig.cxx | 1293 ----------- vcl/generic/fontmanager/fontmanager.cxx | 2222 ------------------- vcl/generic/fontmanager/fontsubst.cxx | 252 -- vcl/generic/fontmanager/helper.cxx | 390 --- vcl/generic/fontmanager/parseAFM.cxx | 1466 ------------ vcl/generic/fontmanager/parseAFM.hxx | 323 -- vcl/unx/generic/fontmanager/adobe_encoding_table.hxx | 1078 +++++++++ vcl/unx/generic/fontmanager/afm_keyword_list | 62 vcl/unx/generic/fontmanager/fontcache.cxx | 740 ++++++ vcl/unx/generic/fontmanager/fontconfig.cxx | 1293 +++++++++++ vcl/unx/generic/fontmanager/fontmanager.cxx | 2222 +++++++++++++++++++ vcl/unx/generic/fontmanager/fontsubst.cxx | 252 ++ vcl/unx/generic/fontmanager/helper.cxx | 390 +++ vcl/unx/generic/fontmanager/parseAFM.cxx | 1466 ++++++++++++ vcl/unx/generic/fontmanager/parseAFM.hxx | 323 ++ 20 files changed, 7839 insertions(+), 7839 deletions(-)
New commits: commit cd4c21dea96e98639cc0488526dac142d9fed583 Author: Chris Sherlock <[email protected]> Date: Mon Jan 11 14:32:04 2016 +1100 vcl: move vcl/generic/fontmanager files to vcl/unx/generic/fontmanager These source files as all specific to Unix environments (not, however, OS X) and are not "generic" (i.e. used across all platforms). Change-Id: I23650c86a7b74c2ac150b981e4be88eaea07e936 Reviewed-on: https://gerrit.libreoffice.org/21314 Tested-by: Jenkins <[email protected]> Reviewed-by: Chris Sherlock <[email protected]> diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk index 44b2073..bf88fb9 100644 --- a/vcl/CustomTarget_afm_hash.mk +++ b/vcl/CustomTarget_afm_hash.mk @@ -6,14 +6,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager)) +$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/generic/fontmanager)) -$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : \ - $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp +$(call gb_CustomTarget_get_target,vcl/unx/generic/fontmanager) : \ + $(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/afm_hash.hpp -$(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp : \ - $(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list \ - | $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/.dir +$(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/afm_hash.hpp : \ + $(SRCDIR)/vcl/unx/generic/fontmanager/afm_keyword_list \ + | $(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1) $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e 's/(char\*)0/(char\*)0, NOPE/g' | grep -v '^#line' > $@ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 94ee4c3..65ad25d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -35,7 +35,7 @@ endif $(eval $(call gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl)) -$(eval $(call gb_Library_use_custom_headers,vcl,officecfg/registry vcl/generic/fontmanager)) +$(eval $(call gb_Library_use_custom_headers,vcl,officecfg/registry vcl/unx/generic/fontmanager)) $(eval $(call gb_Library_set_include,vcl,\ $$(INCLUDE) \ @@ -554,12 +554,6 @@ vcl_generic_code= \ vcl/generic/print/genprnpsp \ vcl/generic/print/prtsetup \ vcl/generic/print/text_gfx \ - vcl/generic/fontmanager/fontsubst \ - vcl/generic/fontmanager/fontcache \ - vcl/generic/fontmanager/fontconfig \ - vcl/generic/fontmanager/fontmanager \ - vcl/generic/fontmanager/helper \ - vcl/generic/fontmanager/parseAFM \ vcl_headless_code= \ vcl/headless/svpbmp \ @@ -579,6 +573,12 @@ vcl_headless_freetype_code=\ vcl/unx/generic/glyphs/gcach_layout \ vcl/unx/generic/glyphs/glyphcache \ vcl/unx/generic/glyphs/scrptrun \ + vcl/unx/generic/fontmanager/fontsubst \ + vcl/unx/generic/fontmanager/fontcache \ + vcl/unx/generic/fontmanager/fontconfig \ + vcl/unx/generic/fontmanager/fontmanager \ + vcl/unx/generic/fontmanager/helper \ + vcl/unx/generic/fontmanager/parseAFM \ vcl/headless/svpcairotextrender \ ifeq ($(USING_X11),TRUE) diff --git a/vcl/generic/fontmanager/adobe_encoding_table.hxx b/vcl/unx/generic/fontmanager/adobe_encoding_table.hxx similarity index 100% rename from vcl/generic/fontmanager/adobe_encoding_table.hxx rename to vcl/unx/generic/fontmanager/adobe_encoding_table.hxx diff --git a/vcl/generic/fontmanager/afm_keyword_list b/vcl/unx/generic/fontmanager/afm_keyword_list similarity index 100% rename from vcl/generic/fontmanager/afm_keyword_list rename to vcl/unx/generic/fontmanager/afm_keyword_list diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx similarity index 100% rename from vcl/generic/fontmanager/fontcache.cxx rename to vcl/unx/generic/fontmanager/fontcache.cxx diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx similarity index 100% rename from vcl/generic/fontmanager/fontconfig.cxx rename to vcl/unx/generic/fontmanager/fontconfig.cxx diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx similarity index 100% rename from vcl/generic/fontmanager/fontmanager.cxx rename to vcl/unx/generic/fontmanager/fontmanager.cxx diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx similarity index 100% rename from vcl/generic/fontmanager/fontsubst.cxx rename to vcl/unx/generic/fontmanager/fontsubst.cxx diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx similarity index 100% rename from vcl/generic/fontmanager/helper.cxx rename to vcl/unx/generic/fontmanager/helper.cxx diff --git a/vcl/generic/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx similarity index 100% rename from vcl/generic/fontmanager/parseAFM.cxx rename to vcl/unx/generic/fontmanager/parseAFM.cxx diff --git a/vcl/generic/fontmanager/parseAFM.hxx b/vcl/unx/generic/fontmanager/parseAFM.hxx similarity index 100% rename from vcl/generic/fontmanager/parseAFM.hxx rename to vcl/unx/generic/fontmanager/parseAFM.hxx _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
