Skip to content

Commit

Permalink
Fixed IronPython and Microsoft.Scripting references to pull from GAC …
Browse files Browse the repository at this point in the history 
…so that

we build with the released version.
  • Loading branch information
Jason McCampbell (Enthought, Inc) committed May 19, 2011
1 parent a5655e9 commit 9ab3587
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 37 deletions.
2 changes: 1 addition & 1 deletion libndarray/src/npy_ctors.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ NpyArray_FromArray(NpyArray *arr, NpyArray_Descr *newtype, int flags)
* Can't cast unless ndim-0 array, FORCECAST is specified
* or the cast is safe.
*/
if (!(flags & NPY_FORCECAST) && !NpyArray_NDIM(arr) == 0 &&
if (!(flags & NPY_FORCECAST) && NpyArray_NDIM(arr) != 0 &&
!NpyArray_CanCastTo(oldtype, newtype)) {
Npy_DECREF(newtype);
NpyErr_SetString(NpyExc_TypeError,
Expand Down
16 changes: 4 additions & 12 deletions numpy/NumpyDotNet/NumpyDotNet.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,10 @@
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<Reference Include="IronPython">
<HintPath>..\..\..\IronPython\bin\Debug\IronPython.dll</HintPath>
</Reference>
<Reference Include="IronPython.Modules">
<HintPath>..\..\..\IronPython\bin\Debug\IronPython.Modules.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic">
<HintPath>..\..\..\IronPython\bin\Debug\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
<HintPath>..\..\..\IronPython\bin\Debug\Microsoft.Scripting.dll</HintPath>
</Reference>
<Reference Include="IronPython, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL" />
<Reference Include="IronPython.Modules, Version=2.7.0.40, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL" />
<Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
Expand Down
16 changes: 4 additions & 12 deletions numpy/fft/fft.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,10 @@
<None Include="__init__.py" />
</ItemGroup>
<ItemGroup>
<Reference Include="IronPython, Version=2.7.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\IronPython.dll</HintPath>
</Reference>
<Reference Include="IronPython.Modules, Version=2.7.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\IronPython.Modules.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\Microsoft.Scripting.dll</HintPath>
</Reference>
<Reference Include="IronPython" />
<Reference Include="IronPython.Modules" />
<Reference Include="Microsoft.Dynamic" />
<Reference Include="Microsoft.Scripting" />
<Reference Include="NumpyDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug\NumpyDotNet.dll</HintPath>
</Reference>
Expand Down
16 changes: 4 additions & 12 deletions numpy/linalg/lapack_lite.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,10 @@
<None Include="__init__.py" />
</ItemGroup>
<ItemGroup>
<Reference Include="IronPython, Version=2.7.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\IronPython.dll</HintPath>
</Reference>
<Reference Include="IronPython.Modules, Version=2.7.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\IronPython.Modules.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting, Version=1.1.0.20, Culture=neutral, PublicKeyToken=7f709c5b713576e1">
<HintPath>..\..\..\IronPython\bin\Debug\Microsoft.Scripting.dll</HintPath>
</Reference>
<Reference Include="IronPython" />
<Reference Include="IronPython.Modules" />
<Reference Include="Microsoft.Dynamic" />
<Reference Include="Microsoft.Scripting" />
<Reference Include="NumpyDotNet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\..\numpy-refactor\numpy\NumpyDotNet\bin\Debug\NumpyDotNet.dll</HintPath>
</Reference>
Expand Down

0 comments on commit 9ab3587

Please sign in to comment.