From 19ebd2567b27484244f891d269a4c8972407e059 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Mon, 7 Apr 2014 02:04:26 -0700 Subject: [PATCH] Add vs2013 project with static/ltcg/dynamic, debug/release, x86/x64, NuGet. --- .gitignore | 2 + builds/msvc/.gitignore | 5 + builds/msvc/libsodium.rc | Bin 0 -> 4616 bytes builds/msvc/resource.h | Bin 0 -> 816 bytes builds/msvc/vs2013/libsodium.sln | 52 ++ builds/msvc/vs2013/libsodium/libsodium.props | 40 ++ .../msvc/vs2013/libsodium/libsodium.vcxproj | 372 +++++++++++ .../libsodium/libsodium.vcxproj.filters | 591 ++++++++++++++++++ builds/msvc/vs2013/properties/Common.props | 27 + builds/msvc/vs2013/properties/Debug.props | 29 + builds/msvc/vs2013/properties/Dynamic.props | 19 + .../msvc/vs2013/properties/DynamicDebug.props | 22 + .../vs2013/properties/DynamicRelease.props | 21 + .../properties/LinkTimeCodeGeneration.props | 21 + builds/msvc/vs2013/properties/Release.props | 41 ++ builds/msvc/vs2013/properties/Static.props | 19 + .../msvc/vs2013/properties/StaticDebug.props | 22 + .../StaticDebugLinkTimeCodeGeneration.props | 22 + .../StaticLinkTimeCodeGeneration.props | 18 + .../vs2013/properties/StaticRelease.props | 21 + .../StaticReleaseLinkTimeCodeGeneration.props | 21 + builds/msvc/vs2013/properties/Win32.props | 21 + builds/msvc/vs2013/properties/x64.props | 24 + packaging/nuget/.gitignore | 1 + packaging/nuget/package.bat | 13 + packaging/nuget/package.config | 4 + packaging/nuget/package.gsl | 312 +++++++++ packaging/nuget/package.nuspec | 146 +++++ packaging/nuget/package.targets | 132 ++++ packaging/nuget/package.xml | 22 + 30 files changed, 2040 insertions(+) create mode 100644 builds/msvc/.gitignore create mode 100644 builds/msvc/libsodium.rc create mode 100644 builds/msvc/resource.h create mode 100644 builds/msvc/vs2013/libsodium.sln create mode 100644 builds/msvc/vs2013/libsodium/libsodium.props create mode 100644 builds/msvc/vs2013/libsodium/libsodium.vcxproj create mode 100644 builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters create mode 100644 builds/msvc/vs2013/properties/Common.props create mode 100644 builds/msvc/vs2013/properties/Debug.props create mode 100644 builds/msvc/vs2013/properties/Dynamic.props create mode 100644 builds/msvc/vs2013/properties/DynamicDebug.props create mode 100644 builds/msvc/vs2013/properties/DynamicRelease.props create mode 100644 builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/Release.props create mode 100644 builds/msvc/vs2013/properties/Static.props create mode 100644 builds/msvc/vs2013/properties/StaticDebug.props create mode 100644 builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/StaticRelease.props create mode 100644 builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props create mode 100644 builds/msvc/vs2013/properties/Win32.props create mode 100644 builds/msvc/vs2013/properties/x64.props create mode 100644 packaging/nuget/.gitignore create mode 100644 packaging/nuget/package.bat create mode 100644 packaging/nuget/package.config create mode 100644 packaging/nuget/package.gsl create mode 100644 packaging/nuget/package.nuspec create mode 100644 packaging/nuget/package.targets create mode 100644 packaging/nuget/package.xml diff --git a/.gitignore b/.gitignore index 15e1f017..8f9c59fa 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,5 @@ test-driver testing android-toolchain-* libsodium-android-* +/bin/ +/obj/ diff --git a/builds/msvc/.gitignore b/builds/msvc/.gitignore new file mode 100644 index 00000000..1bf6266d --- /dev/null +++ b/builds/msvc/.gitignore @@ -0,0 +1,5 @@ +*.opensdf +*.suo +*.sdf +*.vcxproj.user +*.aps diff --git a/builds/msvc/libsodium.rc b/builds/msvc/libsodium.rc new file mode 100644 index 0000000000000000000000000000000000000000..1e47e0c7a9e2e4493debf0abede4d8fae3642b56 GIT binary patch literal 4616 zcmdUzTTfa+5Xa}aNx#D>zG!L`tETCr%B7}=MlNX+6XFd@O2KjIUTkB#v>vM?drgb1W4G3)57{3v z-mo`h6yBKGHS>s-sCDfQm@Rv0FSupfjce@oIqd;`<6v_$_*?ebat>OUYYwjM@I?E- z&a7s2YgoaK?bKR!Zbfzr%&S(hPwdqAJ+VV}D$K+E;$ih#;4X}jmC?(zj@xKyU|*4c zgm$EdI#Pe+_ZX>07vj2uYZIP#K@ZIUxs2bYZlHKzCA`YVRE_v) z5M4*y+`_vmG|~Md86x4^1`zu|7Juv=xf!B}>F8g@Kf8QRCh>U-OSb`7{g zc0A5BM2k}&)!qXn%X|+|d^C~d1Gg6byIhbR<-sR3s_&q)Y{}$cjGwdFe3P>a^40|&?Q{Qx%Xu8_F3HiN_pG^md_$xu$M~ik zk(F;|y)D>iwX#Z*8*!+081?q+g^!VVfIY%~kfcfUwSXxS=QZ~RS6NH)5^*N%@AWG7FPAGW_I}iA`Wa1b-Jr18w!0VmTt!a!?`17>);8AVw9%rJh zI`zyM9D2C7Gv_{ErlG>k*|D$edWv49nH(I9u(v9+4i@Sn*)4YJ!|Pxw8ndZ|s7OA>pW#1Y!Q{b*-h3lha{_V@$k&eJXJ5M#eN8hK<(`PpCvZm^U zA)_k#r**an*A*yt99>!F4x7lEI#em62dk`8^{aX)aVEQcVJ=Oof{B^0vpb>*(_6^v z)mO9MuvwQgeQ|6oWVO?KUgX`9JXley$Gv8YyLz-mG;zjl^1Ct8j-FY|Y1+$s$mCrQ zzB0R$j^rk~8a`-lnaq%m-#XOf12Ni_)sqpVJni#_qIrk9LpjmsOwaFx+sRDl^WW*` zshpE<=4#C)eX{%4?XmBo**aylBua84$+QmRzkVUBZhZU;Ip{LU#cIvP;e3DZlY{gh M&g}Q_tldTFFIB-P0ssI2 literal 0 HcmV?d00001 diff --git a/builds/msvc/resource.h b/builds/msvc/resource.h new file mode 100644 index 0000000000000000000000000000000000000000..d89f84ce05813202a6fff2fc0d51fc6822220872 GIT binary patch literal 816 zcmb7?-Acni5QWdR;5#gMDHsdBKumfOY*J}V(W}s=iBxI}N#hUVtE=B`TBu$G%dpwm z$(eIzPxAfc$IMoSQPe!qpDpYHuhE-`xZAz_CtC?1u z0-X~^k1Dlh)zr7_3u;R$1*n!&$+@DkBD*+H$l&VGbG?IEftfqC1zD?S&^0Xkne4vL z4bzu;b5mJ`3hfpKJLQX;ucg{JbLF0*c1=!|*&oZB(Te*oVkUlP@x>JTv zk#jCWbxL-FU!m*mI@Ucs6RJO3j=OWxev5uy S>(8Ml_J6hiShe%$_xT4x=5;*) literal 0 HcmV?d00001 diff --git a/builds/msvc/vs2013/libsodium.sln b/builds/msvc/vs2013/libsodium.sln new file mode 100644 index 00000000..cbc694f1 --- /dev/null +++ b/builds/msvc/vs2013/libsodium.sln @@ -0,0 +1,52 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30110.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DynDebug|Win32 = DynDebug|Win32 + DynDebug|x64 = DynDebug|x64 + DynRelease|Win32 = DynRelease|Win32 + DynRelease|x64 = DynRelease|x64 + LtcgDebug|Win32 = LtcgDebug|Win32 + LtcgDebug|x64 = LtcgDebug|x64 + LtcgRelease|Win32 = LtcgRelease|Win32 + LtcgRelease|x64 = LtcgRelease|x64 + StaticDebug|Win32 = StaticDebug|Win32 + StaticDebug|x64 = StaticDebug|x64 + StaticRelease|Win32 = StaticRelease|Win32 + StaticRelease|x64 = StaticRelease|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 + {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props new file mode 100644 index 00000000..b037ece7 --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.props @@ -0,0 +1,40 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Libsodium Common Settings + AllRules.ruleset + false + + + + + + $(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories) + 4146;4244;%(DisableSpecificWarnings) + false + inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + + + + + + + SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + SODIUM_EXPORT=__declspec(dllexport);DLL_EXPORT;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj new file mode 100644 index 00000000..cfb372ac --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -0,0 +1,372 @@ + + + + {A185B162-6CB6-4502-B03F-B56F7699A8D9} + libsodium + libsodium12 + + + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + + + + v120 + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + DynamicLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + StaticLibrary + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters new file mode 100644 index 00000000..805f7e01 --- /dev/null +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -0,0 +1,591 @@ + + + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + src + + + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + include + + + resource + + + + + packaging + + + packaging + + + packaging + + + packaging + + + packaging + + + + + {03c1f568-fa7f-499c-a616-a8e0f5050b97} + + + {ddaca9ce-4d7d-4395-bfd2-2eda05bc80c2} + + + {b320f6a3-36a4-4b22-8c21-da7d2e12211a} + + + {983480f9-7320-4c01-b926-ee8dead5b916} + + + + + packaging + + + + + resource + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props new file mode 100644 index 00000000..79b0b6c5 --- /dev/null +++ b/builds/msvc/vs2013/properties/Common.props @@ -0,0 +1,27 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Common Settings + Unicode + $(ProjectName) + + + + + true + + UNICODE;_UNICODE;%(PreprocessorDefinitions) + Level3 + + + + + + + + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props new file mode 100644 index 00000000..7f060f47 --- /dev/null +++ b/builds/msvc/vs2013/properties/Debug.props @@ -0,0 +1,29 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Debug Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\ + + + + ProgramDatabase + EnableFastChecks + ProgramDatabase + true + Disabled + _DEBUG;%(PreprocessorDefinitions) + + + _DEBUG;%(PreprocessorDefinitions) + + + true + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props new file mode 100644 index 00000000..8f57f137 --- /dev/null +++ b/builds/msvc/vs2013/properties/Dynamic.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Library + + + + + _DLL;_WINDLL;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props new file mode 100644 index 00000000..03954333 --- /dev/null +++ b/builds/msvc/vs2013/properties/DynamicDebug.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Debug Library + + + + + + MultiThreadedDebugDLL + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props new file mode 100644 index 00000000..1b1de610 --- /dev/null +++ b/builds/msvc/vs2013/properties/DynamicRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Dynamic Release Library + + + + + + MultiThreadedDLL + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props new file mode 100644 index 00000000..338a9704 --- /dev/null +++ b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Link Time Code Generation Library + + + + + true + + + UseLinkTimeCodeGeneration + + + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props new file mode 100644 index 00000000..aff972fd --- /dev/null +++ b/builds/msvc/vs2013/properties/Release.props @@ -0,0 +1,41 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Release Configuration + + $(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\ + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\ + false + + + + + /Oy- %(AdditionalOptions) + + true + true + OnlyExplicitInline + false + MaxSpeed + NDEBUG;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + true + + $(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib + true + + + + + + StreamingSIMDExtensions2 + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props new file mode 100644 index 00000000..9b30a132 --- /dev/null +++ b/builds/msvc/vs2013/properties/Static.props @@ -0,0 +1,19 @@ + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Library + + + + + _LIB;%(PreprocessorDefinitions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props new file mode 100644 index 00000000..b5e5ba9a --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticDebug.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Library + + + + + + MultiThreadedDebug + true + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props new file mode 100644 index 00000000..ae5f3504 --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props @@ -0,0 +1,22 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library + + + + + + MultiThreadedDebug + false + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props new file mode 100644 index 00000000..8009311c --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props @@ -0,0 +1,18 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Link Time Code Generation Library + + + $(TargetName).ltcg + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticRelease.props b/builds/msvc/vs2013/properties/StaticRelease.props new file mode 100644 index 00000000..d7a60580 --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticRelease.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props new file mode 100644 index 00000000..668a9e9d --- /dev/null +++ b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props @@ -0,0 +1,21 @@ + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Static Release Link Time Code Generation Library + + + + + + MultiThreaded + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/Win32.props b/builds/msvc/vs2013/properties/Win32.props new file mode 100644 index 00000000..bc64e844 --- /dev/null +++ b/builds/msvc/vs2013/properties/Win32.props @@ -0,0 +1,21 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>Win32 Settings + + + + + WIN32;_WIN32;%(PreprocessorDefinitions) + + + MachineX86 + + + /MACHINE:X86 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/builds/msvc/vs2013/properties/x64.props b/builds/msvc/vs2013/properties/x64.props new file mode 100644 index 00000000..1c750d62 --- /dev/null +++ b/builds/msvc/vs2013/properties/x64.props @@ -0,0 +1,24 @@ + + + + + <_ProjectFileVersion>10.0.40219.1 + <_PropertySheetDisplayName>x64 Settings + + + + + + WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions) + + + MachineX64 + + + /MACHINE:X64 %(AdditionalOptions) + + + + \ No newline at end of file diff --git a/packaging/nuget/.gitignore b/packaging/nuget/.gitignore new file mode 100644 index 00000000..a7aeaaa1 --- /dev/null +++ b/packaging/nuget/.gitignore @@ -0,0 +1 @@ +*.nupkg diff --git a/packaging/nuget/package.bat b/packaging/nuget/package.bat new file mode 100644 index 00000000..f0d3470f --- /dev/null +++ b/packaging/nuget/package.bat @@ -0,0 +1,13 @@ +@ECHO OFF +ECHO Started nuget packaging build. +ECHO. +REM: http://www.nuget.org/packages/gslgen +gslgen -q -script:package.gsl package.config +ECHO. +REM: http://nuget.codeplex.com/releases +nuget pack package.nuspec -verbosity detailed +ECHO. +ECHO NOTE: Ignore warnings not applicable to native code: "Issue: Assembly outside lib folder." +ECHO. +ECHO Completed nuget packaging build. The package is in the following folder: +CD \ No newline at end of file diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config new file mode 100644 index 00000000..944772c5 --- /dev/null +++ b/packaging/nuget/package.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl new file mode 100644 index 00000000..b0e31c2e --- /dev/null +++ b/packaging/nuget/package.gsl @@ -0,0 +1,312 @@ +.# Generate NuGet nuspec file (for subsequent packing). +.# +.# This is a code generator built using the iMatix GSL code generation +.# language. See https://github.com/imatix/gsl for details. This script +.# is licensed under MIT/X11. +.# +.echo "Generating package.nuspec from template." +.output "package.nuspec" + + + + + $(package.id) + $(package.version) + $(package.id) + libsodium contributors + Eric Voskuil + https://raw.github.com/jedisct1/libsodium/master/LICENSE + https://github.com/jedisct1/libsodium + http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg + true + true + Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API. + Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. + https://raw.github.com/jedisct1/libsodium/master/ChangeLog + (c) 2013-2014, Frank Denis (attribution required) + native, NaCl, salt, sodium, libodium, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.targets from template." +.output "package.targets" + + + + + + + + + + + + + $\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories) + + + $\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories) + + + + + SODIUM_EXPORT=__declspec(dllimport);DLL_EXPORT;%(PreprocessorDefinitions) + + + + + SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies) + + + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + $(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + +.echo "Generating package.xml (ui extension) from template." +.output "package.xml" + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec new file mode 100644 index 00000000..5a9a39de --- /dev/null +++ b/packaging/nuget/package.nuspec @@ -0,0 +1,146 @@ + + + + + libsodium_vc120 + 0.4.5.0 + libsodium_vc120 + libsodium contributors + Eric Voskuil + https://raw.github.com/jedisct1/libsodium/master/LICENSE + https://github.com/jedisct1/libsodium + http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg + true + true + Sodium is a portable, cross-compilable, installable, packageable fork of NaCl (based on the latest released upstream version nacl-20110221), with a compatible API. + Portable fork of NaCl, packaged for Visual Studio 2013 (v120) and CTP_Nov2013 compilers. + https://raw.github.com/jedisct1/libsodium/master/ChangeLog + (c) 2013-2014, Frank Denis (attribution required) + native, NaCl, salt, sodium, libodium, C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets new file mode 100644 index 00000000..c27ef37a --- /dev/null +++ b/packaging/nuget/package.targets @@ -0,0 +1,132 @@ + + + + + + + + + + + + + $(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories) + + + + + SODIUM_EXPORT=__declspec(dllimport);DLL_EXPORT;%(PreprocessorDefinitions) + + + + + SODIUM_EXPORT=;SODIUM_STATIC;%(PreprocessorDefinitions) + + + + + + + libsodium-x86-v120-mt-s-0_4_5_0.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-sgd-0_4_5_0.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-s-0_4_5_0.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-sgd-0_4_5_0.lib;%(AdditionalDependencies) + + + + + + + libsodium-x86-v120-mt-s-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-sgd-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-s-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-sgd-0_4_5_0.ltcg.lib;%(AdditionalDependencies) + + + + + + + libsodium-x86-v120-mt-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x86-v120-mt-gd-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + libsodium-x64-v120-mt-gd-0_4_5_0.imp.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packaging/nuget/package.xml b/packaging/nuget/package.xml new file mode 100644 index 00000000..abaea230 --- /dev/null +++ b/packaging/nuget/package.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file