From fd533a25e1812805d88c6245fca2004628f31f50 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 5 Feb 2012 15:17:36 +0000 Subject: [PATCH] Add JavaScript addin to main solution and installer. --- SharpDevelop.Tests.sln | 40 +++++++++++++++++++++++++++++++++++++++- SharpDevelop.sln | 21 ++++++++++++++++++++- src/Setup/Files.wxs | 11 +++++++++++ src/Setup/Setup.wxs | 4 ++++ 4 files changed, 74 insertions(+), 2 deletions(-) diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln index d9f9931be7..2009ca0040 100644 --- a/SharpDevelop.Tests.sln +++ b/SharpDevelop.Tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.2.0.8480-alpha +# SharpDevelop 4.2.0.8267-alpha Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -322,6 +322,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNet.Mvc", "src\AddIns\Ba EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNet.Mvc.Tests", "src\AddIns\BackendBindings\AspNet.Mvc\Test\AspNet.Mvc.Tests.csproj", "{0B12A079-B2DB-42B9-8A8E-AA5CBC2B3225}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptBinding", "src\AddIns\BackendBindings\JavaScriptBinding\Project\JavaScriptBinding.csproj", "{062B7E01-AF3D-430D-BE33-17FF3EF4F647}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptBinding.Tests", "src\AddIns\BackendBindings\JavaScriptBinding\Test\JavaScriptBinding.Tests.csproj", "{66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -1507,6 +1511,38 @@ Global {0B12A079-B2DB-42B9-8A8E-AA5CBC2B3225}.Release|x86.ActiveCfg = Release|x86 {0B12A079-B2DB-42B9-8A8E-AA5CBC2B3225}.Release|Debug.Build.0 = Release|x86 {0B12A079-B2DB-42B9-8A8E-AA5CBC2B3225}.Release|Debug.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Any CPU.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Any CPU.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Win32.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Win32.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|x86.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|x86.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Debug.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Debug.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Any CPU.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Any CPU.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Win32.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Win32.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|x86.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|x86.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Debug.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Debug.ActiveCfg = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|Any CPU.Build.0 = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|Any CPU.ActiveCfg = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|Win32.Build.0 = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|Win32.ActiveCfg = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|x86.Build.0 = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|x86.ActiveCfg = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|Debug.Build.0 = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Debug|Debug.ActiveCfg = Debug|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|Any CPU.Build.0 = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|Any CPU.ActiveCfg = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|Win32.Build.0 = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|Win32.ActiveCfg = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|x86.Build.0 = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|x86.ActiveCfg = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|Debug.Build.0 = Release|x86 + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5}.Release|Debug.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1572,6 +1608,8 @@ Global {85C09AD8-183B-403A-869A-7226646218A9} = {E0646C25-36F2-4524-969F-FA621353AB94} {D781721F-C2A7-4E95-B76F-247170AC3B13} = {E0646C25-36F2-4524-969F-FA621353AB94} {0B12A079-B2DB-42B9-8A8E-AA5CBC2B3225} = {E0646C25-36F2-4524-969F-FA621353AB94} + {062B7E01-AF3D-430D-BE33-17FF3EF4F647} = {E0646C25-36F2-4524-969F-FA621353AB94} + {66B1741A-CCCE-4692-81EA-1D5D58ECC5E5} = {E0646C25-36F2-4524-969F-FA621353AB94} {01DF0475-0CB2-4E81-971B-BADC60CDE3A5} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} {C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} {6FA16499-896F-4C02-BB43-1AF5C6C7C713} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} diff --git a/SharpDevelop.sln b/SharpDevelop.sln index 9529122685..a608e1294b 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.2.0.8480-alpha +# SharpDevelop 4.2.0.8267-alpha Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -244,6 +244,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Scripting", "sr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNet.Mvc", "src\AddIns\BackendBindings\AspNet.Mvc\Project\AspNet.Mvc.csproj", "{D781721F-C2A7-4E95-B76F-247170AC3B13}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavaScriptBinding", "src\AddIns\BackendBindings\JavaScriptBinding\Project\JavaScriptBinding.csproj", "{062B7E01-AF3D-430D-BE33-17FF3EF4F647}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{CDE0C5A4-2096-48B5-BEA3-74DBA0F0E1EF}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -1167,6 +1169,22 @@ Global {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|x86.ActiveCfg = Release|x86 {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|Debug.Build.0 = Release|x86 {D781721F-C2A7-4E95-B76F-247170AC3B13}.Release|Debug.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Any CPU.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Any CPU.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Win32.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Win32.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|x86.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|x86.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Debug.Build.0 = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Debug|Debug.ActiveCfg = Debug|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Any CPU.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Any CPU.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Win32.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Win32.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|x86.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|x86.ActiveCfg = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Debug.Build.0 = Release|x86 + {062B7E01-AF3D-430D-BE33-17FF3EF4F647}.Release|Debug.ActiveCfg = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1221,6 +1239,7 @@ Global {E954F3CB-A446-492F-A664-2B376EBC86E8} = {E0646C25-36F2-4524-969F-FA621353AB94} {7048AE18-EB93-4A84-82D0-DD60EB58ADBD} = {E0646C25-36F2-4524-969F-FA621353AB94} {D781721F-C2A7-4E95-B76F-247170AC3B13} = {E0646C25-36F2-4524-969F-FA621353AB94} + {062B7E01-AF3D-430D-BE33-17FF3EF4F647} = {E0646C25-36F2-4524-969F-FA621353AB94} {C896FFFF-5B6C-4B0E-B6DF-049865F501B4} = {C7288E72-FFBE-48CD-84B4-6CBF95A7195A} {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} {DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {97B3B514-AB0E-4FE1-89DE-8A945F5112AE} diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs index 191ae0f4a8..80ee861259 100644 --- a/src/Setup/Files.wxs +++ b/src/Setup/Files.wxs @@ -1514,6 +1514,17 @@ + + + + + + + + + + + diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs index 1d0a167759..25143325d7 100644 --- a/src/Setup/Setup.wxs +++ b/src/Setup/Setup.wxs @@ -607,6 +607,10 @@ + + + +