|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
|
|
svn commit: r832616 - in /activemq/activemq-dotnet: Apache.NMS.ActiveMQ/trunk/ Apache.NMS.EMS/trunk/ Apache.NMS.MSMQ/trunk/ Apache.NMS.Stomp/trunk/ Apache.NMS.WCF/trunk/ Apache.NMS/trunk/ vendor/NUnit/2.4.8/Author: jgomes
Date: Tue Nov 3 23:46:54 2009 New Revision: 832616 URL: http://svn.apache.org/viewvc?rev=832616&view=rev Log: Fixed downloading vendor files and checking for missing references. Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/nant.build Tue Nov 3 23:46:54 2009 @@ -61,11 +61,6 @@ </target> <target name="dependency-init" description="Initializes build dependencies"> - <if test="${not file::exists(Apache.NMS.dll)}"> - <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." /> - <property name="build.skip" value="true" /> - </if> - <assemblyfileset failonempty="true" id="dependencies"> <include name="${current.build.framework.assembly.dir}/mscorlib.dll" /> <include name="${current.build.framework.assembly.dir}/System.dll" /> Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> Modified: activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build (original) +++ activemq/activemq-dotnet/Apache.NMS.EMS/trunk/nant.build Tue Nov 3 23:46:54 2009 @@ -72,11 +72,6 @@ </target> <target name="dependency-init" description="Initializes build dependencies"> - <if test="${not file::exists(Apache.NMS.dll)}"> - <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." /> - <property name="build.skip" value="true" /> - </if> - <assemblyfileset failonempty="true" id="dependencies"> <include name="${current.build.framework.assembly.dir}/mscorlib.dll" /> <include name="${current.build.framework.assembly.dir}/System.dll" /> Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build (original) +++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant.build Tue Nov 3 23:46:54 2009 @@ -62,11 +62,6 @@ </target> <target name="dependency-init" description="Initializes build dependencies"> - <if test="${not file::exists(Apache.NMS.dll)}"> - <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." /> - <property name="build.skip" value="true" /> - </if> - <assemblyfileset failonempty="true" id="dependencies"> <include name="${current.build.framework.assembly.dir}/mscorlib.dll" /> <include name="${current.build.framework.assembly.dir}/System.dll" /> Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build (original) +++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/nant.build Tue Nov 3 23:46:54 2009 @@ -58,11 +58,6 @@ </target> <target name="dependency-init" description="Initializes build dependencies"> - <if test="${not file::exists(Apache.NMS.dll)}"> - <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." /> - <property name="build.skip" value="true" /> - </if> - <assemblyfileset failonempty="true" id="dependencies"> <include name="${current.build.framework.assembly.dir}/mscorlib.dll" /> <include name="${current.build.framework.assembly.dir}/System.dll" /> Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> Modified: activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build (original) +++ activemq/activemq-dotnet/Apache.NMS.WCF/trunk/nant.build Tue Nov 3 23:46:54 2009 @@ -63,11 +63,6 @@ </target> <target name="dependency-init" description="Initializes build dependencies"> - <if test="${not file::exists(Apache.NMS.dll)}"> - <echo message="Apache.NMS assembly for ${current.build.framework.name} is not available. Build skipped." /> - <property name="build.skip" value="true"/> - </if> - <assemblyfileset failonempty="true" id="dependencies"> <include name="${current.build.framework.assembly.dir}/mscorlib.dll"/> <include name="${current.build.framework.assembly.dir}/System.dll"/> Modified: activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml (original) +++ activemq/activemq-dotnet/Apache.NMS/trunk/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> Modified: activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml?rev=832616&r1=832615&r2=832616&view=diff ============================================================================== --- activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml (original) +++ activemq/activemq-dotnet/vendor/NUnit/2.4.8/nant-common.xml Tue Nov 3 23:46:54 2009 @@ -267,14 +267,14 @@ </foreach> </target> - <target name="compile-target" depends="init, conditional-compile" /> + <target name="compile-target" depends="init, download-vendor, conditional-compile" /> <target name="conditional-compile" depends="init" unless="${build.skip or compile.skip}" description="Conditionaly compiles all the modules if build framework and type are supported"> <call target="compile" /> </target> - <target name="compile" depends="download-vendor" description="Compile everything"> + <target name="compile" description="Compile everything"> <call target="compile-main" cascade="false" /> <call target="compile-test" cascade="false" /> </target> @@ -365,7 +365,7 @@ </target> <!-- Install the modules to the local repo --> - <target name="install" depends="init, conditional-compile, conditional-install" + <target name="install" depends="init, compile-target, conditional-install" description="Install the artifacts into the nant repo" /> <target name="conditional-install" unless="${build.skip}" @@ -415,6 +415,11 @@ VENDOR folder will be used. However, if there is a newer version installed in the local repository, then that version will be copied into the LIB folder. --> + <if test="${not directory::exists(local.repo.vendor.path)}"> + <echo message="${lib.task.dest} assembly for ${current.build.framework.name} is not available. Build skipped." /> + <property name="build.skip" value="true" /> + </if> + <foreach item="String" in="${vendor.filenames}" delim="," property="repo.task.artifact"> <property name="lib.task.dest" value="${lib.path}/${repo.task.artifact}" /> <mkdir dir="${directory::get-parent-directory(lib.task.dest)}" /> |
| Free embeddable forum powered by Nabble | Forum Help |