Skip to content

Commit

Permalink
Added missing files.
Browse files Browse the repository at this point in the history
Updated build procedure
  • Loading branch information
taras-au committed Mar 21, 2016
1 parent d730471 commit ec6146b
Show file tree
Hide file tree
Showing 19 changed files with 602 additions and 21 deletions.
18 changes: 12 additions & 6 deletions Source/Build/build.cmd
Expand Up @@ -127,20 +127,26 @@ ECHO Building CSScriptLibrary.dll: >> ..\Build\build.log
"%net45_tools%\msbuild.exe" ..\CSScriptLibrary\CSScriptLibrary.csproj /p:AssemblyName=CSScriptLibrary /p:TargetFrameworkVersion=v4.5 /p:configuration=Release;Platform="AnyCPU" /p:OutDir=bin\Distro /p:DefineConstants="net4;net45;InterfaceAssembly" /t:Rebuild %common_msbuild_params%
ECHO ------------ >> ..\Build\build.log
move ..\CSScriptLibrary\bin\Distro\CSScriptLibrary.dll ..\Build\CSScriptLibrary.dll
move ..\CSScriptLibrary\bin\Distro\CSScriptLibrary.xml ..\Build\CSScriptLibrary.xml
copy ..\Build\CSScriptLibrary.dll %CS-S_DEV_ROOT%\lib\CSScriptLibrary.dll
copy ..\Build\CSScriptLibrary.xml %CS-S_DEV_ROOT%\lib\CSScriptLibrary.xml

rem -------------------------------------------------------------------------------------

cd ..\Build
rem need to ensure ConfigConsole.cs doesn't contain "{ 25D84CB0", which is a formatting CSScript.Npp artefact
cscs.exe /l /dbg /nl "..\ConfigConsole\buildCheck.cs" >> ..\Build\build.log

rem neet to remap CSSCRIPT_DIR as otherwise ConfigConsole will be linked against choco CS-S binaries
set old_css_dir=%CSSCRIPT_DIR%
set CSSCRIPT_DIR=%CS-S_DEV_ROOT%

ECHO Building ConfigConsole.exe:
ECHO Building ConfigConsole.exe: >> ..\Build\build.log
cscs.exe /nl /l /dbg /ew "..\ConfigConsole\ConfigConsole.cs"
move ..\ConfigConsole\ConfigConsole.exe ..\Build\ConfigConsole.exe
ECHO ------------ >> ..\Build\build.log
set CSSCRIPT_DIR=%old_css_dir%


move temp\temp\CSScriptLibrary.v1.1.xml CSScriptLibrary.v1.1.xml
move temp\temp\CSScriptLibrary.v3.5.xml CSScriptLibrary.v3.5.xml
move temp\temp\CSScriptLibrary.v1.1.dll CSScriptLibrary.v1.1.dll
Expand Down Expand Up @@ -220,11 +226,11 @@ ECHO Building CSSCodeProvider.v4.6.dll: >> ..\Build\build.log
rem cannot build v4.6 with csc.exe it needs to be VS+manual build
rem ECHO Building CSSCodeProvider.v4.6.dll: >> ..\Build\build.log
rem "%net4_tools%\csc.exe" /nologo /nowarn:618 /o /out:..\Build\temp\temp\CSSCodeProvider.v4.6.dll /t:library ..\CSSCodeProvider.v4.6\CSSCodeProvider.cs ..\CSSCodeProvider.v3.5\AssemblyInfo.cs /r:System.dll /r:E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\roslyn\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll >> build.log
copy E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\roslyn\*.* "%local_dev%\Lib\Bin\Roslyn\"

copy ..\CSSCodeProvider.v4.6\bin\roslyn\*.* "%local_dev%\Lib\Bin\Roslyn\"
del "%local_dev%\Lib\Bin\Roslyn\*.xml"
copy E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\Release\CSSCodeProvider.v4.6.dll "%local_dev%\Lib\CSSCodeProvider.v4.6.dll"
copy E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\Release\CSSCodeProvider.v4.6.dll CSSCodeProvider.v4.6.dll
copy ..\CSSCodeProvider.v4.6\bin\Release\CSSCodeProvider.v4.6.dll "%local_dev%\Lib\CSSCodeProvider.v4.6.dll"
copy ..\CSSCodeProvider.v4.6\bin\Release\CSSCodeProvider.v4.6.dll CSSCodeProvider.v4.6.dll
ECHO ------------ >> ..\Build\build.log

ECHO Building css.exe: >> ..\Build\build.log
Expand Down
2 changes: 1 addition & 1 deletion Source/CSSCodeProvider.v.2.0/AssemblyInfo.cs
Expand Up @@ -53,4 +53,4 @@
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyVersion("3.12.0.0")]
2 changes: 1 addition & 1 deletion Source/CSSCodeProvider.v3.5/AssemblyInfo.cs
Expand Up @@ -29,4 +29,4 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyVersion("3.12.0.0")]
6 changes: 6 additions & 0 deletions Source/CSSCodeProvider.v4.6/CSSCodeProvider.Client/App.config
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.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>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{0B7BD942-4F54-423B-9423-1AA8C371ECB3}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CSSCodeProvider.Client</RootNamespace>
<AssemblyName>CSSCodeProvider.Client</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</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>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CSSCodeProvider.csproj">
<Project>{187420d0-c882-4e1c-a365-f97d0b223226}</Project>
<Name>CSSCodeProvider</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
67 changes: 67 additions & 0 deletions Source/CSSCodeProvider.v4.6/CSSCodeProvider.Client/Program.cs
@@ -0,0 +1,67 @@
using System;
using System.CodeDom.Compiler;
using System.Configuration;
using System.Diagnostics;
using System.Linq;

class Program
{
static void Main(string[] args)
{
Load(); return;

string baseDir = @"E:\Galos\Projects\CS-Script.Npp\CSScript.Npp\src\CSScriptNpp\CSScriptNpp\Roslyn\";
//baseDir = @"E:\Galos\Projects\CS-Script.Npp\gittest\csscriptnpp\bin\Plugins\CSScriptNpp\Roslyn\";
//baseDir = @"E:\cs-script\lib\Bin\Roslyn\";
baseDir = @"E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\roslyn\"; //CS-S source v1.1.0
baseDir = @"E:\Galos\Projects\CS-Script.Npp\CSScript.Npp\src\CSScriptNpp\CSScriptNpp\Roslyn\";

//CSSCodeProvider.CompilerPath = @"E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\roslyn\csc.exe";
//CSSCodeProvider.ProviderPath = @"E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\bin\roslyn\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll";

baseDir = @"C:\Program Files (x86)\Notepad++\plugins\CSScriptNpp\Roslyn\";
CSSCodeProvider.CompilerPath = baseDir + "csc.exe";
CSSCodeProvider.ProviderPath = baseDir + "Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll";


CSSCodeProvider.CompilerServerTimeToLive = 60;
//Environment.SetEnvironmentVariable("CSS_CompilerDefaultSyntax", "vb");

ICodeCompiler compiler = CSSCodeProvider.CreateCompiler("");

var sw = new Stopwatch();
sw.Start();

var compilerParams = new CompilerParameters();

var file = @"E:\Galos\Projects\CS-Script\Src\CSSCodeProvider.v4.6\CSSCodeProvider.Client\Script.cs";

compilerParams.GenerateExecutable = false;
compilerParams.GenerateInMemory = false;

var result = compiler.CompileAssemblyFromFile(compilerParams, file);
var failed = result.Errors.Count > 0;
sw.Stop();
Console.WriteLine((failed ? "failed - " : "OK - ") + sw.ElapsedMilliseconds);
}

static void Load()
{
try
{
var baseDir = @"C:\Program Files (x86)\Notepad++\plugins\CSScriptNpp\Roslyn\";
//baseDir = @"E:\Galos\Projects\CS-Script.Npp\CSScript.Npp\src\CSScriptNpp\CSScriptNpp\Roslyn\";
CSSCodeProvider.CompilerPath = baseDir + "csc.exe";
CSSCodeProvider.ProviderPath = baseDir + "Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll";
CSSCodeProvider.CompilerServerTimeToLive = 600;
CSSCodeProvider.CompilerServerTimeToLive = 6;

ICodeCompiler compiler = CSSCodeProvider.CreateCompiler("");
var compilerParams = new CompilerParameters();
var result = compiler.CompileAssemblyFromFile(compilerParams, @"C:\Users\osh\Documents\C# Scripts\New Script64.cs");
}
catch { }
Console.WriteLine("done");
}

}
9 changes: 9 additions & 0 deletions Source/CSSCodeProvider.v4.6/CSSCodeProvider.Client/Script.cs
@@ -0,0 +1,9 @@
using System;

class Script
{
static public void Main(string[] args)
{
}
}

2 changes: 1 addition & 1 deletion Source/CSSCodeProvider/AssemblyInfo.cs
Expand Up @@ -55,4 +55,4 @@
[assembly: AssemblyKeyFile("")]
[assembly: AssemblyKeyName("")]

[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyVersion("3.12.0.0")]
4 changes: 2 additions & 2 deletions Source/CSScriptLibrary/Properties/AssemblyInfo.cs
Expand Up @@ -28,8 +28,8 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyFileVersion("3.11.1.0")]
[assembly: AssemblyVersion("3.12.0.0")]
[assembly: AssemblyFileVersion("3.12.0.0")]

//
// In order to sign your assembly you must specify a key to use. Refer to the
Expand Down
2 changes: 1 addition & 1 deletion Source/ConfigConsole/ConfigConsole.cs
Expand Up @@ -32,7 +32,7 @@ namespace Config
{
public class ConfigForm : Form
{
private CSScriptInstaller installer;
private CSScriptInstaller installer;
private System.ComponentModel.IContainer components = null;
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
Expand Down
2 changes: 1 addition & 1 deletion Source/ConfigConsole/build.cmd
@@ -1,5 +1,5 @@
echo off
cscs.exe /l /dbg /ew ConfigConsole.cs
cscs.exe /verbose /l /dbg /ew ConfigConsole.cs
del *.resx
del *.resources
pause
4 changes: 2 additions & 2 deletions Source/NAnt.CSScript/AssemblyInfo.cs
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyFileVersion("3.11.1.0")]
[assembly: AssemblyVersion("3.12.0.0")]
[assembly: AssemblyFileVersion("3.12.0.0")]
4 changes: 2 additions & 2 deletions Source/cscscript/Properties/AssemblyInfo.cs
Expand Up @@ -36,5 +36,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.11.1.0")]
[assembly: AssemblyFileVersion("3.11.1.0")]
[assembly: AssemblyVersion("3.12.0.0")]
[assembly: AssemblyFileVersion("3.12.0.0")]
3 changes: 3 additions & 0 deletions Source/cscscript/app.config
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

0 comments on commit ec6146b

Please sign in to comment.