Attachment #399434 for bug #536048

View | Details | Raw Unified | Return to bug 536048
Collapse All | Expand All




      'type': 'none',
      'dependencies': [
        'analysis_server',
        'analyzer_java',
        'create_sdk',
        'dart2js',
        'dartanalyzer',
        'editor',
        'packages',
        'runtime',
        'samples',

      ],
    },
    {
      'target_name': 'analyzer_java',
      'type': 'none',
      'dependencies': [
        'editor/analyzer_java.gyp:analyzer',
      ],
    },
    {
      'target_name': 'dartfmt',
      'type': 'none',
      'dependencies': [

      ],
    },
    {
      'target_name': 'editor',
      'type': 'none',
      'dependencies': [
        'editor/build/generated/editor_deps.gyp:editor_deps',

        # This dependency on create_sdk does not mean that the
        # Editor is rebuilt if the SDK is. It only means that when you build
        # the Editor, you should also build the SDK. If we wanted to
        # make sure that the editor is rebuilt when the SDK is, we
        # should list a *file* in PRODUCT_DIR which the action below
        # uses as input.
        # This is the desired behavior as we would otherwise have to
        # rebuild the editor each time the VM, dart2js, or library
        # code changes.
        'create_sdk',
      ],
      'actions': [
        {
          'action_name': 'create_editor_py',
          'inputs': [
            'tools/create_editor.py',
            '<(SHARED_INTERMEDIATE_DIR)/editor_deps/editor.stamp',
            '<!@(["python", "tools/list_files.py", "", "editor/tools/features/'
            'com.google.dart.tools.deploy.feature_releng"])',
          ],
          'outputs': [
            '<(PRODUCT_DIR)/editor/VERSION',
          ],
          'action': [
            'python',
            'tools/create_editor.py',
            '--out', '<(PRODUCT_DIR)/editor',
            '--build', '<(INTERMEDIATE_DIR)',
          ],
          'message': 'Creating editor.',
        },
      ],
    },
    {
      'target_name': 'samples',
      'type': 'none',
      'dependencies': [],

Lines 8-14 Link Here

(-)dart/runtime/bin/filter.h (-1 / +1 lines)
8	#include "bin/builtin.h"	8	#include "bin/builtin.h"
9	#include "bin/utils.h"	9	#include "bin/utils.h"
10		10
11	#include "../third_party/zlib/zlib.h"	11	#include <zlib.h>
12		12
13		13
14	namespace dart {	14	namespace dart {

Lines 189-199 Link Here

(-)dart/runtime/bin/bin.gypi (-5 lines)
189	'io_natives.cc',	189	'io_natives.cc',
190	],	190	],
191	'conditions': [	191	'conditions': [
192	['dart_io_support==1', {
193	'dependencies': [
194	'bin/net/ssl.gyp:libssl_dart',
195	],
196	}],
197	['OS=="win"', {	192	['OS=="win"', {
198	'link_settings': {	193	'link_settings': {
199	'libraries': [ '-liphlpapi.lib' ],	194	'libraries': [ '-liphlpapi.lib' ],




# This file contains some C++ sources for the dart:io library.  The other
# implementation files are in builtin_impl_sources.gypi.
{
  'include_dirs': [
    '<(sysroot)/usr/include/nspr',
    '<(sysroot)/usr/include/nss',
  ],
  'link_settings': {
    'libraries': [
      '-lplds4',
      '-lplc4', 
      '-lnspr4',
      '-lssl3',
      '-lsmime3',
      '-lnss3',
      '-lnssutil3',
      '-lz',
    ],
  },
  'sources': [
    'eventhandler.cc',
    'eventhandler.h',




}


static CERTCertificate *
FindCertByNameString(CERTCertDBHandle *handle, char *nameStr)
{
    CERTName *name;
    SECItem *nameItem;
    CERTCertificate *cert = NULL;
    PLArenaPool *arena = NULL;
    
    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
    
    if ( arena == NULL ) {
	goto loser;
    }
    
    name = CERT_AsciiToName(nameStr);
    
    if ( name ) {
	nameItem = SEC_ASN1EncodeItem (arena, NULL, (void *)name,
				       CERT_NameTemplate);
	if ( nameItem != NULL ) {
            cert = CERT_FindCertByName(handle, nameItem);
	}
	CERT_DestroyName(name);
    }

loser:
    if ( arena ) {
	PORT_FreeArena(arena, PR_FALSE);
    }
    
    return(cert);
}


void SSLFilter::Connect(const char* host_name,
                        RawAddr* raw_addr,
                        int port,

        ThrowPRException("CertificateException",
                         "Certificate database cannot be loaded");
      }
      certificate = FindCertByNameString(certificate_database,
          const_cast<char*>(certificate_name));
      if (certificate == NULL) {
        ThrowCertificateException(

Return to bug 536048

Lines 665-670 Link Here

(-)dart/runtime/bin/secure_socket.cc (-1 / +35 lines)
665	}	665	}
666		666
667		667
		668	static CERTCertificate *
		669	FindCertByNameString(CERTCertDBHandle handle, char nameStr)
		670	{
		671	CERTName *name;
		672	SECItem *nameItem;
		673	CERTCertificate *cert = NULL;
		674	PLArenaPool *arena = NULL;
		675
		676	arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
		677
		678	if ( arena == NULL ) {
		679	goto loser;
		680	}
		681
		682	name = CERT_AsciiToName(nameStr);
		683
		684	if ( name ) {
		685	nameItem = SEC_ASN1EncodeItem (arena, NULL, (void *)name,
		686	CERT_NameTemplate);
		687	if ( nameItem != NULL ) {
		688	cert = CERT_FindCertByName(handle, nameItem);
		689	}
		690	CERT_DestroyName(name);
		691	}
		692
		693	loser:
		694	if ( arena ) {
		695	PORT_FreeArena(arena, PR_FALSE);
		696	}
		697
		698	return(cert);
		699	}
		700
		701
668	void SSLFilter::Connect(const char* host_name,	702	void SSLFilter::Connect(const char* host_name,
669	RawAddr* raw_addr,	703	RawAddr* raw_addr,
670	int port,	704	int port,
Lines 740-746 Link Here
740	ThrowPRException("CertificateException",	774	ThrowPRException("CertificateException",
741	"Certificate database cannot be loaded");	775	"Certificate database cannot be loaded");
742	}	776	}
743	certificate = CERT_FindCertByNameString(certificate_database,	777	certificate = FindCertByNameString(certificate_database,
744	const_cast<char*>(certificate_name));	778	const_cast<char*>(certificate_name));
745	if (certificate == NULL) {	779	if (certificate == NULL) {
746	ThrowCertificateException(	780	ThrowCertificateException(

Lines 9-19 Link Here

(-)dart/dart.gyp (-48 lines)
9	'type': 'none',	9	'type': 'none',
10	'dependencies': [	10	'dependencies': [
11	'analysis_server',	11	'analysis_server',
12	'analyzer_java',
13	'create_sdk',	12	'create_sdk',
14	'dart2js',	13	'dart2js',
15	'dartanalyzer',	14	'dartanalyzer',
16	'editor',
17	'packages',	15	'packages',
18	'runtime',	16	'runtime',
19	'samples',	17	'samples',
Lines 57-69 Link Here
57	],	55	],
58	},	56	},
59	{	57	{
60	'target_name': 'analyzer_java',
61	'type': 'none',
62	'dependencies': [
63	'editor/analyzer_java.gyp:analyzer',
64	],
65	},
66	{
67	'target_name': 'dartfmt',	58	'target_name': 'dartfmt',
68	'type': 'none',	59	'type': 'none',
69	'dependencies': [	60	'dependencies': [
Lines 132-176 Link Here
132	],	123	],
133	},	124	},
134	{	125	{
135	'target_name': 'editor',
136	'type': 'none',
137	'dependencies': [
138	'editor/build/generated/editor_deps.gyp:editor_deps',
139
140	# This dependency on create_sdk does not mean that the
141	# Editor is rebuilt if the SDK is. It only means that when you build
142	# the Editor, you should also build the SDK. If we wanted to
143	# make sure that the editor is rebuilt when the SDK is, we
144	# should list a file in PRODUCT_DIR which the action below
145	# uses as input.
146	# This is the desired behavior as we would otherwise have to
147	# rebuild the editor each time the VM, dart2js, or library
148	# code changes.
149	'create_sdk',
150	],
151	'actions': [
152	{
153	'action_name': 'create_editor_py',
154	'inputs': [
155	'tools/create_editor.py',
156	'<(SHARED_INTERMEDIATE_DIR)/editor_deps/editor.stamp',
157	'<!@(["python", "tools/list_files.py", "", "editor/tools/features/'
158	'com.google.dart.tools.deploy.feature_releng"])',
159	],
160	'outputs': [
161	'<(PRODUCT_DIR)/editor/VERSION',
162	],
163	'action': [
164	'python',
165	'tools/create_editor.py',
166	'--out', '<(PRODUCT_DIR)/editor',
167	'--build', '<(INTERMEDIATE_DIR)',
168	],
169	'message': 'Creating editor.',
170	},
171	],
172	},
173	{
174	'target_name': 'samples',	126	'target_name': 'samples',
175	'type': 'none',	127	'type': 'none',
176	'dependencies': [],	128	'dependencies': [],

Lines 5-10 Link Here

(-)dart/runtime/bin/io_impl_sources.gypi (+16 lines)
5	# This file contains some C++ sources for the dart:io library. The other	5	# This file contains some C++ sources for the dart:io library. The other
6	# implementation files are in builtin_impl_sources.gypi.	6	# implementation files are in builtin_impl_sources.gypi.
7	{	7	{
		8	'include_dirs': [
		9	'<(sysroot)/usr/include/nspr',
		10	'<(sysroot)/usr/include/nss',
		11	],
		12	'link_settings': {
		13	'libraries': [
		14	'-lplds4',
		15	'-lplc4',
		16	'-lnspr4',
		17	'-lssl3',
		18	'-lsmime3',
		19	'-lnss3',
		20	'-lnssutil3',
		21	'-lz',
		22	],
		23	},
8	'sources': [	24	'sources': [
9	'eventhandler.cc',	25	'eventhandler.cc',
10	'eventhandler.h',	26	'eventhandler.h',