[NAntC-cvs] NAntContrib NAntContrib.build,1.118,1.119

[<dri...@us...>]

Update of /cvsroot/nantcontrib/NAntContrib
In directory sc8-pr-cvs16:/tmp/cvs-serv11762

Modified Files:
	NAntContrib.build 
Log Message:
Moved MSI/MSM templates to etc directory.
Embed MSI/MSM templates in NAnt.Contrib.Tasks.dll assembly to simplify deployment.

Index: NAntContrib.build
===================================================================
RCS file: /cvsroot/nantcontrib/NAntContrib/NAntContrib.build,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** NAntContrib.build	25 Feb 2007 18:53:41 -0000	1.118
--- NAntContrib.build	16 Apr 2007 13:26:26 -0000	1.119
***************
*** 127,134 ****
                  <include name="Interop.WindowsInstaller.dll" />
                  <include name="Interop.MsmMergeTypeLib.dll" />
-                 <include name="MSITaskErrors.mst" />
-                 <include name="MSITaskTemplate.msi" />
-                 <include name="MSMTaskErrors.mst" />
-                 <include name="MSMTaskTemplate.msm" />
              </fileset>
          </copy>
--- 127,130 ----
***************
*** 235,238 ****
--- 231,240 ----
                  <include name="**/*.xsl" />
              </resources>
+             <resources basedir="etc">
+                 <include name="MSITaskErrors.mst" />
+                 <include name="MSITaskTemplate.msi" />
+                 <include name="MSMTaskErrors.mst" />
+                 <include name="MSMTaskTemplate.msm" />
+             </resources>
          </csc>
      </target>
***************
*** 467,471 ****
      </target>
      
!     <target name = "filter-copy-help-html" >
          <!-- filter-copy static html pages -->
          <copy todir="${build.dir}" overwrite="true">
--- 469,473 ----
      </target>
      
!     <target name="filter-copy-help-html">
          <!-- filter-copy static html pages -->
          <copy todir="${build.dir}" overwrite="true">
***************
*** 527,537 ****
                  <include name="bin/Interop.WindowsInstaller.dll" />
                  <include name="bin/SourceSafe.Interop.dll" />
-                 <!-- msi/msm dependencies -->
-                 <include name="bin/MSITaskErrors.mst" />
-                 <include name="bin/MSITaskTemplate.msi" />
-                 <include name="bin/MSMTaskErrors.mst" />
-                 <include name="bin/MSMTaskTemplate.msm" />
                  <!-- sources -->
                  <include name="src/**/*" />
                  <!-- unit tests -->
                  <include name="tests/**/*" />
--- 529,536 ----
                  <include name="bin/Interop.WindowsInstaller.dll" />
                  <include name="bin/SourceSafe.Interop.dll" />
                  <!-- sources -->
                  <include name="src/**/*" />
+                 <!-- varia -->
+                 <include name="etc/**/*" />
                  <!-- unit tests -->
                  <include name="tests/**/*" />
***************
*** 578,581 ****
--- 577,600 ----
      <target name="package" depends="package-src, package-bin" description="Creates a binary and source distribution package." />
  
+     <target name="install" depends="build">
+         <!-- install NAntContrib extension assembly -->
+         <copy todir="${nant::get-base-directory()}/extensions/common/neutral/NAntContrib" overwrite="true">
+             <fileset basedir="${build.dir}/bin">
+                 <include name="NAnt.Contrib.Tasks.*" />
+             </fileset>
+         </copy>
+         <!-- install third-party & support assemblies -->
+         <copy todir="${nant::get-base-directory()}/lib/common/neutral/NAntContrib" overwrite="true">
+             <fileset basedir="${build.dir}/bin">
+                 <include name="CollectionGen.dll" />
+                 <include name="Interop.MsmMergeTypeLib.dll" />
+                 <include name="Interop.StarTeam.dll" />
+                 <include name="Interop.WindowsInstaller.dll" />
+                 <include name="SLiNgshoT.Core.dll" />
+                 <include name="SourceSafe.Interop.dll" />
+             </fileset>
+         </copy>
+     </target>
+ 
      <!-- Framework support targets -->
      <target name="set-framework-configuration">