|
From: Mark P. <mar...@us...> - 2008-04-29 04:06:06
|
Update of /cvsroot/springnet/Spring.Net In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20324 Modified Files: Spring.build Spring.include readme.txt Log Message: SPRNET-932 - Create signed "debug" DLLs (with .PDBs) and remove 'release' directory in distribution. Index: Spring.build =================================================================== RCS file: /cvsroot/springnet/Spring.Net/Spring.build,v retrieving revision 1.196 retrieving revision 1.197 diff -C2 -d -r1.196 -r1.197 *** Spring.build 1 Apr 2008 19:51:01 -0000 1.196 --- Spring.build 29 Apr 2008 04:06:01 -0000 1.197 *************** *** 11,14 **** --- 11,15 ---- <property name="project.build.config" value="debug"/> <property name="project.build.package" value="false"/> + <property name="project.build.sign" value="true"/> <!-- Include spring helpers --> <include buildfile="${spring.basedir}/Spring.include"/> *************** *** 275,279 **** <target name="compile-build-mono-2.0" description="Builds for mono 2.0 if available"> <if test="${framework::exists('mono-2.0')}"> ! <call target="compile-mono-2.0"/> </if> <if test="${not framework::exists('mono-2.0')}"> --- 276,280 ---- <target name="compile-build-mono-2.0" description="Builds for mono 2.0 if available"> <if test="${framework::exists('mono-2.0')}"> ! <call target="compile-mono-2.0"/> </if> <if test="${not framework::exists('mono-2.0')}"> *************** *** 345,355 **** <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version" depends="set-net-1.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> - <!-- initialize the temp.build.skip property to false --> - <call target="common.generate-assemblyinfo"/> <property name="temp.build.skip" value="false"/> <!-- configure build --> - <call target="copykeys"> - </call> <if test="${not temp.build.skip}"> <!-- disable namespaces not supported in net-1.0 --> --- 346,354 ---- <target name="compile-net-1.0" description="Builds .NET Framework 1.0 version" depends="set-net-1.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> + <call target="copykeys" if="${project.build.sign}"/> + <call target="common.generate-assemblyinfo"/> <property name="temp.build.skip" value="false"/> <!-- configure build --> <if test="${not temp.build.skip}"> <!-- disable namespaces not supported in net-1.0 --> *************** *** 362,369 **** <target name="compile-net-1.1" description="Builds .NET Framework 1.1 version" depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> <call target="common.generate-assemblyinfo"/> - <!-- initialize the temp.build.skip property to false --> <property name="temp.build.skip" value="false"/> - <call target="copykeys"/> <if test="${not temp.build.skip}"> <call target="compile-test" /> --- 361,367 ---- <target name="compile-net-1.1" description="Builds .NET Framework 1.1 version" depends="set-net-1.1-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> + <call target="copykeys" if="${project.build.sign}"/> <call target="common.generate-assemblyinfo"/> <property name="temp.build.skip" value="false"/> <if test="${not temp.build.skip}"> <call target="compile-test" /> *************** *** 373,380 **** <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version" depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> <call target="common.generate-assemblyinfo"/> - <!-- initialize the temp.build.skip property to false --> <property name="temp.build.skip" value="false"/> - <call target="copykeys"/> <if test="${not temp.build.skip}"> <call target="compile-test" /> --- 371,377 ---- <target name="compile-net-2.0" description="Builds .NET Framework 2.0 version" depends="set-net-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> + <call target="copykeys" if="${project.build.sign}"/> <call target="common.generate-assemblyinfo"/> <property name="temp.build.skip" value="false"/> <if test="${not temp.build.skip}"> <call target="compile-test" /> *************** *** 384,390 **** <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version" depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> ! <!-- initialize the temp.build.skip property to false --> <property name="temp.build.skip" value="false"/> - <call target="copykeys"/> <if test="${not temp.build.skip}"> <call target="compile-test" /> --- 381,387 ---- <target name="compile-mono-2.0" description="Builds MONO Framework 2.0 version" depends="set-mono-2.0-runtime-configuration, check-spring-basedir, clean-current-bin-dir, TestInit"> ! <call target="copykeys" if="${project.build.sign}"/> ! <call target="common.generate-assemblyinfo"/> <property name="temp.build.skip" value="false"/> <if test="${not temp.build.skip}"> <call target="compile-test" /> *************** *** 393,397 **** <target name="copykeys"> ! <if test="${current.build.config.release}"> <if test="${not file::exists(spring.basedir + '/Spring.Net.snk')}"> <if test="${property::exists('project.build.package') and project.build.package}"> --- 390,394 ---- <target name="copykeys"> ! <if test="${not file::exists(spring.basedir + '/Spring.Net.snk')}"> <if test="${property::exists('project.build.package') and project.build.package}"> *************** *** 414,418 **** <property name="compiler.args" value="/keyfile:..\..\..\Spring.Net.snk"/> </if> ! </if> </target> --- 411,415 ---- <property name="compiler.args" value="/keyfile:..\..\..\Spring.Net.snk"/> </if> ! </target> *************** *** 448,463 **** <target name="build-1.0"> <call target="set-build-namespaces-release"/> ! ! <if test="${property::exists('project.build.package') and project.build.package}"> ! <call target="set-release-build-configuration"/> ! <echo message="--------------------------"/> ! <echo message="Building .NET 1.0 RELEASE "/> ! <echo message="--------------------------"/> ! <call target="compile-build-1.0"/> ! </if> ! ! <echo message="--------------------------"/> ! <echo message="Building .NET 1.0 DEBUG "/> ! <echo message="--------------------------"/> <call target="set-debug-build-configuration"/> <call target="compile-build-1.0"/> --- 445,451 ---- <target name="build-1.0"> <call target="set-build-namespaces-release"/> ! <echo message="-------------------"/> ! <echo message="Building .NET 1.0 "/> ! <echo message="-------------------"/> <call target="set-debug-build-configuration"/> <call target="compile-build-1.0"/> *************** *** 467,508 **** <target name="build-1.1"> <call target="set-build-namespaces-release"/> <call target="set-debug-build-configuration"/> <call target="compile-build-1.1"/> - - <if test="${property::exists('project.build.package') and project.build.package}"> - <call target="set-release-build-configuration"/> - <call target="compile-build-1.1"/> - </if> </target> <target name="build-2.0"> <call target="set-build-namespaces-release"/> <call target="set-debug-build-configuration"/> <call target="compile-build-2.0"/> - - <if test="${property::exists('project.build.package') and project.build.package}"> - <call target="set-release-build-configuration"/> - <call target="compile-build-2.0"/> - </if> - </target> <target name="build-mono-2.0"> <call target="set-build-namespaces-release"/> ! ! <if test="${property::exists('project.build.package') and project.build.package}"> ! <call target="set-release-build-configuration"/> ! <echo message="--------------------------"/> ! <echo message="Building MONO 2.0 RELEASE "/> ! <echo message="--------------------------"/> ! <call target="compile-build-mono-2.0"/> ! </if> ! ! <echo message="--------------------------"/> ! <echo message="Building MONO 2.0 DEBUG "/> ! <echo message="--------------------------"/> <call target="set-debug-build-configuration"/> <call target="compile-build-mono-2.0"/> - </target> --- 455,481 ---- <target name="build-1.1"> <call target="set-build-namespaces-release"/> + <echo message="-------------------"/> + <echo message="Building .NET 1.1 "/> + <echo message="-------------------"/> <call target="set-debug-build-configuration"/> <call target="compile-build-1.1"/> </target> <target name="build-2.0"> <call target="set-build-namespaces-release"/> + <echo message="-------------------"/> + <echo message="Building .NET 2.0 "/> + <echo message="-------------------"/> <call target="set-debug-build-configuration"/> <call target="compile-build-2.0"/> </target> <target name="build-mono-2.0"> <call target="set-build-namespaces-release"/> ! <echo message="--------------------------"/> ! <echo message="Building MONO 2.0 DEBUG "/> ! <echo message="--------------------------"/> <call target="set-debug-build-configuration"/> <call target="compile-build-mono-2.0"/> </target> *************** *** 613,620 **** <target name="package" depends="set-package-configuration" description="Build and Package distribution"> - <property name="project.build.package" value="true"/> - <call target="clean-current-package-dir"/> --- 586,591 ---- *************** *** 627,632 **** <call target="prepare-docs"/> <exec workingdir="./doc" program="cmd.exe" commandline="/c ant refdoc"/> ! <call target="set-release-build-configuration"/> <call target="package-release-files"/> </target> --- 598,604 ---- <call target="prepare-docs"/> <exec workingdir="./doc" program="cmd.exe" commandline="/c ant refdoc"/> ! <call target="package-release-files"/> + </target> *************** *** 893,897 **** <exclude name="**/examples/**"/> <exclude name="**/results/**"/> ! <exclude name="mono/**"/> </fileset> </copy> --- 865,869 ---- <exclude name="**/examples/**"/> <exclude name="**/results/**"/> ! <exclude name="mono/**"/> </fileset> </copy> Index: readme.txt =================================================================== RCS file: /cvsroot/springnet/Spring.Net/readme.txt,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** readme.txt 4 Apr 2008 15:24:17 -0000 1.35 --- readme.txt 29 Apr 2008 04:06:01 -0000 1.36 *************** *** 1,3 **** ! THE SPRING.NET FRAMEWORK, Release 1.1.1 (April 4, 2007) -------------------------------------------------------------------- http://www.springframework.net/ --- 1,3 ---- ! THE SPRING.NET FRAMEWORK, Release 1.1.1 (April 7, 2007) -------------------------------------------------------------------- http://www.springframework.net/ *************** *** 132,144 **** To build the source and run the unit tests type ! nant test NOTE! You need to comment out the <startup> section of NAnt.exe.config in order to property run unit tests under different version of the .NET framework. ! Release builds are strongly named using the Spring.Net.snk key file. The ANTLR assemblies are signed with this key as well until such time as the ANTR distribution provides their ! own strongly signed assemblies. If you want to run the release build you can generate a ! key file by executing the following commands sn -k Spring.Net.snk --- 132,144 ---- To build the source and run the unit tests type ! nant test -D:project.build.sign=false NOTE! You need to comment out the <startup> section of NAnt.exe.config in order to property run unit tests under different version of the .NET framework. ! Debug builds are strongly named using the Spring.Net.snk key file. The ANTLR assemblies are signed with this key as well until such time as the ANTR distribution provides their ! own strongly signed assemblies. If you want to run the build to creat strongly signed ! assebmlies you can generate a key file by executing the following commands sn -k Spring.Net.snk Index: Spring.include =================================================================== RCS file: /cvsroot/springnet/Spring.Net/Spring.include,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Spring.include 1 Apr 2008 19:51:02 -0000 1.10 --- Spring.include 29 Apr 2008 04:06:01 -0000 1.11 *************** *** 240,245 **** <attribute type="AssemblyVersionAttribute" value="${assembly.version}" /> ! <attribute type="AssemblyDelaySignAttribute" value="false" if="${current.build.config == 'release'}" /> ! <attribute type="AssemblyKeyFileAttribute" value="${assembly.keyfile}" if="${current.build.config == 'release' and (nant.settings.currentframework == 'net-1.0' or nant.settings.currentframework == 'net-1.1')}" /> --- 240,245 ---- <attribute type="AssemblyVersionAttribute" value="${assembly.version}" /> ! <attribute type="AssemblyDelaySignAttribute" value="false"/> ! <attribute type="AssemblyKeyFileAttribute" value="${assembly.keyfile}" if="${(nant.settings.currentframework == 'net-1.0' or nant.settings.currentframework == 'net-1.1')}" /> |
