Integrate zhouwang/remove-evalv2examples-fromdrop into master

Codex-NG · Sep 26, 2016 · 3423fb2 · 3423fb2
2 parents 184ff0f + 5fc85f9
commit 3423fb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Tools/make_binary_drop_linux b/Tools/make_binary_drop_linux
@@ -169,7 +169,7 @@ CopyFilesFromList $includePath includeFiles[@] $baseIncludePath
 echo "Copying Examples..." >&3
 cp -r Examples $baseDropPath
 # Remove CPPEvalV2Client examples until V2 binaries are included in the binary drop
-rm -rf $baseDropPath/Examples/CPPEvalV2Client
+rm -rf $baseDropPath/Examples/Evaluation/CPPEvalV2Client
 
 # Copy Scripts (Scripts folder from the root of the Repo)
 echo "Copying Scripts..." >&3

diff --git a/Tools/make_binary_drop_windows.ps1 b/Tools/make_binary_drop_windows.ps1
@@ -108,9 +108,9 @@ Copy-Item $includeFile -Destination $baseIncludePath
 Write-Verbose "Copying Examples ..."
 Copy-Item Examples -Recurse -Destination $baseDropPath\Examples
 # Remove CPPEvalV2Client examples, until V2 is included in the binary drop
-If (Test-Path $baseDropPath\Examples\CPPEvalV2Client)
+If (Test-Path $baseDropPath\Examples\Evaluation\CPPEvalV2Client)
 {
-	Remove-Item $baseDropPath\Examples\CPPEvalV2Client -Recurse
+	Remove-Item $baseDropPath\Examples\Evaluation\CPPEvalV2Client -Recurse
 }
 
 # Copy Scripts