diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index f2a462f3..a7678bd5 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -66,16 +66,6 @@ - - - - - - - - - - diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index 5d7ddf59..3e51e4c7 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -66,16 +66,6 @@ - - - - - - - - - - diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index cd736217..bd1a2ebb 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -66,16 +66,6 @@ - - - - - - - - - - diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj index 9dd258ef..451eda2f 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj @@ -66,16 +66,6 @@ - - - - - - - - - - diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj index 84c87321..5f897ec1 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj @@ -66,16 +66,6 @@ - - - - - - - - - - diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj b/builds/msvc/vs2019/libsodium/libsodium.vcxproj index 261a44f5..f929f050 100644 --- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj @@ -90,16 +90,6 @@ - - - - - - - - - - diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj b/builds/msvc/vs2022/libsodium/libsodium.vcxproj index ae0d2e7b..80034433 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj @@ -19,16 +19,6 @@ - - - - - - - - - - diff --git a/packaging/nuget/.gitignore b/packaging/nuget/.gitignore deleted file mode 100644 index d4b1a8c2..00000000 --- a/packaging/nuget/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.nupkg -package.nuspec -package.targets -package.xml diff --git a/packaging/nuget/package.bat b/packaging/nuget/package.bat deleted file mode 100644 index 565a96be..00000000 --- a/packaging/nuget/package.bat +++ /dev/null @@ -1,13 +0,0 @@ -@ECHO OFF -ECHO Started nuget packaging build. -ECHO. -REM https://www.nuget.org/packages/gsl -gsl -q -script:package.gsl package.config -ECHO. -REM https://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 diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config deleted file mode 100644 index 24bb152c..00000000 --- a/packaging/nuget/package.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl deleted file mode 100644 index 5b255e5e..00000000 --- a/packaging/nuget/package.gsl +++ /dev/null @@ -1,260 +0,0 @@ -.# 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 - false - Sodium is a portable, cross-compilable, installable, packageable fork of NaCl, 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-2019, Frank Denis (attribution required) - native, NaCl, salt, sodium, libsodium, C++ - -.for dependency - -.endfor - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -.echo "Generating package.targets from template." -.output "package.targets" - - - - - - - - - - - - - $\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories) - - - advapi32.lib;crypt32.lib;%(AdditionalDependencies) - $\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories) - - - - - 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" - - - - - - - - - - - - - - - - - - diff --git a/regen-msvc/libsodium.vcxproj.tpl b/regen-msvc/libsodium.vcxproj.tpl index a4893049..423d5710 100644 --- a/regen-msvc/libsodium.vcxproj.tpl +++ b/regen-msvc/libsodium.vcxproj.tpl @@ -19,16 +19,6 @@ - - - - - - - - - - {{v1}}