You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2015/04/16 01:10:05 UTC
incubator-reef git commit: [REEF-251] Update NuGet version from 10 to
11 for next push
Repository: incubator-reef
Updated Branches:
refs/heads/master 1aae0ea41 -> 3d700d24e
[REEF-251] Update NuGet version from 10 to 11 for next push
This PR contains a few small changes:
- Update NuGet version from 10 to 11 for next push
- Fix install script for reef-bridge-client in
Org.Apache.REEF.Bridge.JAR.csproj file
- Update client run.cmd
JIRA:
[REEF-251](https://issues.apache.org/jira/browse/REEF-251)
Pull Request:
This closes #146
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/3d700d24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/3d700d24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/3d700d24
Branch: refs/heads/master
Commit: 3d700d24ec89bc2bf39e30bc0fd349849355a9a2
Parents: 1aae0ea
Author: Julia Wang <jw...@yahoo.com>
Authored: Wed Apr 15 15:52:32 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Wed Apr 15 16:07:53 2015 -0700
----------------------------------------------------------------------
.../Org.Apache.REEF.Bridge.JAR.csproj | 11 ++++++-----
.../Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj | 4 +++-
lang/cs/Org.Apache.REEF.Client/run.cmd | 2 +-
lang/cs/build.props | 2 +-
4 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3d700d24/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
index 6631c23..63cbd8b 100644
--- a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
+++ b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -96,15 +96,16 @@ under the License.
<BuildCommand>$(NuGetCommand) pack "$(FinalizedNuspecFile)" -BasePath $(NugetProjectPath) -Properties "Configuration=$(Configuration);Platform=$(Platform);REEF_Version=$(REEF_Version)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" </BuildCommand>
<ReefVer>$([System.String]::Copy('$(REEF_NugetVersion)').Replace('-SNAPSHOT-',''))</ReefVer>
</PropertyGroup>
+
<ItemGroup>
<Line Include="line01"><Text>param($installPath, $toolsPath, $package, $project)</Text></Line>
<Line Include="line02"><Text>$file1 = $project.ProjectItems.Item("reef-bridge-java-$(ReefVer)-incubating-SNAPSHOT-shaded.jar")</Text></Line>
<Line Include="line03"><Text>$copyToOutput1 = $file1.Properties.Item("CopyToOutputDirectory")</Text></Line>
<Line Include="line04"><Text>$copyToOutput1.Value = 2</Text></Line>
<!--Copy the client JAR-->
- <Line Include="line02"><Text>$file1 = $project.ProjectItems.Item("reef-bridge-client-$(ReefVer)-incubating-SNAPSHOT-shaded.jar")</Text></Line>
- <Line Include="line03"><Text>$copyToOutput1 = $file1.Properties.Item("CopyToOutputDirectory")</Text></Line>
- <Line Include="line04"><Text>$copyToOutput1.Value = 2</Text></Line>
+ <Line Include="line05"><Text>$file2 = $project.ProjectItems.Item("reef-bridge-client-$(ReefVer)-incubating-SNAPSHOT-shaded.jar")</Text></Line>
+ <Line Include="line06"><Text>$copyToOutput2 = $file2.Properties.Item("CopyToOutputDirectory")</Text></Line>
+ <Line Include="line07"><Text>$copyToOutput2.Value = 2</Text></Line>
<LineText Include="%(Line.Text)" />
</ItemGroup>
<WriteLinesToFile
@@ -126,4 +127,4 @@ under the License.
<Exec Condition="'$(BuildPackage)' == 'true'" Command="$(PushCommand)" LogStandardErrorAsError="true">
</Exec>
</Target>
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3d700d24/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
index bcb092d..7102373 100644
--- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
+++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
@@ -61,7 +61,9 @@ under the License.
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
- <None Include="run.cmd" />
+ <None Include="run.cmd">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3d700d24/lang/cs/Org.Apache.REEF.Client/run.cmd
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/run.cmd b/lang/cs/Org.Apache.REEF.Client/run.cmd
index ae69a5f..86bf58f 100644
--- a/lang/cs/Org.Apache.REEF.Client/run.cmd
+++ b/lang/cs/Org.Apache.REEF.Client/run.cmd
@@ -33,7 +33,7 @@
:: RUNTIME
-set SHADED_JAR=%REEF_HOME%\lang\reef-bridge\target\reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar
+set SHADED_JAR=.\reef-bridge-java-0.11.0-incubating-SNAPSHOT-shaded.jar
set LOGGING_CONFIG=-Djava.util.logging.config.class=org.apache.reef.util.logging.CLRLoggingConfig
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/3d700d24/lang/cs/build.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.props b/lang/cs/build.props
index 33066a4..464abc8 100644
--- a/lang/cs/build.props
+++ b/lang/cs/build.props
@@ -53,7 +53,7 @@ under the License.
<!-- REEF NuGet properties -->
<PropertyGroup>
<IsSnapshot>true</IsSnapshot>
- <SnapshotNumber>10</SnapshotNumber>
+ <SnapshotNumber>11</SnapshotNumber>
<PushPackages>false</PushPackages>
<NuGetRepository>https://www.nuget.org</NuGetRepository>
</PropertyGroup>