update release script

danelkhen · danelkhen · commit 89de284843a0 · 2014-07-03T12:26:59.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 bin
 obj
+*.ide
 *.suo
 *.user
 lib/*.pdb
diff --git a/Compiler/MSBuild/MSBuild.csproj b/Compiler/MSBuild/MSBuild.csproj
@@ -54,8 +54,12 @@
     <Compile Include="Skc.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="SharpKit.CSharp.targets" />
-    <None Include="SharpKit.CSharp.Tasks" />
+    <None Include="SharpKit.CSharp.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SharpKit.CSharp.Tasks">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/Compiler/skc5/skc5.csproj b/Compiler/skc5/skc5.csproj
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AjaxMin">
-      <HintPath>..\..\external\AjaxMin\AjaxMinDll\bin\Debug\AjaxMin.dll</HintPath>
+      <HintPath>..\..\external\AjaxMin\AjaxMinDll\bin\AjaxMin.dll</HintPath>
     </Reference>
     <Reference Include="corex">
       <HintPath>..\..\external\corex\src\corex\bin\corex.dll</HintPath>
diff --git a/SDK b/SDK
@@ -1 +1 @@
-Subproject commit 90909951ba052de202fbd06dd301bc0033aead70
+Subproject commit f35dd06b6d3e29f070bb64552413addb48dfc724
diff --git a/scripts/custom.targets b/scripts/custom.targets
@@ -7,7 +7,4 @@
 		<Private>False</Private>
 	  </ProjectReference>
 	</ItemDefinitionGroup>
-	<PropertyGroup Condition="'$(OutputDir)' != ''">
-	  <OutputPath>$(OutputDir)\$(MSBuildProjectName)\</OutputPath>
-	</PropertyGroup>
 </Project>
diff --git a/scripts/release.bat b/scripts/release.bat
@@ -3,41 +3,62 @@ SET CustomTargetsFile=%CD%\custom.targets
 del %OutputDir%\ /q /s
 rd %OutputDir%\ /q /s
 SET MSBuildExtraParams=/p:CustomBeforeMicrosoftCSharpTargets="%CustomTargetsFile%" /verbosity:minimal
+rem  /p:DebugSymbols=false /p:DebugType=None
 cd ..
 
+cd external
+
+cd AjaxMin\AjaxMinDll
+call msbuild4 AjaxMinDll.sln /p:Configuration=Release /verbosity:minimal /p:DebugSymbols=false /p:DebugType=None
+cd ..\..\
+
+cd Corex
+call msbuild4 Corex.sln /p:Configuration=Release /verbosity:minimal /p:DebugSymbols=false /p:DebugType=None
+cd..
+
+cd NRefactory
+call msbuild4 NRefactory.sln /p:Configuration=net_4_5_release /p:DontCopyLocalReferences=true /p:DebugSymbols=false /p:DebugType=None %MSBuildExtraParams%
+cd..
+
+cd..
+
 @echo Building Compiler
 cd Compiler
-msbuild.lnk Compiler.sln /p:OutputDir="%OutputDir%\Compiler" %MSBuildExtraParams%
+call msbuild4 Compiler.sln /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None %MSBuildExtraParams%
 cd ..
 
-pause
 
 cd SDK
 
 @echo Building SDK\Defs
 cd Defs
-msbuild.lnk Defs.sln /p:OutputDir="%OutputDir%\SDK\Defs" /p:DontCopyLocalReferences=true %MSBuildExtraParams%
+call msbuild4 Defs.sln %MSBuildExtraParams%
 cd ..
 
-pause
 
 @echo Building SDK\Frameworks
 cd Frameworks
-msbuild.lnk Frameworks.sln /p:OutputDir="%OutputDir%\SDK\Frameworks" /p:DontCopyLocalReferences=true %MSBuildExtraParams%
+call msbuild4 Frameworks.sln /p:DontCopyLocalReferences=true %MSBuildExtraParams%
 cd ..
 
 cd ..
 
 
-cd scripts
-pause
-
 @echo Building SDK\Frameworks
-cd %OutputDir%
-md zip\Files\NET
-copy Compiler\skc5\* zip\Files\NET\
-copy Compiler\MSBuild\* zip\Files\NET\
-copy SDK\Defs\* zip\Application\Assemblies\ /s
+md %OutputDir%\zip\Files\NET\
+md %OutputDir%\zip\Files\Application\Assemblies\
+xcopy Compiler\skc5\bin\*         %OutputDir%\zip\Files\NET\
+xcopy Compiler\MSBuild\bin\*      %OutputDir%\zip\Files\NET\
+xcopy SDK\Defs\bin\*              %OutputDir%\zip\Files\Application\Assemblies\ /s
+xcopy SDK\Frameworks\JsClr\bin\*  %OutputDir%\zip\Files\Application\JsClr\bin\ /s
+xcopy SDK\Frameworks\JsClr\res\*  %OutputDir%\zip\Files\Application\JsClr\res\ /s
+del %OutputDir%\zip\*.pdb /q /s
 
-
-pause
+cd scripts
+pushd %OutputDir%
+cd zip
+call 7z a ..\package.zip
+cd..
+rem rd zip /q /s
+rem rd bin /q /s
+popd

-Original file line number
+Diff line change
@@ @@ -1,5 +1,6 @@ @@
 bin
 obj
 +*.ide
 *.suo
 *.user
 lib/*.pdb