Merge pull request #264 from adobe/linux

Update Linux to CEF 3.1453.1255

Author: JeffryBooher

.gitignore

@@ -39,10 +39,21 @@ libcef_dll
 tools
 
 /installer/mac/staging/
-
+/installer/linux/brackets.deb
+/installer/linux/debian/usr/lib/
 /installer/win/staging/
 *.wixpdb
 *.wixobj
 bracketsharvestmanager.wxs
 fr-fr.mst
+
+appshell.gyp
+appshell_extensions_js.o
+Makefile
+appshell.Makefile
+Brackets.target.mk
+libcef_dll_wrapper.target.mk
+appshell/gtk
+appshell/gtk/*
+
 appshell/node-core/node_modules

Gruntfile.js

@@ -27,7 +27,15 @@ module.exports = function (grunt) {
 
     var common  = require("./tasks/common")(grunt),
         resolve = common.resolve,
-        staging = (common.platform() === "mac") ? "installer/mac/staging/<%= build.name %>.app/Contents" : "installer/win/staging";
+        staging;
+    
+    if (common.platform() === "mac") {
+        staging = "installer/mac/staging/<%= build.name %>.app/Contents"
+    } else if (common.platform() === "win") {
+        staging = "installer/win/staging";
+    } else {
+        staging = "installer/linux/debian/usr/lib/brackets";
+    }
 
     grunt.initConfig({
         "pkg":              grunt.file.readJSON("package.json"),
@@ -63,8 +71,10 @@ module.exports = function (grunt) {
             "downloads"         : ["downloads"],
             "installer-mac"     : ["installer/mac/*.dmg"],
             "installer-win"     : ["installer/win/*.msi"],
+            "installer-linux"   : ["installer/linux/brackets.deb"],
             "staging-mac"       : ["installer/mac/staging"],
             "staging-win"       : ["installer/win/staging"],
+            "staging-linux"     : ["<%= build.staging %>"],
             "www"               : ["<%= build.staging %>/www", "<%= build.staging %>/samples"]
         },
         "copy": {
@@ -106,6 +116,23 @@ module.exports = function (grunt) {
                 ]
             },
             */
+            "linux": {
+                "files": [
+                    {
+                        "expand"    : true,
+                        "cwd"       : "out/Release",
+                        "src"       : [
+                            "lib/**",
+                            "locales/**",
+                            "appshell.ico",
+                            "Brackets",
+                            "cef.pak",
+                            "devtools_resources.pak"
+                        ],
+                        "dest"      : "<%= build.staging %>"
+                    }
+                ]
+            },
             "www": {
                 "files": [
                     {

appshell.gyp.txt

@@ -4,6 +4,8 @@
 
 {
   'variables': {
+    'pkg-config': 'pkg-config',
+    'target_arch%': 'environment',
     'chromium_code': 1,
     'conditions': [
       [ 'OS=="mac"', {
@@ -209,10 +211,62 @@
             '<@(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',
+              'inputs': [
+                'appshell/appshell_extensions.js',
+              ],
+              'outputs': [
+                'appshell_extensions_js.o',
+              ],
+              'action': [
+                'objcopy',
+                '--input',
+                'binary',
+                '--output',
+                '<(output_bfd)',
+                '--binary-architecture',
+                'i386',
+                '<@(_inputs)',
+                '<@(_outputs)',
+              ],
+              'message': 'compiling js resource'
+            },
+            {
+              'action_name': 'appicon',
+              'inputs': [
+                'appshell/res/appshell.ico',
+              ],
+              'outputs': [
+                'appshell/gtk/appicon.h',
+              ],
+              'action': '<!(mkdir -p appshell/gtk; gdk-pixbuf-csource --name=appicon appshell/res/appshell.ico > appshell/gtk/appicon.h)',
+              #Such a hack. GYP let me do bash redirections!
+            },
+          ],
+          'cflags': [
+            '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
+            '<(march)',
+          ],
+          'include_dirs': [
+            '.',
+          ],
+          'default_configuration': 'Release',
+          'configurations': {
+            'Release': {},
+            'Debug': {},
+          },
           'copies': [
             {
-              'destination': '<(PRODUCT_DIR)/files',
+              'destination': '<(PRODUCT_DIR)/lib',
+              'files': [
+                '<@(appshell_bundle_libraries_linux)',
+              ],
+            },
+            {
+              'destination': '<(PRODUCT_DIR)',
               'files': [
                 '<@(appshell_bundle_resources_linux)',
               ],
@@ -222,6 +276,18 @@
             '<@(includes_linux)',
             '<@(appshell_sources_linux)',
           ],
+          'link_settings': {
+            'ldflags': [
+              '<!@(<(pkg-config) --libs-only-other gtk+-2.0 gthread-2.0)',
+              '-Wl,-rpath,\$$ORIGIN/lib',
+              '<(march)'
+            ],
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
+              '$(BUILDTYPE)/libcef.so',
+              'appshell_extensions_js.o',
+            ],
+          },
         }],
       ],
     },
@@ -254,6 +320,19 @@
         'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO',
         'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
       },
+      'conditions': [
+        ['OS=="linux"', {
+          'cflags': [
+          '<!@(<(pkg-config) --cflags gtk+-2.0 gthread-2.0)',
+          '<(march)',
+          ],
+          'default_configuration': 'Release',
+          'configurations': {
+            'Release': {},
+            'Debug': {},
+          },
+        }]
+      ]
     },
   ],
   'conditions': [
@@ -323,5 +402,23 @@
         },  # target appshell_helper_app
       ],
     }],  # OS=="mac"
+    ['target_arch=="ia32"', {
+      'variables': {
+        'output_bfd': 'elf32-i386',
+        'march': '-m32',
+      },
+    }],
+    ['target_arch=="x64"', {
+      'variables': {
+        'output_bfd': 'elf64-x86-64',
+        'march': '-m64',
+      },
+    }],
+    ['target_arch=="environment"', {
+      'variables': {
+        'output_bfd': '<!(uname -m | sed "s/x86_64/elf64-x86-64/;s/i.86/elf32-i386/")',
+        'march': ' ',
+      },
+    }],
   ],
 }