cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update packaging scripts to .NET Core 2.0 (#582)

Browse Source
This commit is contained in:
ektrah 2017-08-15 16:27:54 +02:00 committed by Frank Denis
parent c39ecb245c
commit 45f2759d86
3 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packaging/dotnet-core/desktop.targets
View File

@ -1,16 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x86\native\libsodium.dll">
<Link>x86\libsodium.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<Visible>false</Visible>
</None>
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x64\native\libsodium.dll">
<Link>x64\libsodium.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<Visible>false</Visible>
</None>
</ItemGroup>
</Project>

3
packaging/dotnet-core/libsodium.props
View File

@ -2,7 +2,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netstandard1.1;net46</TargetFrameworks> <TargetFramework>netstandard1.1</TargetFramework>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<NoBuild>true</NoBuild> <NoBuild>true</NoBuild>
<IncludeBuildOutput>false</IncludeBuildOutput> <IncludeBuildOutput>false</IncludeBuildOutput>
@ -27,7 +27,6 @@
<Content Include="AUTHORS" PackagePath="" /> <Content Include="AUTHORS" PackagePath="" />
<Content Include="ChangeLog" PackagePath="" /> <Content Include="ChangeLog" PackagePath="" />
<Content Include="runtimes\**\*.*" PackagePath="runtimes\" /> <Content Include="runtimes\**\*.*" PackagePath="runtimes\" />
<Content Include="build\**\*.*" PackagePath="build\" />
</ItemGroup> </ItemGroup>
</Project> </Project>

18
packaging/dotnet-core/prepare.py
View File

@ -8,8 +8,8 @@ WINDOWS = [
# --------------------- ----------------- # # --------------------- ----------------- #
# Runtime ID Platform # # Runtime ID Platform #
# --------------------- ----------------- # # --------------------- ----------------- #
( 'win7-x64', 'x64' ), ( 'win-x64', 'x64' ),
( 'win7-x86', 'Win32' ), ( 'win-x86', 'Win32' ),
# --------------------- ----------------- # # --------------------- ----------------- #
] ]
@ -17,7 +17,7 @@ MACOS = [
# --------------------- ----------------- # # --------------------- ----------------- #
# Runtime ID Codename # # Runtime ID Codename #
# --------------------- ----------------- # # --------------------- ----------------- #
( 'osx.10.12-x64', 'sierra' ), ( 'osx-x64', 'sierra' ),
# --------------------- ----------------- # # --------------------- ----------------- #
] ]
@ -32,7 +32,6 @@ LINUX = [
EXTRAS = [ 'LICENSE', 'AUTHORS', 'ChangeLog' ] EXTRAS = [ 'LICENSE', 'AUTHORS', 'ChangeLog' ]
PROPSFILE = 'libsodium.props' PROPSFILE = 'libsodium.props'
DESKTOPTARGETSFILE = 'desktop.targets'
MAKEFILE = 'Makefile' MAKEFILE = 'Makefile'
BUILDDIR = 'build' BUILDDIR = 'build'
CACHEDIR = 'cache' CACHEDIR = 'cache'
@ -54,7 +53,6 @@ class Version:
self.projfile = os.path.join(self.builddir, '{0}.{1}.pkgproj'.format(PACKAGE, package_version)) self.projfile = os.path.join(self.builddir, '{0}.{1}.pkgproj'.format(PACKAGE, package_version))
self.propsfile = os.path.join(self.builddir, '{0}.props'.format(PACKAGE)) self.propsfile = os.path.join(self.builddir, '{0}.props'.format(PACKAGE))
self.pkgfile = os.path.join(BUILDDIR, '{0}.{1}.nupkg'.format(PACKAGE, package_version)) self.pkgfile = os.path.join(BUILDDIR, '{0}.{1}.nupkg'.format(PACKAGE, package_version))
self.desktoptargetsfile = os.path.join(self.builddir, 'build', 'net46', '{0}.targets'.format(PACKAGE))
class WindowsItem: class WindowsItem:
@ -202,11 +200,6 @@ def main(args):
for item in items: for item in items:
item.make(f) item.make(f)
f.write('\n')
f.write('{0}: {1}\n'.format(version.desktoptargetsfile, DESKTOPTARGETSFILE))
f.write('\t@mkdir -p $(dir $@)\n')
f.write('\tcp -f $< $@\n')
f.write('\n') f.write('\n')
f.write('{0}: {1}\n'.format(version.propsfile, PROPSFILE)) f.write('{0}: {1}\n'.format(version.propsfile, PROPSFILE))
f.write('\t@mkdir -p $(dir $@)\n') f.write('\t@mkdir -p $(dir $@)\n')
@ -227,7 +220,6 @@ def main(args):
f.write('{0}:'.format(version.pkgfile)) f.write('{0}:'.format(version.pkgfile))
f.write(' \\\n\t\t{0}'.format(version.projfile)) f.write(' \\\n\t\t{0}'.format(version.projfile))
f.write(' \\\n\t\t{0}'.format(version.propsfile)) f.write(' \\\n\t\t{0}'.format(version.propsfile))
f.write(' \\\n\t\t{0}'.format(version.desktoptargetsfile))
for item in items: for item in items:
f.write(' \\\n\t\t{0}'.format(item.packfile)) f.write(' \\\n\t\t{0}'.format(item.packfile))
f.write('\n') f.write('\n')
@ -236,14 +228,14 @@ def main(args):
'-v $(abspath recipes):/io/recipes ' + '-v $(abspath recipes):/io/recipes ' +
'-v $(abspath $(dir $<)):/io/input ' + '-v $(abspath $(dir $<)):/io/input ' +
'-v $(abspath $(dir $@)):/io/output ' + '-v $(abspath $(dir $@)):/io/output ' +
'{0} sh -x -e /io/recipes/{1} {2}\n'.format('microsoft/dotnet:1.1-sdk', 'pack', os.path.relpath(version.projfile, version.builddir))) '{0} sh -x -e /io/recipes/{1} {2}\n'.format('microsoft/dotnet:2.0-sdk', 'pack', os.path.relpath(version.projfile, version.builddir)))
f.write('\n') f.write('\n')
f.write('test: {0}\n'.format(version.pkgfile)) f.write('test: {0}\n'.format(version.pkgfile))
f.write('\t{0} run --rm '.format(DOCKER) + f.write('\t{0} run --rm '.format(DOCKER) +
'-v $(abspath recipes):/io/recipes ' + '-v $(abspath recipes):/io/recipes ' +
'-v $(abspath $(dir $<)):/io/packages ' + '-v $(abspath $(dir $<)):/io/packages ' +
'{0} sh -x -e /io/recipes/{1} "{2}"\n'.format('microsoft/dotnet:1.1-sdk', 'test', version.package_version)) '{0} sh -x -e /io/recipes/{1} "{2}"\n'.format('microsoft/dotnet:2.0-sdk', 'test', version.package_version))
print('prepared', MAKEFILE, 'to make', version.pkgfile, 'for libsodium', version.libsodium_version) print('prepared', MAKEFILE, 'to make', version.pkgfile, 'for libsodium', version.libsodium_version)
return 0 return 0