Repository: incubator-reef
Updated Branches:
refs/heads/master 1d6563e53 -> 11ff518bb
[REEF-125] Remove Visual C++ runtime DLL
This removes `msvcr110.dll`, the Visual C++ Redistributable for Visual
Studio 2012 Update 4. REEF.NET users will have to have it installed on
all cluster machines OR ship it as part of the Driver DLLs. It can be
dowloaded from
http://www.microsoft.com/en-us/download/details.aspx?id=30679
Additionally, this PR cleans up the code in a few minor ways:
* Java LibLoader is updated to remove this dll as well.
* The C# client is updated to reflect the recent project folder
structure changes.
JIRA:
[Reef-125] https://issues.apache.org/jira/browse/REEF-125
Pull Request:
This closes #80
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/11ff518b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/11ff518b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/11ff518b
Branch: refs/heads/master
Commit: 11ff518bb3baaab5b99ba10f0e33fa3fe77287bb
Parents: 1d6563e
Author: Julia Wang <[email protected]>
Authored: Fri Feb 13 14:29:53 2015 -0800
Committer: Markus Weimer <[email protected]>
Committed: Fri Feb 13 17:31:59 2015 -0800
----------------------------------------------------------------------
.../CSharp/ClrHandler/externals/msvcr110.dll | Bin 849360 -> 0 bytes
.../Org.Apache.REEF.Client/CLRBridgeClient.cs | 4 ++--
lang/cs/Org.Apache.REEF.Client/run.cmd | 2 +-
...bridge-0.11.0-incubating-SNAPSHOT-shaded.jar | Bin 13555272 -> 12744739
bytes
.../org/apache/reef/javabridge/LibLoader.java | 3 +--
lang/reef-bridge/.gitignore | 3 +++
6 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/11ff518b/lang/cpp/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/msvcr110.dll
----------------------------------------------------------------------
diff --git
a/lang/cpp/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/msvcr110.dll
b/lang/cpp/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/msvcr110.dll
deleted file mode 100644
index dd484a5..0000000
Binary files
a/lang/cpp/reef-bridge-clr/src/main/CSharp/CSharp/ClrHandler/externals/msvcr110.dll
and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/11ff518b/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
b/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
index 79cc647..00b0a9a 100644
--- a/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
+++ b/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
@@ -36,8 +36,8 @@ namespace Org.Apache.REEF.Client
public class CLRBridgeClient
{
public const string ReefHome = "REEF_HOME";
- public const string DefaultClrFolder =
@"lang\java\reef-bridge-project\reef-bridge\dotnetHello";
- public const string DefaultReefJar =
@"lang\java\reef-bridge-project\reef-bridge\target\" +
Constants.BridgeJarFileName;
+ public const string DefaultClrFolder = @"lang\reef-bridge\dotnetHello";
+ public const string DefaultReefJar = @"lang\reef-bridge\target\" +
Constants.BridgeJarFileName;
public const string DefaultRunCommand = "run.cmd";
private static string _clrFolder = null;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/11ff518b/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 3dca837..3b64520 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\java\reef-bridge-project\reef-bridge\target\reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar
+set
SHADED_JAR=%REEF_HOME%\lang\reef-bridge\target\reef-bridge-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/11ff518b/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar
b/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar
index 788b14f..5d10a2c 100644
Binary files
a/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar
and
b/lang/cs/Org.Apache.REEF.Tests/bin/reef-bridge-0.11.0-incubating-SNAPSHOT-shaded.jar
differ
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/11ff518b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java
index fa8b459..944bbaa 100644
---
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java
+++
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/LibLoader.java
@@ -41,8 +41,7 @@ public class LibLoader {
private static final String DLL_EXTENSION = ".dll";
private static final String USER_DIR = "user.dir";
private static final String[] MANAGED_DLLS = {
- "ClrHandler",
- "msvcr110",
+ "ClrHandler"
};
private final LoggingScopeFactory loggingScopeFactory;
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/11ff518b/lang/reef-bridge/.gitignore
----------------------------------------------------------------------
diff --git a/lang/reef-bridge/.gitignore b/lang/reef-bridge/.gitignore
new file mode 100644
index 0000000..10c876b
--- /dev/null
+++ b/lang/reef-bridge/.gitignore
@@ -0,0 +1,3 @@
+dotnethello
+
+
