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/03/27 19:53:55 UTC
incubator-reef git commit: [REEF-211] Make all csproj files default
to x64
Repository: incubator-reef
Updated Branches:
refs/heads/master c41eebde9 -> 6adfd88e8
[REEF-211] Make all csproj files default to x64
* Make all csproj files default to x64, remove AnyCPU
* Update NuGet Snapshot version number to 9
* Remove a log in libLoader to avoid null reference exception in case
files is null.
JIRA:
REEF-211: https://issues.apache.org/jira/browse/REEF-211
Pull Request:
This closes #121
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/6adfd88e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/6adfd88e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/6adfd88e
Branch: refs/heads/master
Commit: 6adfd88e857f93d2ff379b6b9d4195a3b1c10887
Parents: c41eebd
Author: Julia Wang <jw...@yahoo.com>
Authored: Wed Mar 25 16:33:43 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Fri Mar 27 11:51:23 2015 -0700
----------------------------------------------------------------------
lang/cs/build.props | 7 +++----
.../src/main/java/org/apache/reef/javabridge/LibLoader.java | 4 +---
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/6adfd88e/lang/cs/build.props
----------------------------------------------------------------------
diff --git a/lang/cs/build.props b/lang/cs/build.props
index ca8692a..acb37aa 100644
--- a/lang/cs/build.props
+++ b/lang/cs/build.props
@@ -26,7 +26,7 @@ under the License.
<!-- Common build configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@@ -34,13 +34,12 @@ under the License.
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<BuildPackage>true</BuildPackage>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>$(SolutionDir)\keyfile.snk</AssemblyOriginatorKeyFile>
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath>
@@ -52,7 +51,7 @@ under the License.
<!-- REEF NuGet properties -->
<PropertyGroup>
<IsSnapshot>true</IsSnapshot>
- <SnapshotNumber>9</SnapshotNumber>
+ <SnapshotNumber>10</SnapshotNumber>
<PushPackages>false</PushPackages>
<NuGetRepository>https://www.nuget.org</NuGetRepository>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/6adfd88e/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 5789eed..1cebfe3 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
@@ -138,15 +138,13 @@ public class LibLoader {
* @param folder
*/
private void loadAllManagedDLLs(final File folder) {
- LOG.log(Level.FINE, "Loading all managed DLLs from {0}", folder.getAbsolutePath());
+ LOG.log(Level.INFO, "Loading all managed DLLs from {0}", folder.getAbsolutePath());
final File[] files = folder.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
return name.toLowerCase().endsWith(DLL_EXTENSION);
}
});
- LOG.log(Level.FINE, "file size: {0}", files.length);
-
for (final File f : files) {
loadManagedDLL(f);
}