Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build fixed #19

Merged
merged 6 commits into from
Mar 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
[submodule "v8"]
path = v8
url = https://github.com/v8/v8.git
branch = 3.27

[submodule "depot_tools"]
path = depot_tools
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
2 changes: 1 addition & 1 deletion .nuget/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit.Runners" version="2.6.3" />
</packages>
543 changes: 0 additions & 543 deletions BuildProcessTemplates/DefaultTemplate.11.1.xaml

This file was deleted.

208 changes: 0 additions & 208 deletions BuildProcessTemplates/LabDefaultTemplate.11.xaml

This file was deleted.

76 changes: 0 additions & 76 deletions BuildProcessTemplates/UpgradeTemplate.xaml

This file was deleted.

34 changes: 12 additions & 22 deletions Fiddling/Fiddling.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -9,28 +9,10 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Fiddling</RootNamespace>
<AssemblyName>Fiddling</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>$(TargetFrameworkVersion)</TargetFrameworkVersion>
<TargetFrameworkProfile>$(TargetFrameworkProfile)</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
Expand All @@ -49,6 +31,14 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
<OutputPath>bin\x64\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<PlatformTarget>x64</PlatformTarget>
<OutputPath>bin\x64\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -63,7 +53,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Source\Noesis.Javascript\Noesis.Javascript.VS2012.vcxproj">
<ProjectReference Include="..\Source\Noesis.Javascript\Noesis.Javascript.VS2013.vcxproj">
<Project>{af1d460b-d372-40f7-8ddb-3f6ee4489eb4}</Project>
<Name>Noesis.Javascript</Name>
</ProjectReference>
Expand Down
15 changes: 13 additions & 2 deletions Fiddling/Program.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Remoting.Contexts;
using System.Text;
using Noesis.Javascript;

Expand All @@ -20,13 +21,23 @@ static void Main(string[] args)
_context.SetParameter("bozo", new Bozo(ints));
try {
//_context.Run("a=[]; while(true) a.push(0)");
_context.Run("function f() { f(); } f()");
//_context.Run("function f() { f(); } f()");
while(true) {
Console.Write("> ");
var input = Console.ReadLine();
if (input == "quit")
break;
var result = _context.Run(input);
Console.WriteLine("Result is: `{0}`", result);
}
} catch (Exception ex) {
string s = (string)ex.Data["V8StackTrace"];
Console.WriteLine(s);
}
//Console.WriteLine(ints[1]);
}
Console.WriteLine("Press any key to end");
Console.ReadKey();
}

static void FatalErrorHandler(string a, string b)
Expand Down
43 changes: 0 additions & 43 deletions Noesis.Javascript.VS2008.sln

This file was deleted.

76 changes: 35 additions & 41 deletions Noesis.Javascript.VS2010.sln
Original file line number Diff line number Diff line change
@@ -1,41 +1,35 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noesis.Javascript.Tests.VS2010", "Tests\Noesis.Javascript.Tests\Noesis.Javascript.Tests.VS2010.csproj", "{3594F612-97BB-41C2-90A1-867E78812F4E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Noesis.Javascript", "Source\Noesis.Javascript\Noesis.Javascript.VS2010.vcxproj", "{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.ActiveCfg = Debug|x86
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.Build.0 = Debug|x86
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.ActiveCfg = Debug|Any CPU
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.Build.0 = Debug|Any CPU
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.ActiveCfg = Release|x86
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.Build.0 = Release|x86
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.ActiveCfg = Release|Any CPU
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.Build.0 = Release|Any CPU
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Any CPU.ActiveCfg = Debug|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.ActiveCfg = Debug|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.Build.0 = Debug|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.ActiveCfg = Debug|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.Build.0 = Debug|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Any CPU.ActiveCfg = Release|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.ActiveCfg = Release|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.Build.0 = Release|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.ActiveCfg = Release|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noesis.Javascript.Tests.VS2010", "Tests\Noesis.Javascript.Tests\Noesis.Javascript.Tests.VS2010.csproj", "{3594F612-97BB-41C2-90A1-867E78812F4E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Noesis.Javascript", "Source\Noesis.Javascript\Noesis.Javascript.VS2010.vcxproj", "{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.ActiveCfg = Debug|x64
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.Build.0 = Debug|x64
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.ActiveCfg = Debug|x64
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.Build.0 = Debug|x64
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.ActiveCfg = Release|x86
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.Build.0 = Release|x86
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.ActiveCfg = Release|x64
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.Build.0 = Release|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.ActiveCfg = Debug|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.Build.0 = Debug|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.ActiveCfg = Debug|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.Build.0 = Debug|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.ActiveCfg = Release|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.Build.0 = Release|Win32
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.ActiveCfg = Release|x64
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Loading