Permalink
Browse files

Update osx native library to 1.0.0

  • Loading branch information...
1 parent c15d6a3 commit 5c1cbaf36f5e8992ae0f0a1a82a9b784af62d3c5 Frank Laub committed Feb 27, 2012
View
@@ -15,3 +15,7 @@ Make sure you have libeay32.dll and ssleay32.dll in the current working
directory of your application or in your PATH.
In your .NET project, add a reference to the ManagedOpenSsl.dll assembly.
+
+
+If you're having trouble with the native library being loaded under mono,
+try using MONO_LOG_LEVEL=debug when invoking mono.
View
@@ -12,11 +12,12 @@ uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
ifeq ($(uname_S),Darwin)
D_OSX = $(TOP)/native/osx
-SRC_LIBCRYPTO = $(D_OSX)/libcrypto.0.9.8.dylib
-SRC_LIBSSL = $(D_OSX)/libssl.0.9.8.dylib
+SRC_LIBCRYPTO = $(D_OSX)/libcrypto.1.0.0.dylib
+SRC_LIBSSL = $(D_OSX)/libssl.1.0.0.dylib
LIBCRYPTO = $(D_OUT)/libcrypto.dylib
LIBSSL = $(D_OUT)/libssl.dylib
endif
+
ifeq ($(uname_S),Linux)
D_LINUX = $(TOP)/native/linux/$(uname_M)
SRC_LIBCRYPTO = $(D_LINUX)/libcrypto.so.1.0.0
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -66,6 +66,8 @@
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -78,6 +80,7 @@
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
View
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -63,6 +63,8 @@
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -74,6 +76,7 @@
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1,3 +1,4 @@
+
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{0B96FB71-2BB0-48F8-B3E0-E3848A4F9E87}"
@@ -25,22 +26,27 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.Build.0 = Release|Any CPU
{73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{73DCC218-655B-485F-8EAC-0CE5F2F7343D}.Release|Any CPU.Build.0 = Release|Any CPU
- {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.Build.0 = Release|Any CPU
{779FA0D7-D7CB-4408-A94D-B5718F118894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{779FA0D7-D7CB-4408-A94D-B5718F118894}.Debug|Any CPU.Build.0 = Debug|Any CPU
{779FA0D7-D7CB-4408-A94D-B5718F118894}.Release|Any CPU.ActiveCfg = Release|Any CPU
{779FA0D7-D7CB-4408-A94D-B5718F118894}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E60945CE-E10D-452B-9631-E34AE55DCED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E60945CE-E10D-452B-9631-E34AE55DCED8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F50628FD-5AE4-4A16-A062-4687B2EAD7EE}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = test\UnitTests\UnitTests-2010.csproj
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -0,0 +1 @@
+test-results
View
@@ -15,9 +15,12 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
ifeq ($(uname_S),Darwin)
NUNIT = nunit-console2 $(NUNIT_FLAGS)
+NUNIT_PKG = -pkg:mono-nunit
+export PKG_CONFIG_PATH = /Library/Frameworks/Mono.framework/Libraries/pkgconfig/
endif
ifeq ($(uname_S),Linux)
NUNIT = LD_LIBRARY_PATH=. nunit-console $(NUNIT_FLAGS)
+NUNIT_PKG = -pkg:nunit
endif
SRCS = \
@@ -28,7 +31,7 @@ SRCS = \
REFS = \
-r:ManagedOpenSsl.dll \
- -pkg:nunit
+ $(NUNIT_PKG)
$(OUT) : $(SRCS) $(DEPS)
$(CSC) $(CSFLAGS) -t:$(TGT_TYPE) -lib:$(LIBPATH) $(REFS) -out:$@ $(SRCS)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,8 +40,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <OutputType>Library</OutputType>
- <RootNamespace>UnitTests</RootNamespace>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<PlatformTarget>x86</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -53,9 +51,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <OutputType>Library</OutputType>
<DebugSymbols>true</DebugSymbols>
- <RootNamespace>UnitTests</RootNamespace>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<PlatformTarget>x86</PlatformTarget>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -106,4 +102,7 @@
<Target Name="AfterBuild">
</Target>
-->
+ <ItemGroup>
+ <None Include="Makefile" />
+ </ItemGroup>
</Project>
View
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -65,6 +65,8 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>4</WarningLevel>
+ <Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\x64\Release\</OutputPath>
@@ -76,6 +78,7 @@
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

0 comments on commit 5c1cbaf

Please sign in to comment.