Permalink
Browse files

Reworking build process to use svn revision in dlls and include VSIP …

…msi in distribution

git-svn-id: http://dev.dejardin.org/svn/spark/trunk@284 0f556331-6e29-4ecb-911f-9ab3f335dbaa
  • Loading branch information...
1 parent 1af5bce commit 87a22f83dc1a10bd9df3df1d7834273d9b19d7ba @loudej loudej committed Jan 2, 2009
Showing with 479 additions and 982 deletions.
  1. +4 −0 build-distribution.cmd
  2. +0 −5 build.cmd
  3. +252 −198 spark.build
  4. +4 −1 src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj
  5. +7 −7 src/Castle.MonoRail.Views.Spark/Properties/AssemblyInfo.cs
  6. +4 −4 src/CommonAssemblyInfo.cs
  7. +9 −0 src/CommonVersionInfo.h
  8. +4 −1 src/MvcContrib.SparkViewEngine/MvcContrib.SparkViewEngine.csproj
  9. +7 −7 src/MvcContrib.SparkViewEngine/Properties/AssemblyInfo.cs
  10. +1 −1 src/Spark.Python.Tests/Properties/AssemblyInfo.cs
  11. +9 −9 src/Spark.Python/Properties/AssemblyInfo.cs
  12. +3 −0 src/Spark.Python/Spark.Python.csproj
  13. +1 −1 src/Spark.Ruby.Tests/Properties/AssemblyInfo.cs
  14. +8 −8 src/Spark.Ruby/Properties/AssemblyInfo.cs
  15. +4 −1 src/Spark.Ruby/Spark.Ruby.csproj
  16. +7 −7 src/Spark.Web.Mvc.Python/Properties/AssemblyInfo.cs
  17. +3 −0 src/Spark.Web.Mvc.Python/Spark.Web.Mvc.Python.csproj
  18. +7 −7 src/Spark.Web.Mvc.Ruby/Properties/AssemblyInfo.cs
  19. +4 −1 src/Spark.Web.Mvc.Ruby/Spark.Web.Mvc.Ruby.csproj
  20. +1 −1 src/Spark.Web.Mvc/Spark.Web.Mvc.csproj
  21. +5 −0 src/Spark.sln
  22. +7 −7 src/Spark/Properties/AssemblyInfo.cs
  23. +4 −1 src/Spark/Spark.csproj
  24. +7 −7 src/Tools/SparkLanguage/Properties/AssemblyInfo.cs
  25. +3 −0 src/Tools/SparkLanguage/SparkLanguage.csproj
  26. +1 −1 src/Tools/SparkLanguagePackage/Source.cpp
  27. +71 −42 src/Tools/SparkLanguagePackage/SparkLanguagePackage.rc
  28. +13 −0 src/Tools/SparkLanguagePackage/SparkLanguagePackage.vcproj
  29. +0 −37 src/Tools/SparkVsPackage/ColorableItem.cs
  30. +0 −59 src/Tools/SparkVsPackage/ColorableItemList.cs
  31. +0 −62 src/Tools/SparkVsPackage/Language/Painter.cs
  32. +0 −58 src/Tools/SparkVsPackage/Language/Parser.cs
  33. +0 −64 src/Tools/SparkVsPackage/Language/Scanner.cs
  34. +0 −41 src/Tools/SparkVsPackage/Language/Scope.cs
  35. +0 −36 src/Tools/SparkVsPackage/Properties/AssemblyInfo.cs
  36. BIN src/Tools/SparkVsPackage/SparkKey.snk
  37. +0 −93 src/Tools/SparkVsPackage/SparkLanguageService.cs
  38. +0 −42 src/Tools/SparkVsPackage/SparkPackage.cs
  39. +0 −99 src/Tools/SparkVsPackage/SparkVsPackage.csproj
  40. +0 −24 src/Tools/SparkVsPackage/SparkVsPackage.debug.reg
  41. +0 −24 src/Tools/SparkVsPackage/SparkVsPackage.reg
  42. +23 −18 src/Tools/WixSparkLanguage/Product.wxs
  43. +6 −8 src/Tools/WixSparkLanguage/WixSparkLanguage.wixproj
View
@@ -0,0 +1,4 @@
+:start
+bin\nant\nant.exe -f:spark.build tools build package
+pause
+goto start
View
@@ -1,9 +1,4 @@
:start
bin\nant\nant.exe -f:spark.build build package
-:%systemroot%\microsoft.net\framework\v3.5\msbuild.exe /t:Rebuild /property:Configuration=Debug;OutDir=../../build/tests/ src/Spark.sln
-:%systemroot%\microsoft.net\framework\v3.5\msbuild.exe /t:Rebuild /property:Configuration=Release;OutDir=../../build/spark/ src/Spark/Spark.csproj
-:%systemroot%\microsoft.net\framework\v3.5\msbuild.exe /t:Rebuild /property:Configuration=Release;OutDir=../../build/castle/ src/Castle.MonoRail.Views.Spark/Castle.MonoRail.Views.Spark.csproj
-:%systemroot%\microsoft.net\framework\v3.5\msbuild.exe /t:Rebuild /property:Configuration=Release;OutDir=../../build/aspnetmvc/ src/MvcContrib.SparkViewEngine/MvcContrib.SparkViewEngine.csproj
-:%systemroot%\microsoft.net\framework\v3.5\msbuild.exe /t:Rebuild;_CopyWebApplication /property:Configuration=Release;OutDir=../../build/samples/NorthwindDemo/bin/;WebProjectOutputDir=../../build/samples/NorthwindDemo/ src/NorthwindDemo/NorthwindDemo.csproj
pause
:goto start
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{33D786A4-C95D-473E-B96F-06EC68527F66}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -57,6 +57,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="HelperExtensions.cs" />
<Compile Include="Install\DescribeBatchEventArgs.cs" />
<Compile Include="Install\DescribeBatchEventHandler.cs" />
@@ -21,17 +21,17 @@
// associated with an assembly.
[assembly: AssemblyTitle("Castle.MonoRail.Views.Spark")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Castle.MonoRail.Views.Spark")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
+
+
+
+
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f4f15e61-9bba-437a-9c64-118419cdb9ed")]
@@ -46,7 +46,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+
[assembly: AllowPartiallyTrustedCallers]
@@ -13,11 +13,11 @@
//------------------------------------------------------------------------------
[assembly: ComVisibleAttribute(false)]
-[assembly: AssemblyVersionAttribute("1.0.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: AssemblyCopyrightAttribute("Copyright © Louis DeJardin 2008")]
+[assembly: AssemblyVersionAttribute("1.0")]
+[assembly: AssemblyFileVersionAttribute("1.0.274.0")]
+[assembly: AssemblyCopyrightAttribute("Copyright © Louis DeJardin 2008-2009")]
[assembly: AssemblyProductAttribute("Spark")]
[assembly: AssemblyCompanyAttribute("Louis DeJardin")]
[assembly: AssemblyConfigurationAttribute("release")]
-[assembly: AssemblyInformationalVersionAttribute("1.0.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("1.0.274.0")]
View
@@ -0,0 +1,9 @@
+// this is an auto-generated file
+#define VERSIONINFO_VERSIONSTRING "1.0.274.0"
+#define VERSIONINFO_MAJOR 1
+#define VERSIONINFO_MINOR 0
+#define VERSIONINFO_BUILD 274
+#define VERSIONINFO_REVISION 0
+#define VERSIONINFO_COPYRIGHT "Copyright © Louis DeJardin 2008-2009"
+#define VERSIONINFO_COMPANY "Louis DeJardin"
+#define VERSIONINFO_PRODUCT "Spark"
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{0A2EFD84-C6E3-47EC-8DE8-B2087716C8E6}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -53,6 +53,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SparkViewFactory.cs" />
<Compile Include="ViewSourceLoaderWrapper.cs" />
@@ -21,17 +21,17 @@
// associated with an assembly.
[assembly: AssemblyTitle("MvcContrib.SparkViewEngine")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("MarketWatch")]
-[assembly: AssemblyProduct("MvcContrib.SparkViewEngine")]
-[assembly: AssemblyCopyright("Copyright © MarketWatch 2008")]
+
+
+
+
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f0042849-6cd2-4ec8-a561-f58ed62e7fc0")]
@@ -46,5 +46,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+
@@ -18,7 +18,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Spark.Scripting.Tests")]
+[assembly: AssemblyTitle("Spark.Python.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
@@ -18,19 +18,19 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Spark.Scripting")]
+[assembly: AssemblyTitle("Spark.Python")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Spark.Scripting")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
+
+
+
+
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("ba38ade4-64bd-4485-88d6-b9af48b4e020")]
@@ -44,6 +44,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+
+
@@ -65,6 +65,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="Compiler\ChunkVisitors\GeneratedCodeVisitor.cs" />
<Compile Include="Compiler\ChunkVisitors\GlobalFunctionsVisitor.cs" />
<Compile Include="Compiler\ChunkVisitors\GlobalMembersVisitor.cs" />
@@ -18,7 +18,7 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Spark.IronRuby.Tests")]
+[assembly: AssemblyTitle("Spark.Ruby.Tests")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
@@ -18,19 +18,19 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyTitle("Spark.IronRuby")]
+[assembly: AssemblyTitle("Spark.Ruby")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Spark.IronRuby")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
+
+
+
+
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c37bb02a-1678-43e5-838b-e50fb6c4d08b")]
@@ -45,5 +45,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{514D7846-A133-4CCF-82B7-12C13F35D55B}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -53,6 +53,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="Compiler\ChunkVisitors\GeneratedCodeVisitor.cs" />
<Compile Include="Compiler\ChunkVisitors\GlobalFunctionsVisitor.cs" />
<Compile Include="Compiler\ChunkVisitors\GlobalInitializeVisitor.cs" />
@@ -7,17 +7,17 @@
// associated with an assembly.
[assembly: AssemblyTitle("Spark.Web.Mvc.Scripting")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Spark.Web.Mvc.Scripting")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
+
+
+
+
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("06b4b706-be43-4b92-b48a-44d9a18528ea")]
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+
@@ -53,6 +53,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="PythonLanguageFactoryWithExtensions.cs" />
<Compile Include="SparkPythonEngineStarter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -7,17 +7,17 @@
// associated with an assembly.
[assembly: AssemblyTitle("Spark.Web.Mvc.Ruby")]
[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Spark.Web.Mvc.Ruby")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
+
+
+
+
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("ad00be3a-6024-4b34-ac09-5fd99de0c5ed")]
@@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+
@@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{92D6EEC2-FFE5-48E5-BFE1-D5C6D2F48D90}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -57,6 +57,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\CommonAssemblyInfo.cs">
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
+ </Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RubyLanguageFactoryWithExtensions.cs" />
<Compile Include="SparkRubyEngineStarter.cs" />
@@ -62,7 +62,7 @@
</ItemGroup>
<ItemGroup>
<Compile Include="..\CommonAssemblyInfo.cs">
- <Link>CommonAssemblyInfo.cs</Link>
+ <Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="JavascriptViewResult.cs" />
<Compile Include="Install\DescribeBatchEventArgs.cs" />
View
@@ -39,6 +39,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Ruby", "Spark
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Web.Mvc.Ruby.Tests", "Spark.Web.Mvc.Ruby.Tests\Spark.Web.Mvc.Ruby.Tests.csproj", "{AE1175DE-6388-472B-92EB-907A1C45E541}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B23DD51D-925A-4488-ABE8-F2A9D69E5976}"
+ ProjectSection(SolutionItems) = preProject
+ ..\spark.build = ..\spark.build
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Oops, something went wrong.

0 comments on commit 87a22f8

Please sign in to comment.