Remove Single Node

scripts/opts-doc-gen/generate-documentation.ps1

@@ -8,10 +8,9 @@ $documentationGenPath = Join-Path $toolsDirectory (Join-Path "documentation-gene
 try {
     Push-Location $baseDirectory
 
-    $eventStoreSingleNodePath = Join-Path $baseDirectory "bin\singlenode"
     $eventStoreClusterNodePath = Join-Path $baseDirectory "bin\clusternode"
 
-    Start-Process -NoNewWindow -Wait -FilePath $documentationGenPath -ArgumentList @("-b $eventStoreSingleNodePath,$eventStoreClusterNodePath -o $documentationOutputPath")
+    Start-Process -NoNewWindow -Wait -FilePath $documentationGenPath -ArgumentList @("-b $eventStoreClusterNodePath -o $documentationOutputPath")
 
 } finally {
     Pop-Location

scripts/opts-doc-gen/generate-documentation.sh

@@ -6,7 +6,6 @@ BASEDIR=$SCRIPTDIR/../..
 DOCUMENTATIONOUTPUT_PATH=$SCRIPTDIR/documentation.md
 DOCUMENTATIONGEN_PATH="$BASEDIR/tools/documentation-generation/EventStore.Documentation.exe"
 
-EVENTSTORESINGLENODE_PATH=$BASEDIR/bin/singlenode
 EVENTSTORECLUSTERNODE_PATH=$BASEDIR/bin/clusternode
 
-$DOCUMENTATIONGEN_PATH -b $EVENTSTORESINGLENODE_PATH -o $DOCUMENTATIONOUTPUT_PATH
+$DOCUMENTATIONGEN_PATH -b $EVENTSTORECLUSTERNODE_PATH -o $DOCUMENTATIONOUTPUT_PATH

scripts/package-mono/package-mono.sh

@@ -110,31 +110,6 @@ fi
 mkdir $PACKAGEDIRECTORY
 
 
-pushd $SCRIPTDIR/../../bin/singlenode/
-
-if [[ $OS == "Darwin" ]] ; then
-    mkbundle -c -o singlenode.c -oo singlenode.a EventStore.SingleNode.exe EventStore.Core.dll EventStore.BufferManagement.dll EventStore.Common.dll EventStore.Projections.Core.dll EventStore.SingleNode.Web.dll EventStore.Transport.Http.dll EventStore.Transport.Tcp.dll Newtonsoft.Json.dll NLog.dll protobuf-net.dll EventStore.Web.dll Mono.Security.dll --static --deps --config /opt/mono/etc/mono/config --machine-config /opt/mono/etc/mono/4.0/machine.config
-    gcc -o singlenode $ES_COMPILE_FLAGS singlenode.c singlenode.a $MONOPREFIX/lib/libmonosgen-2.0.a $MONOPREFIX/lib/libMonoPosixHelper.a
-else
-    mkbundle -c -o singlenode.c -oo singlenode.a EventStore.SingleNode.exe EventStore.Core.dll EventStore.BufferManagement.dll EventStore.Common.dll EventStore.Projections.Core.dll EventStore.SingleNode.Web.dll EventStore.Transport.Http.dll EventStore.Transport.Tcp.dll Newtonsoft.Json.dll NLog.dll protobuf-net.dll EventStore.Web.dll Mono.Security.dll --static --deps --config $MONOCONFIG --machine-config $MACHINECONFIG
-    cc -o singlenode -Wall `pkg-config --cflags monosgen-2` singlenode.c  `pkg-config --libs-only-L monosgen-2` -Wl,-Bstatic -lmonosgen-2.0 -Wl,-Bdynamic `pkg-config --libs-only-l monosgen-2 | sed -e "s/\-lmono-2.0 //"` singlenode.a
-fi
-
-cp -r es-common-web $PACKAGEDIRECTORY/
-cp -r singlenode-web $PACKAGEDIRECTORY/
-cp -r Prelude $PACKAGEDIRECTORY/
-cp -r web-resources $PACKAGEDIRECTORY/
-cp -r Users $PACKAGEDIRECTORY/
-cp libjs1.$soext $PACKAGEDIRECTORY/
-cp libv8.$soext $PACKAGEDIRECTORY/
-cp libicui18n.$soext $PACKAGEDIRECTORY/
-cp libicuuc.$soext $PACKAGEDIRECTORY/
-cp singlenode $PACKAGEDIRECTORY/
-cp NLog.config $PACKAGEDIRECTORY/
-cp $SCRIPTDIR/singlenode.sh $PACKAGEDIRECTORY/run-singlenode.sh
-
-popd
-
 pushd $SCRIPTDIR/../../bin/clusternode/
 
 if [[ $OS == "Darwin" ]] ; then
@@ -156,7 +131,7 @@ cp libicui18n.$soext $PACKAGEDIRECTORY/
 cp libicuuc.$soext $PACKAGEDIRECTORY/
 cp clusternode $PACKAGEDIRECTORY/
 cp NLog.config $PACKAGEDIRECTORY/
-cp $SCRIPTDIR/clusternode.sh $PACKAGEDIRECTORY/run-clusternode.sh
+cp $SCRIPTDIR/run-node.sh $PACKAGEDIRECTORY/run-node.sh
 
 popd
 

scripts/package-windows/merge-assemblies.ps1

@@ -8,48 +8,6 @@ if ((Test-Path $mergedDirectory) -eq $false) {
     New-Item -Path $mergedDirectory -ItemType Directory > $null
 }
 
-Function Merge-SingleNode
-{
-    [CmdletBinding()]
-    param(
-        [Parameter(Mandatory=$true)][string]$BuildDirectory,
-        [Parameter(Mandatory=$true)][string]$OutputDirectory,
-        [Parameter(Mandatory=$false)][string]$Executable = "EventStore.SingleNode.exe",
-        [Parameter(Mandatory=$false)][string[]]$ExcludeAssemblies = @("js1.dll", "js1.pdb"),
-        [Parameter(Mandatory=$false)][string]$IlMergeToolPath = (Join-Path $toolsDirectory "ilmerge\ilmerge.exe")
-    )
-
-    # Find the build directory as a relative path to here (in case it's absolute)
-    $relativeBuildDirectory = Resolve-Path -Relative -Path $BuildDirectory
-
-    # If the executable name isn't absolute, try searching for it in the build directory
-    if ((Test-Path $Executable) -eq $false) {
-        $Executable = Join-Path $relativeBuildDirectory $Executable
-
-        if ((Test-Path $Executable) -eq $false) {
-            throw "Cannot find executable '$Executable'"
-        }
-    }
-
-    # Find other assemblies to merge (with some specifically excluded for e.g. native code)
-    $otherAssemblies = Get-ChildItem $relativeBuildDirectory -Filter *.dll -Exclude $ExcludeAssemblies -Name |
-                       % { Join-Path $relativeBuildDirectory $_ } |
-                       Join-String -Separator " "
-
-    # Find the path of the .NET Framework DLLs
-    $platformPath = (Join-Path (Get-Item 'Env:ProgramFiles(x86)').Value 'Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0')
-
-    $outputName = "EventStore-SingleNode.exe"
-    $outputPath = Join-Path (Resolve-Path -Relative $OutputDirectory) $outputName
-
-    Start-Process -Wait -NoNewWindow -FilePath $IlMergeToolPath -ArgumentList @("/internalize", "/targetPlatform:v4,""$platformPath""", "/out:$outputPath", $Executable, $otherAssemblies)
-
-    if ($ExcludeAssemblies.Count -gt 0) {
-        Get-ChildItem -Recurse -Path $relativeBuildDirectory -Include $ExcludeAssemblies |
-            Foreach-Object { Copy-Item -Force -Path $_.FullName -Destination $mergedDirectory }
-    }
-}
-
 Function Merge-ClusterNode
 {
     [CmdletBinding()]
@@ -260,7 +218,6 @@ Function Merge-ClientAPI
     }
 }
 
-Merge-SingleNode -BuildDirectory (Join-Path $binDirectory "singlenode") -OutputDirectory $mergedDirectory
 Merge-ClusterNode -BuildDirectory (Join-Path $binDirectory "clusternode") -OutputDirectory $mergedDirectory
 Merge-TestClient -BuildDirectory (Join-Path $binDirectory "testclient") -OutputDirectory $mergedDirectory
 Merge-PAdmin -BuildDirectory (Join-Path $binDirectory "padmin") -OutputDirectory $mergedDirectory

scripts/package-windows/package-windows.ps1

@@ -44,23 +44,11 @@ Function Stage-Build() {
     Get-ChildItem -Path $mergedAssembliesPath |
         ForEach-Object { Copy-Item $_.FullName $stagingDirectory }
 
-    Write-Host "Staging supporting files from single-node..."
-
-    #Stage single node files
-    $singleNodeDirectory = Join-Path $binDirectory "singlenode"
-    Copy-Item (Join-Path $singleNodeDirectory "NLog.config") $stagingDirectory
-    Copy-Item -Recurse -Force (Join-Path $singleNodeDirectory "es-common-web") $stagingDirectory
-    Copy-Item -Recurse -Force (Join-Path $singleNodeDirectory "Prelude") $stagingDirectory
-    Copy-Item -Recurse -Force (Join-Path $singleNodeDirectory "singlenode-web") $stagingDirectory
-    Copy-Item -Recurse -Force (Join-Path $singleNodeDirectory "Users") $stagingDirectory
-    Copy-Item -Recurse -Force (Join-Path $singleNodeDirectory "web-resources") $stagingDirectory
-
     Write-Host "Staging supporting files from cluster-node..."
 
     #Stage cluster node files
     $clusterNodeDirectory = Join-Path $binDirectory "clusternode"
-    Copy-Item (Join-Path $singleNodeDirectory "NLog.config") $stagingDirectory
-    Copy-Item -Recurse -Force (Join-Path $clusterNodeDirectory "es-common-web") $stagingDirectory
+    Copy-Item (Join-Path $clusterNodeDirectory "NLog.config") $stagingDirectory
     Copy-Item -Recurse -Force (Join-Path $clusterNodeDirectory "Prelude") $stagingDirectory
     Copy-Item -Recurse -Force (Join-Path $clusterNodeDirectory "clusternode-web") $stagingDirectory
     Copy-Item -Recurse -Force (Join-Path $clusterNodeDirectory "Users") $stagingDirectory

src/EventStore.ClientAPI/EventStore.ClientAPI.csproj

@@ -17,11 +17,11 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\anycpu\</OutputPath>
+    <OutputPath>..\..\bin\clientapi\</OutputPath>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\bin\eventstore\debug\anycpu\EventStore.ClientAPI.xml</DocumentationFile>
+    <DocumentationFile>..\..\bin\clientapi\EventStore.ClientAPI.xml</DocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">