From e778668fe92b8c60e0537ee48f79d5af6c1a2f1e Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 29 Mar 2017 15:18:41 -0400 Subject: Move xfa/fxbarcode fxbarcode/ Nothing in fxbarcode/ depends on XFA code. This CL moves xfa/fxbarcode to be fxbarcode/ and creates a static_library for fxbarcode which is depend on by the xfa library. Change-Id: I0b708737b07efb94b769a5238d92af92bc62880d Reviewed-on: https://pdfium-review.googlesource.com/3291 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- BUILD.gn | 272 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 141 insertions(+), 131 deletions(-) (limited to 'BUILD.gn') diff --git a/BUILD.gn b/BUILD.gn index b54f67d9f7..175106a6e4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1156,6 +1156,145 @@ if (pdf_enable_xfa) { configs += [ ":pdfium_core_config" ] } + static_library("fxbarcode") { + sources = [ + "fxbarcode/BC_Dimension.cpp", + "fxbarcode/BC_Dimension.h", + "fxbarcode/BC_Library.cpp", + "fxbarcode/BC_Library.h", + "fxbarcode/BC_TwoDimWriter.cpp", + "fxbarcode/BC_TwoDimWriter.h", + "fxbarcode/BC_UtilCodingConvert.cpp", + "fxbarcode/BC_UtilCodingConvert.h", + "fxbarcode/BC_Utils.cpp", + "fxbarcode/BC_Writer.cpp", + "fxbarcode/BC_Writer.h", + "fxbarcode/cbc_codabar.cpp", + "fxbarcode/cbc_codabar.h", + "fxbarcode/cbc_code128.cpp", + "fxbarcode/cbc_code128.h", + "fxbarcode/cbc_code39.cpp", + "fxbarcode/cbc_code39.h", + "fxbarcode/cbc_codebase.cpp", + "fxbarcode/cbc_codebase.h", + "fxbarcode/cbc_datamatrix.cpp", + "fxbarcode/cbc_datamatrix.h", + "fxbarcode/cbc_ean13.cpp", + "fxbarcode/cbc_ean13.h", + "fxbarcode/cbc_ean8.cpp", + "fxbarcode/cbc_ean8.h", + "fxbarcode/cbc_onecode.cpp", + "fxbarcode/cbc_onecode.h", + "fxbarcode/cbc_pdf417i.cpp", + "fxbarcode/cbc_pdf417i.h", + "fxbarcode/cbc_qrcode.cpp", + "fxbarcode/cbc_qrcode.h", + "fxbarcode/cbc_upca.cpp", + "fxbarcode/cbc_upca.h", + "fxbarcode/common/BC_CommonBitArray.cpp", + "fxbarcode/common/BC_CommonBitArray.h", + "fxbarcode/common/BC_CommonBitMatrix.cpp", + "fxbarcode/common/BC_CommonBitMatrix.h", + "fxbarcode/common/BC_CommonByteArray.cpp", + "fxbarcode/common/BC_CommonByteArray.h", + "fxbarcode/common/BC_CommonByteMatrix.cpp", + "fxbarcode/common/BC_CommonByteMatrix.h", + "fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp", + "fxbarcode/common/reedsolomon/BC_ReedSolomon.h", + "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp", + "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h", + "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp", + "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h", + "fxbarcode/datamatrix/BC_ASCIIEncoder.cpp", + "fxbarcode/datamatrix/BC_ASCIIEncoder.h", + "fxbarcode/datamatrix/BC_Base256Encoder.cpp", + "fxbarcode/datamatrix/BC_Base256Encoder.h", + "fxbarcode/datamatrix/BC_C40Encoder.cpp", + "fxbarcode/datamatrix/BC_C40Encoder.h", + "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp", + "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h", + "fxbarcode/datamatrix/BC_DataMatrixWriter.cpp", + "fxbarcode/datamatrix/BC_DataMatrixWriter.h", + "fxbarcode/datamatrix/BC_DefaultPlacement.cpp", + "fxbarcode/datamatrix/BC_DefaultPlacement.h", + "fxbarcode/datamatrix/BC_EdifactEncoder.cpp", + "fxbarcode/datamatrix/BC_EdifactEncoder.h", + "fxbarcode/datamatrix/BC_Encoder.cpp", + "fxbarcode/datamatrix/BC_Encoder.h", + "fxbarcode/datamatrix/BC_EncoderContext.cpp", + "fxbarcode/datamatrix/BC_EncoderContext.h", + "fxbarcode/datamatrix/BC_ErrorCorrection.cpp", + "fxbarcode/datamatrix/BC_ErrorCorrection.h", + "fxbarcode/datamatrix/BC_HighLevelEncoder.cpp", + "fxbarcode/datamatrix/BC_HighLevelEncoder.h", + "fxbarcode/datamatrix/BC_SymbolInfo.cpp", + "fxbarcode/datamatrix/BC_SymbolInfo.h", + "fxbarcode/datamatrix/BC_SymbolShapeHint.cpp", + "fxbarcode/datamatrix/BC_SymbolShapeHint.h", + "fxbarcode/datamatrix/BC_TextEncoder.cpp", + "fxbarcode/datamatrix/BC_TextEncoder.h", + "fxbarcode/datamatrix/BC_X12Encoder.cpp", + "fxbarcode/datamatrix/BC_X12Encoder.h", + "fxbarcode/oned/BC_OneDimWriter.cpp", + "fxbarcode/oned/BC_OneDimWriter.h", + "fxbarcode/oned/BC_OnedCodaBarWriter.cpp", + "fxbarcode/oned/BC_OnedCodaBarWriter.h", + "fxbarcode/oned/BC_OnedCode128Writer.cpp", + "fxbarcode/oned/BC_OnedCode128Writer.h", + "fxbarcode/oned/BC_OnedCode39Writer.cpp", + "fxbarcode/oned/BC_OnedCode39Writer.h", + "fxbarcode/oned/BC_OnedEAN13Writer.cpp", + "fxbarcode/oned/BC_OnedEAN13Writer.h", + "fxbarcode/oned/BC_OnedEAN8Writer.cpp", + "fxbarcode/oned/BC_OnedEAN8Writer.h", + "fxbarcode/oned/BC_OnedUPCAWriter.cpp", + "fxbarcode/oned/BC_OnedUPCAWriter.h", + "fxbarcode/pdf417/BC_PDF417.cpp", + "fxbarcode/pdf417/BC_PDF417.h", + "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp", + "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h", + "fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp", + "fxbarcode/pdf417/BC_PDF417BarcodeRow.h", + "fxbarcode/pdf417/BC_PDF417Compaction.cpp", + "fxbarcode/pdf417/BC_PDF417Compaction.h", + "fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp", + "fxbarcode/pdf417/BC_PDF417ErrorCorrection.h", + "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp", + "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h", + "fxbarcode/pdf417/BC_PDF417Writer.cpp", + "fxbarcode/pdf417/BC_PDF417Writer.h", + "fxbarcode/qrcode/BC_QRCodeWriter.cpp", + "fxbarcode/qrcode/BC_QRCodeWriter.h", + "fxbarcode/qrcode/BC_QRCoder.cpp", + "fxbarcode/qrcode/BC_QRCoder.h", + "fxbarcode/qrcode/BC_QRCoderBitVector.cpp", + "fxbarcode/qrcode/BC_QRCoderBitVector.h", + "fxbarcode/qrcode/BC_QRCoderBlockPair.cpp", + "fxbarcode/qrcode/BC_QRCoderBlockPair.h", + "fxbarcode/qrcode/BC_QRCoderECB.cpp", + "fxbarcode/qrcode/BC_QRCoderECB.h", + "fxbarcode/qrcode/BC_QRCoderECBlocks.cpp", + "fxbarcode/qrcode/BC_QRCoderECBlocks.h", + "fxbarcode/qrcode/BC_QRCoderEncoder.cpp", + "fxbarcode/qrcode/BC_QRCoderEncoder.h", + "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp", + "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h", + "fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp", + "fxbarcode/qrcode/BC_QRCoderMaskUtil.h", + "fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp", + "fxbarcode/qrcode/BC_QRCoderMatrixUtil.h", + "fxbarcode/qrcode/BC_QRCoderMode.cpp", + "fxbarcode/qrcode/BC_QRCoderMode.h", + "fxbarcode/qrcode/BC_QRCoderVersion.cpp", + "fxbarcode/qrcode/BC_QRCoderVersion.h", + "fxbarcode/utils.h", + ] + deps = [ + ":fxcrt", + ] + configs += [ ":pdfium_core_config" ] + } + static_library("xfa") { sources = [ "xfa/fde/cfde_path.cpp", @@ -1378,136 +1517,6 @@ if (pdf_enable_xfa) { "xfa/fwl/theme/cfwl_utils.h", "xfa/fwl/theme/cfwl_widgettp.cpp", "xfa/fwl/theme/cfwl_widgettp.h", - "xfa/fxbarcode/BC_Dimension.cpp", - "xfa/fxbarcode/BC_Dimension.h", - "xfa/fxbarcode/BC_Library.cpp", - "xfa/fxbarcode/BC_Library.h", - "xfa/fxbarcode/BC_TwoDimWriter.cpp", - "xfa/fxbarcode/BC_TwoDimWriter.h", - "xfa/fxbarcode/BC_UtilCodingConvert.cpp", - "xfa/fxbarcode/BC_UtilCodingConvert.h", - "xfa/fxbarcode/BC_Utils.cpp", - "xfa/fxbarcode/BC_Writer.cpp", - "xfa/fxbarcode/BC_Writer.h", - "xfa/fxbarcode/cbc_codabar.cpp", - "xfa/fxbarcode/cbc_codabar.h", - "xfa/fxbarcode/cbc_code128.cpp", - "xfa/fxbarcode/cbc_code128.h", - "xfa/fxbarcode/cbc_code39.cpp", - "xfa/fxbarcode/cbc_code39.h", - "xfa/fxbarcode/cbc_codebase.cpp", - "xfa/fxbarcode/cbc_codebase.h", - "xfa/fxbarcode/cbc_datamatrix.cpp", - "xfa/fxbarcode/cbc_datamatrix.h", - "xfa/fxbarcode/cbc_ean13.cpp", - "xfa/fxbarcode/cbc_ean13.h", - "xfa/fxbarcode/cbc_ean8.cpp", - "xfa/fxbarcode/cbc_ean8.h", - "xfa/fxbarcode/cbc_onecode.cpp", - "xfa/fxbarcode/cbc_onecode.h", - "xfa/fxbarcode/cbc_pdf417i.cpp", - "xfa/fxbarcode/cbc_pdf417i.h", - "xfa/fxbarcode/cbc_qrcode.cpp", - "xfa/fxbarcode/cbc_qrcode.h", - "xfa/fxbarcode/cbc_upca.cpp", - "xfa/fxbarcode/cbc_upca.h", - "xfa/fxbarcode/common/BC_CommonBitArray.cpp", - "xfa/fxbarcode/common/BC_CommonBitArray.h", - "xfa/fxbarcode/common/BC_CommonBitMatrix.cpp", - "xfa/fxbarcode/common/BC_CommonBitMatrix.h", - "xfa/fxbarcode/common/BC_CommonByteArray.cpp", - "xfa/fxbarcode/common/BC_CommonByteArray.h", - "xfa/fxbarcode/common/BC_CommonByteMatrix.cpp", - "xfa/fxbarcode/common/BC_CommonByteMatrix.h", - "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp", - "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h", - "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp", - "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h", - "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp", - "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h", - "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp", - "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h", - "xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp", - "xfa/fxbarcode/datamatrix/BC_Base256Encoder.h", - "xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp", - "xfa/fxbarcode/datamatrix/BC_C40Encoder.h", - "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp", - "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h", - "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp", - "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h", - "xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp", - "xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h", - "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp", - "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h", - "xfa/fxbarcode/datamatrix/BC_Encoder.cpp", - "xfa/fxbarcode/datamatrix/BC_Encoder.h", - "xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp", - "xfa/fxbarcode/datamatrix/BC_EncoderContext.h", - "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.cpp", - "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h", - "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp", - "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h", - "xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp", - "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h", - "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp", - "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h", - "xfa/fxbarcode/datamatrix/BC_TextEncoder.cpp", - "xfa/fxbarcode/datamatrix/BC_TextEncoder.h", - "xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp", - "xfa/fxbarcode/datamatrix/BC_X12Encoder.h", - "xfa/fxbarcode/oned/BC_OneDimWriter.cpp", - "xfa/fxbarcode/oned/BC_OneDimWriter.h", - "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp", - "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h", - "xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp", - "xfa/fxbarcode/oned/BC_OnedCode128Writer.h", - "xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp", - "xfa/fxbarcode/oned/BC_OnedCode39Writer.h", - "xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp", - "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h", - "xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp", - "xfa/fxbarcode/oned/BC_OnedEAN8Writer.h", - "xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp", - "xfa/fxbarcode/oned/BC_OnedUPCAWriter.h", - "xfa/fxbarcode/pdf417/BC_PDF417.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417.h", - "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h", - "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h", - "xfa/fxbarcode/pdf417/BC_PDF417Compaction.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h", - "xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h", - "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h", - "xfa/fxbarcode/pdf417/BC_PDF417Writer.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417Writer.h", - "xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp", - "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h", - "xfa/fxbarcode/qrcode/BC_QRCoder.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoder.h", - "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h", - "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h", - "xfa/fxbarcode/qrcode/BC_QRCoderECB.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderECB.h", - "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h", - "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h", - "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h", - "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h", - "xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h", - "xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderMode.h", - "xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp", - "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h", - "xfa/fxbarcode/utils.h", "xfa/fxfa/app/cxfa_csstagprovider.cpp", "xfa/fxfa/app/cxfa_csstagprovider.h", "xfa/fxfa/app/cxfa_linkuserdata.cpp", @@ -1768,6 +1777,7 @@ if (pdf_enable_xfa) { ] include_dirs = [ "." ] deps = [ + ":fxbarcode", ":fxcrt", ":fxjs", ] @@ -1831,13 +1841,13 @@ test("pdfium_unittests") { include_dirs = [] if (pdf_enable_xfa) { sources += [ + "fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp", "xfa/fde/cfde_txtedtbuf_unittest.cpp", "xfa/fde/css/cfde_cssdeclaration_unittest.cpp", "xfa/fde/css/cfde_cssstylesheet_unittest.cpp", "xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp", "xfa/fde/xml/fde_xml_imp_unittest.cpp", "xfa/fgas/layout/fgas_rtfbreak_unittest.cpp", - "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp", "xfa/fxfa/app/cxfa_textparser_unittest.cpp", "xfa/fxfa/cxfa_ffapp_unitest.cpp", "xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp", -- cgit v1.2.3