From 722862c974145f12dad2f31ffe3b19ba238b59b5 Mon Sep 17 00:00:00 2001 From: liuwenfeng Date: Wed, 23 Oct 2024 21:09:25 +0800 Subject: [PATCH] fix letter page size and adjust bsuni path Signed-off-by: liuwenfeng --- .../print_models/src/print_page_size.cpp | 2 +- print.gni | 6 ++++ services/print_service/bsuni/BUILD.gn | 35 +++++++++---------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/frameworks/models/print_models/src/print_page_size.cpp b/frameworks/models/print_models/src/print_page_size.cpp index 468ea3e..344f046 100644 --- a/frameworks/models/print_models/src/print_page_size.cpp +++ b/frameworks/models/print_models/src/print_page_size.cpp @@ -49,7 +49,7 @@ const uint32_t ISO_DL_WIDTH = 4330; const uint32_t ISO_DL_HEIGHT = 8660; const uint32_t LEGAL_WIDTH = 8500; const uint32_t LEGAL_HEIGHT = 14000; -const uint32_t LETTER_WIDTH = 8000; +const uint32_t LETTER_WIDTH = 8500; const uint32_t LETTER_HEIGHT = 11000; const uint32_t ROC_16K_WIDTH = 7677; const uint32_t ROC_16K_HEIGHT = 10629; diff --git a/print.gni b/print.gni index ecd709c..6baa997 100644 --- a/print.gni +++ b/print.gni @@ -24,6 +24,12 @@ bsuni_gslib_path = bsuni_gsres_path = "${bsuni_binary_path}/ghostscript/share/ghostscript/10.04.0/Resource" +bsuni_binary_install_path = "bin/uni_print_driver" +bsuni_gsbin_install_path = "${bsuni_binary_install_path}/ghostscript/bin" +bsuni_gslib_install_path = + "${bsuni_binary_install_path}/ghostscript/share/ghostscript/10.04.0/lib" +bsuni_gsres_install_path = "${bsuni_binary_install_path}/ghostscript/share/ghostscript/10.04.0/Resource" + if (!defined(global_parts_info) || defined(global_parts_info.security_security_guard)) { security_guard_enabled = true diff --git a/services/print_service/bsuni/BUILD.gn b/services/print_service/bsuni/BUILD.gn index 49e38d7..dc6fc39 100755 --- a/services/print_service/bsuni/BUILD.gn +++ b/services/print_service/bsuni/BUILD.gn @@ -19,7 +19,7 @@ if (print_fwk_feature_bsuni_driver) { source = "${bsuni_binary_path}/lib64/libbsUniDiscovery.so" part_name = "print_fwk" subsystem_name = "print" - module_install_dir = "bin/uni_print_driver/lib64" + module_install_dir = "${bsuni_binary_install_path}/lib64" install_enable = true } @@ -27,7 +27,7 @@ if (print_fwk_feature_bsuni_driver) { source = "${bsuni_binary_path}/filter/bsUniFilter" part_name = "print_fwk" subsystem_name = "print" - module_install_dir = "bin/uni_print_driver/filter" + module_install_dir = "${bsuni_binary_install_path}/filter" install_enable = true } @@ -35,7 +35,7 @@ if (print_fwk_feature_bsuni_driver) { source = "${bsuni_binary_path}/backend/lpd" part_name = "print_fwk" subsystem_name = "print" - module_install_dir = "bin/uni_print_driver/backend" + module_install_dir = "${bsuni_binary_install_path}/backend" install_enable = true } @@ -43,7 +43,7 @@ if (print_fwk_feature_bsuni_driver) { source = "${bsuni_binary_path}/backend/socket" part_name = "print_fwk" subsystem_name = "print" - module_install_dir = "bin/uni_print_driver/backend" + module_install_dir = "${bsuni_binary_install_path}/backend" install_enable = true } @@ -51,7 +51,7 @@ if (print_fwk_feature_bsuni_driver) { source = "${bsuni_binary_path}/backend/bsUniBackend" part_name = "print_fwk" subsystem_name = "print" - module_install_dir = "bin/uni_print_driver/backend" + module_install_dir = "${bsuni_binary_install_path}/backend" install_enable = true } @@ -91,7 +91,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/bin" + module_install_dir = "${bsuni_gsbin_install_path}" install_enable = true } @@ -236,8 +236,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = - "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/lib" + module_install_dir = "${bsuni_gslib_install_path}" install_enable = true } @@ -250,7 +249,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/CIDFSubst" + module_install_dir = "${bsuni_gsres_install_path}/CIDFSubst" install_enable = true } @@ -263,7 +262,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/CIDFont" + module_install_dir = "${bsuni_gsres_install_path}/CIDFont" install_enable = true } @@ -458,7 +457,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/CMap" + module_install_dir = "${bsuni_gsres_install_path}/CMap" install_enable = true } @@ -478,7 +477,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/ColorSpace" + module_install_dir = "${bsuni_gsres_install_path}/ColorSpace" install_enable = true } @@ -499,7 +498,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/Decoding" + module_install_dir = "${bsuni_gsres_install_path}/Decoding" install_enable = true } @@ -518,7 +517,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/Encoding" + module_install_dir = "${bsuni_gsres_install_path}/Encoding" install_enable = true } @@ -567,7 +566,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/Font" + module_install_dir = "${bsuni_gsres_install_path}/Font" install_enable = true } @@ -583,7 +582,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/IdiomSet" + module_install_dir = "${bsuni_gsres_install_path}/IdiomSet" install_enable = true } @@ -650,7 +649,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/Init" + module_install_dir = "${bsuni_gsres_install_path}/Init" install_enable = true } @@ -668,7 +667,7 @@ if (print_fwk_feature_bsuni_driver) { prebuilt = true module_source_dir = target_out_dir module_install_name = "" - module_install_dir = "bin/uni_print_driver/ghostscript/share/ghostscript/10.03.1/Resource/SubstCID" + module_install_dir = "${bsuni_gsres_install_path}/SubstCID" install_enable = true } }