From b1b6573bcddc4c0a5459108303952c39173f3e03 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Mon, 27 Feb 2017 13:39:37 +0530 Subject: [PATCH] build pdf resource in vendor/pdf_viewer --- electron.gyp | 30 +----------------------------- vendor/pdf_viewer | 2 +- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/electron.gyp b/electron.gyp index eb2c9efc8ff6..85b3daf9ddf6 100644 --- a/electron.gyp +++ b/electron.gyp @@ -6,7 +6,6 @@ 'company_abbr%': 'github', 'version%': '1.6.3', 'js2c_input_dir': '<(SHARED_INTERMEDIATE_DIR)/js2c', - 'grit_dir': 'vendor/grit', }, 'includes': [ 'filenames.gypi', @@ -211,7 +210,7 @@ 'type': 'static_library', 'dependencies': [ 'atom_js2c', - 'pdfviewer', + 'vendor/pdf_viewer/pdf_viewer.gyp:pdf_viewer', 'vendor/brightray/brightray.gyp:brightray', 'vendor/node/node.gyp:node', ], @@ -419,33 +418,6 @@ } ], }, # target app2asar - { - 'target_name': 'pdfviewer', - 'type': 'none', - 'actions': [ - { - 'action_name': 'pdfviewer', - 'inputs': [ - 'vendor/pdf_viewer/resources.grd', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources.h', - '<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.cc', - '<(SHARED_INTERMEDIATE_DIR)/grit/pdf_viewer_resources_map.h', - '<(PRODUCT_DIR)/pdf_viewer_resources.pak', - ], - 'action': [ - 'python', - '<(grit_dir)/grit.py', - '-i', - '<@(_inputs)', - 'build', - '-o', - '<(SHARED_INTERMEDIATE_DIR)/grit', - ], - } - ], - }, # target pdfviewer { 'target_name': 'atom_js2c_copy', 'type': 'none', diff --git a/vendor/pdf_viewer b/vendor/pdf_viewer index 43205cb70ae0..3bf66a67738a 160000 --- a/vendor/pdf_viewer +++ b/vendor/pdf_viewer @@ -1 +1 @@ -Subproject commit 43205cb70ae0755bd7684568fc052bfe60859126 +Subproject commit 3bf66a67738aa338b0622f36caacbb23235e0844