Fix release setup for ipyc

IronLanguages · Jul 24, 2016 · 4924355 · 4924355
1 parent 5a7ffe1
commit 4924355
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/Languages/IronPython/IronPythonCompiler/Config.cs b/Languages/IronPython/IronPythonCompiler/Config.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using IKVM.Reflection;
 using IKVM.Reflection.Emit;
 using System.Resources;

diff --git a/Languages/IronPython/IronPythonCompiler/ConsoleOps.cs b/Languages/IronPython/IronPythonCompiler/ConsoleOps.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace IronPythonCompiler {
     public static class ConsoleOps {

diff --git a/Languages/IronPython/IronPythonCompiler/IronPythonCompiler.csproj b/Languages/IronPython/IronPythonCompiler/IronPythonCompiler.csproj
@@ -2,35 +2,23 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(ProjectDir)..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>IronPythonCompiler</RootNamespace>
     <AssemblyName>ipyc</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <AppConfig>..\App.$(ConfigurationFlavor).config</AppConfig>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'FxCop|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'v2Release|AnyCPU' ">
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>IronPythonCompiler.Program</StartupObject>
@@ -73,8 +61,16 @@
       <Name>IronPython</Name>
       <Private>false</Private>
     </ProjectReference>
+  </ItemGroup>
+    <ItemGroup>
+    <None Include="..\App.Debug.config">
+      <Link>App.Debug.config</Link>
+    </None>
+    <None Include="..\App.Release.config">
+      <Link>App.Release.config</Link>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)Versioning.targets" />
   <Target Name="BeforeBuild" DependsOnTargets="GenerateBuildInfo" />
-</Project>
+</Project>
diff --git a/Languages/IronPython/IronPythonCompiler/Program.cs b/Languages/IronPython/IronPythonCompiler/Program.cs
@@ -19,7 +19,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using IronPython.Runtime;
 using IronPython.Runtime.Operations;
 using IronPython.Hosting;
@@ -62,7 +61,11 @@ static void GenerateExe(Config config) {
 
                 foreach (var a in System.AppDomain.CurrentDomain.GetAssemblies()) {
                     var n = new AssemblyName(a.FullName);
+#if CLR2
+                    if (a.EntryPoint == null && (n.Name.StartsWith("IronPython") || n.Name == "Microsoft.Dynamic" || n.Name == "Microsoft.Scripting")) {
+#else
                     if (!a.IsDynamic && a.EntryPoint == null && (n.Name.StartsWith("IronPython") || n.Name == "Microsoft.Dynamic" || n.Name == "Microsoft.Scripting")) {
+#endif
                         ConsoleOps.Info("\tEmbedded {0} {1}", n.Name, n.Version);
                         var f = new FileStream(a.Location, FileMode.Open, FileAccess.Read);
                         mb.DefineManifestResource("Dll." + n.Name, f, IKVM.Reflection.ResourceAttributes.Public);

diff --git a/Solutions/Build.IronPython.proj b/Solutions/Build.IronPython.proj
@@ -19,7 +19,7 @@
     <BuildDir>$(BinDir)\$(BaseConfiguration)</BuildDir>
     <v2BuildDir>$(BinDir)\v2$(BaseConfiguration)</v2BuildDir>
     <v45BuildDir>$(BinDir)\v45$(BaseConfiguration)</v45BuildDir>
-    <Silverlight5BuildDir>$(BinDir)\Silverlight5$(BaseConfiguration)</Silverlight5BuildDir>
+    <!--<Silverlight5BuildDir>$(BinDir)\Silverlight5$(BaseConfiguration)</Silverlight5BuildDir>-->
   </PropertyGroup>
 
   <ItemGroup>
@@ -32,9 +32,11 @@
     <BuildProject Include="$(Solution)" Condition=" '$(Mono)' != 'true' ">
       <Properties>Configuration=v45$(BaseConfiguration)</Properties>
     </BuildProject>
+    <!--
     <BuildProject Include="$(Solution)" Condition=" '$(Mono)' != 'true' ">
       <Properties>Configuration=Silverlight5$(BaseConfiguration)</Properties>
     </BuildProject>
+    -->
     <InstallerProject Include="$(BaseDir)\Msi\Python\IronPython.Installer.wixproj">
       <Properties>Configuration=$(BaseConfiguration);BaseInputPaths=$(StageDir);WixToolPath=$(UtilDir)\Wix35\;OutputPath=$(PackageDir);BuildDir=$(BuildDir)</Properties>
     </InstallerProject>
@@ -72,13 +74,20 @@
     <IronPythonBins Include="ipyw64.exe" />
     <IronPythonBins Include="ipyw64.exe.config" />
 
+    <IronPythonCompilerBins Include="ipyc.exe" />
+    <IronPythonCompilerBins Include="ipyc.exe.config" />
+
+    <!--
     <ChironBins Include="Chiron.exe" />
     <ChironBins Include="Chiron.exe.config" />
+    -->
   </ItemGroup>
 
   <ItemGroup>
+    <!--
     <SilverlightScriptFiles Include="$(BaseDir)\Hosts\Silverlight\Public\script\*.*" />
     <SilverlightScriptTemplates Include="$(BaseDir)\Hosts\Silverlight\Public\script\templates\python\**\*.*" />
+     -->
 
     <MiscFiles Include="$(BaseDir)\Languages\IronPython\Public\License.html" />
     <MiscFiles Include="$(BaseDir)\Languages\IronPython\Public\License.rtf" />
@@ -137,6 +146,7 @@
     <Copy SourceFiles="@(ClrDlrLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)" />
     <Copy SourceFiles="@(IronPythonLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)" />
     <Copy SourceFiles="@(IronPythonBins->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)" />
+    <Copy SourceFiles="@(IronPythonCompilerBins->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)" />
     <Copy SourceFiles="@(v4IronPythonModules->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\DLLs" />
     <Copy SourceFiles="@(IronPythonModules->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\DLLs" />
     <Copy SourceFiles="@(MiscFiles)" DestinationFolder="$(StageDir)" />
@@ -149,13 +159,15 @@
     <Copy SourceFiles="@(TutorialFiles)" DestinationFiles="@(TutorialFiles->'$(StageDir)\Tutorial\%(RecursiveDir)%(Filename)%(Extension)')" />
 
     <!-- Continue to copy the Silverlight files here for compatibility with previous releases. -->
+    <!--
     <Copy SourceFiles="@(DlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
     <Copy SourceFiles="@(SilverlightDlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
     <Copy SourceFiles="@(IronPythonLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
     <Copy SourceFiles="@(ChironBins->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Silverlight\bin" />
 
     <Copy SourceFiles="@(SilverlightScriptFiles)" DestinationFiles="@(SilverlightScriptFiles->'$(StageDir)\Silverlight\script\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(SilverlightScriptTemplates)" DestinationFiles="@(SilverlightScriptTemplates->'$(StageDir)\Silverlight\script\templates\python\%(RecursiveDir)%(Filename)%(Extension)')" />
+    -->
 
     <!-- .NET 4 -->
     <Copy SourceFiles="@(DlrLibs->'$(BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net40" />
@@ -179,10 +191,12 @@
     <Copy SourceFiles="@(IronPythonModules->'$(v2BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Net35" />
 
     <!-- Silverlight 5 -->
+    <!--
     <Copy SourceFiles="@(DlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
     <Copy SourceFiles="@(SilverlightDlrLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
     <Copy SourceFiles="@(IronPythonLibs->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
     <Copy SourceFiles="@(IronPythonModules->'$(Silverlight5BuildDir)\%(Identity)')" DestinationFolder="$(StageDir)\Platforms\Sl5" />
+    -->
   </Target>
 
   <Target Name="NuGetPackage" DependsOnTargets="Stage" Condition="'$(OS)' == 'Windows_NT'">