lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [52/62] [abbrv] lucenenet git commit: Removed functionality that copies Lucene.Net.Core folder to Lucene.Net because it is no longer necessary after renaming the folder
Date Tue, 04 Apr 2017 17:19:58 GMT
Removed functionality that copies Lucene.Net.Core folder to Lucene.Net because it is no longer
necessary after renaming the folder


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/57e7d903
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/57e7d903
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/57e7d903

Branch: refs/heads/api-work
Commit: 57e7d9031ae79ce4fe857bb0e47d3eca30e5471a
Parents: a5dc68d
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Tue Apr 4 12:37:09 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Tue Apr 4 12:37:09 2017 +0700

----------------------------------------------------------------------
 build.ps1 | 34 +++++++---------------------------
 1 file changed, 7 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/57e7d903/build.ps1
----------------------------------------------------------------------
diff --git a/build.ps1 b/build.ps1
index 4be9998..ff3bd16 100644
--- a/build.ps1
+++ b/build.ps1
@@ -297,17 +297,6 @@ function Test-Projects($projects) {
     $ErrorActionPreference = $oldPreference
 }
 
-# Hack because dotnet pack doesn't provide a way to override the directory
-# name for the NuGet package name when using project.json. 
-# So, we copy Lucene.Net.Core to a new directory
-# Lucene.Net to work around this.
-function Copy-Lucene-Net() {
-	Copy-Item -Recurse -Force "$root\src\Lucene.Net.Core" "$root\src\Lucene.Net"
-}
-
-function Delete-Lucene-Net-Copy() {
-	Remove-Item "$root\src\Lucene.Net" -Force -Recurse -ErrorAction SilentlyContinue
-}
 
 function Create-NuGetPackages($projects) {
 	
@@ -317,25 +306,16 @@ function Create-NuGetPackages($projects) {
         Remove-Item $NuGetPackageDirectory -Recurse -Force
     }
 
-	try
-	{
-		Copy-Lucene-Net
-		$projects = $projects += Get-ChildItem -Path "$root\src\Lucene.Net\project.json"
-		$projects = $projects | ? { !$_.Directory.Name.Equals("Lucene.Net.Core") }
-		
-		Ensure-Directory-Exists $NuGetPackageDirectory
-    
-		foreach ($project in $projects) {
-			pushd $project.DirectoryName
+	Ensure-Directory-Exists $NuGetPackageDirectory
+
+	foreach ($project in $projects) {
+		pushd $project.DirectoryName
 
-			Write-Host "Creating NuGet package for $project..." -ForegroundColor Magenta
+		Write-Host "Creating NuGet package for $project..." -ForegroundColor Magenta
 			
-			& dotnet.exe pack --configuration $Configuration --output $NuGetPackageDirectory --no-build
+		& dotnet.exe pack --configuration $Configuration --output $NuGetPackageDirectory --no-build
 
-			popd
-		}
-	} finally {
-		Delete-Lucene-Net-Copy
+		popd
 	}
 	
     return $NuGetPackageDirectory


Mime
View raw message