Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Include native files in Simulators project #305

Merged
anpaz merged 5 commits into from
Jul 10, 2020
Merged

Include native files in Simulators project #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15adbef
bootstrap native windows
anpaz Jul 2, 2020
2dd5e83
Add native via project.
anpaz Jul 8, 2020
259d3d2
Merge tag 'stable/master' of https://github.com/microsoft/qsharp-runt…
anpaz Jul 8, 2020
a550f55
mkdir build
anpaz Jul 8, 2020
b0fa332
Merge branch 'master' into anpaz/build.props
anpaz Jul 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/Simulation/Common/Simulators.Dev.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
<QSimDll Condition="Exists('$(QsimDllWindowsRelease)')">$(QsimDllWindowsRelease)</QSimDll>
<QSimDll Condition="'$(QsimDll)' == ''">$(QsimDllWindowsDebug)</QSimDll>
</PropertyGroup>

<ItemGroup>
<None Include="$(QSimDll)">
<Link>Microsoft.Quantum.Simulator.Runtime.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(EnlistmentRoot)src\Simulation\Core\Microsoft.Quantum.Runtime.Core.csproj" />
Expand Down
7 changes: 5 additions & 2 deletions src/Simulation/Native/bootstrap.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ SET DROP_FOLDER=%SYSTEM_DEFAULTWORKINGDIRECTORY%\xplat\src\Simulation\Native\bui
DIR %DROP_FOLDER%

IF NOT EXIST linux mkdir linux
IF EXIST %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.so copy %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.so linux\Microsoft.Quantum.Simulator.Runtime.dll
IF EXIST %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.so copy %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.so linux\Microsoft.Quantum.Simulator.Runtime.dll

IF NOT EXIST osx mkdir osx
IF EXIST %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.dylib copy %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.dylib osx\Microsoft.Quantum.Simulator.Runtime.dll
IF EXIST %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.dylib copy %DROP_FOLDER%\libMicrosoft.Quantum.Simulator.Runtime.dylib osx\Microsoft.Quantum.Simulator.Runtime.dll

IF NOT EXIST win10 mkdir win10
IF EXIST %DROP_FOLDER%\Release\Microsoft.Quantum.Simulator.Runtime.dll copy %DROP_FOLDER%\Release\Microsoft.Quantum.Simulator.Runtime.dll win10\Microsoft.Quantum.Simulator.Runtime.dll

IF NOT EXIST %BUILD_FOLDER% mkdir %BUILD_FOLDER%
pushd %BUILD_FOLDER%
Expand Down
26 changes: 25 additions & 1 deletion src/Simulation/Simulators/Microsoft.Quantum.Simulators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,29 @@
<ItemGroup>
<ProjectReference Include="..\CsharpGeneration\Microsoft.Quantum.CsharpGeneration.fsproj" PrivateAssets="All" IsQscReference="true" />
</ItemGroup>


<ItemGroup>
<None Include="$(QSimDll)">
<Link>Microsoft.Quantum.Simulator.Runtime.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</None>

<None Include="..\Native\win10\**\*">
<Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</None>
<None Include="..\Native\osx\**\*">
<Link>runtimes\osx-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</None>
<None Include="..\Native\linux\**\*">
<Link>runtimes\linux-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Visible>false</Visible>
</None>
</ItemGroup>

</Project>
8 changes: 3 additions & 5 deletions src/Simulation/Simulators/Microsoft.Quantum.Simulators.nuspec.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@
</metadata>

<files>
<file src="..\Native\osx\*" target="runtimes\osx-x64\native" exclude="**\*.pdb" />
<file src="..\Native\linux\*" target="runtimes\linux-x64\native" exclude="**\*.pdb" />
<file src="..\Native\win10\*" target="runtimes\win-x64\native" exclude="**\*.pdb" />
<file src="..\Native\build\$Configuration$\Microsoft.Quantum.*" target="runtimes\win-x64\native" exclude="**\*.pdb" />
<file src="..\Native\build\$Configuration$\Microsoft.Quantum.*.pdb" target="runtimes\win-x64\native" />
<file src="..\Native\osx\*" target="runtimes\osx-x64\native" />
<file src="..\Native\linux\*" target="runtimes\linux-x64\native" />
<file src="..\Native\win10\*" target="runtimes\win-x64\native" />
<file src="..\Simulators\bin\$Configuration$\**\Microsoft.Quantum.Simulators.dll" target="lib" />
<file src="..\Simulators\bin\$Configuration$\**\Microsoft.Quantum.Simulators.xml" target="lib" />
<file src="..\Simulators\bin\$Configuration$\**\Microsoft.Quantum.Simulators.pdb" target="lib" />
Expand Down