Merge pull request #561 from ficristo/appshell-gyp

ficristo · web-flow · commit 194ed8a7a0d6 · 2016-08-17T18:31:07.000+02:00
Rework a bit appshell gyp files
diff --git a/appshell.gyp b/appshell.gyp
@@ -58,7 +58,6 @@
       'sources': [
         '<@(includes_common)',
         '<@(includes_wrapper)',
-        '<@(appshell_sources_common)',
       ],
       'mac_bundle_resources': [
         '<@(appshell_bundle_resources_mac)',
@@ -200,7 +199,7 @@
           ],
           'copies': [
             {
-              # Add library dependencies to the bundle.
+              # Add libraries and helper app.
               'destination': '<(PRODUCT_DIR)/<(appname).app/Contents/Frameworks',
               'files': [
                 '<(PRODUCT_DIR)/<(appname) Helper.app',
@@ -209,7 +208,7 @@
           ],
           'postbuilds': [
             {
-             'postbuild_name': 'Add framework',
+              'postbuild_name': 'Add framework',
               'action': [
                 'cp',
                 '-Rf',
@@ -278,7 +277,7 @@
             '<@(appshell_sources_mac)',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+        [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'actions': [
             {
               'action_name': 'appshell_extensions_js',
@@ -341,10 +340,6 @@
               'files': ['appshell/node-core/'],
             },
           ],
-          'sources': [
-            '<@(includes_linux)',
-            '<@(appshell_sources_linux)',
-          ],
           'link_settings': {
             'ldflags': [
               '<!@(<(pkg-config) --libs-only-other gtk+-2.0 gthread-2.0)',
@@ -357,6 +352,10 @@
               'appshell_extensions_js.o',
             ],
           },
+          'sources': [
+            '<@(includes_linux)',
+            '<@(appshell_sources_linux)',
+          ],
         }],
       ],
     },
@@ -402,7 +401,7 @@
             'Debug': {},
           },
         }],
-        ['OS=="win" and multi_threaded_dll', {
+        [ 'OS=="win" and multi_threaded_dll', {
           'configurations': {
             'Common_Base': {
               'msvs_configuration_attributes': {
@@ -426,8 +425,8 @@
               },
             }
           }
-        }]
-      ]
+        }],
+      ],
     },
   ],
   'conditions': [
diff --git a/appshell_paths.gypi b/appshell_paths.gypi
@@ -7,7 +7,7 @@
     # Bring in the autogenerated source file lists.
     'deps/cef/cef_paths.gypi',
    ],
-   'variables': {
+  'variables': {
     'includes_common': [
       'include/base/cef_atomic_ref_count.h',
       'include/base/cef_atomicops.h',
@@ -139,6 +139,8 @@
       'libcef_dll/wrapper/libcef_dll_wrapper2.cc',
       '<@(autogen_client_side)',
     ],
+    'appshell_sources_browser': [
+    ],
     'appshell_sources_common': [
       'appshell/appshell_extensions.cpp',
       'appshell/appshell_extensions.h',
@@ -162,6 +164,10 @@
       'appshell/native_menu_model.h',
       'appshell/resource_util.h',
     ],
+    'appshell_sources_renderer': [
+    ],
+    'appshell_sources_resources': [
+    ],
     'appshell_sources_win': [
       'appshell/appshell_extensions_win.cpp',
       'appshell/appshell_node_process_win.cpp',
@@ -200,6 +206,10 @@
       'appshell/res/max-pressed.png',
       'appshell/res/min-pressed.png',
       'appshell/res/restore-pressed.png',
+      '<@(appshell_sources_browser)',
+      '<@(appshell_sources_common)',
+      '<@(appshell_sources_renderer)',
+      '<@(appshell_sources_resources)',
     ],
     'appshell_sources_mac': [
       'appshell/client_colors_mac.h',
@@ -223,15 +233,9 @@
       'appshell/cefclient_mac.mm',
       'appshell/client_handler_mac.mm',
       'appshell/resource_util_mac.mm',
-    ],
-    'appshell_sources_linux': [
-      'appshell/appshell_extensions_gtk.cpp',
-      'appshell/appshell_node_process_linux.cpp',
-      'appshell/client_app_gtk.cpp',
-      'appshell/cefclient_gtk.cpp',
-      'appshell/client_handler_gtk.cpp',
-      'appshell/resource_util_linux.cpp',
-    ],
+      '<@(appshell_sources_browser)',
+      '<@(appshell_sources_common)',
+   ],
     'appshell_sources_mac_helper': [
       'appshell/TrafficLightButton.h',
       'appshell/TrafficLightButton.mm',
@@ -246,28 +250,15 @@
       'appshell/FullScreenView.h',
       'appshell/FullScreenView.mm',
       'appshell/FullScreenViewController.h',
-      'appshell/FullScreenViewController.mm',     
-      'appshell/appshell_extensions.cpp',
-      'appshell/appshell_extensions.h',
+      'appshell/FullScreenViewController.mm',
       'appshell/appshell_extensions_mac.mm',
-      'appshell/appshell_node_process.h',
-      'appshell/appshell_node_process_internal.h',
-      'appshell/appshell_node_process.cpp',
       'appshell/appshell_node_process_mac.mm',
-      'appshell/client_app.cpp',
-      'appshell/client_app.h',
       'appshell/client_app_mac.mm',
-      'appshell/client_app_delegates.cpp',
-      'appshell/client_handler.cpp',
-      'appshell/client_handler.h',
       'appshell/client_handler_mac.mm',
-      'appshell/common/client_switches.cc',
-      'appshell/common/client_switches.h',
-      'appshell/native_menu_model.cpp',
-      'appshell/native_menu_model.h',
       'appshell/process_helper_mac.cpp',
-      'appshell/resource_util.h',
       'appshell/resource_util_mac.mm',
+      '<@(appshell_sources_common)',
+      '<@(appshell_sources_renderer)',
     ],
     'appshell_bundle_resources_mac': [
       'appshell/mac/appshell.icns',
@@ -322,6 +313,18 @@
       'appshell/mac/window-fullscreen-active@2x.png',
       'appshell/mac/window-fullscreen-inactive.png',
       'appshell/mac/window-fullscreen-inactive@2x.png',
+      '<@(appshell_sources_resources)',
+    ],
+    'appshell_sources_linux': [
+      'appshell/appshell_extensions_gtk.cpp',
+      'appshell/appshell_node_process_linux.cpp',
+      'appshell/client_app_gtk.cpp',
+      'appshell/cefclient_gtk.cpp',
+      'appshell/client_handler_gtk.cpp',
+      'appshell/resource_util_linux.cpp',
+      '<@(appshell_sources_browser)',
+      '<@(appshell_sources_common)',
+      '<@(appshell_sources_renderer)',
     ],
     'appshell_bundle_resources_linux': [
       'Resources/locales',
@@ -331,6 +334,7 @@
       'appshell/res/appshell256.png',
       'Resources/cef.pak',
       'Resources/devtools_resources.pak',
+      '<@(appshell_sources_resources)',
     ],
     'appshell_bundle_libraries_linux': [
       '$(BUILDTYPE)/libcef.so',
