[Ccnet-checkins] ccnet ccnet.build,1.4,1.5

[<mik...@us...>]

Update of /cvsroot/ccnet/ccnet
In directory sc8-pr-cvs1:/tmp/cvs-serv6049

Modified Files:
	ccnet.build 
Log Message:
Updating build script for web deployment. 
Now we just create a sub-directory for the deployed web app and point IIS at this. This works with log directory too since we now allow relative paths for that

Index: ccnet.build
===================================================================
RCS file: /cvsroot/ccnet/ccnet/ccnet.build,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ccnet.build	19 May 2003 02:11:30 -0000	1.4
--- ccnet.build	26 May 2003 21:55:15 -0000	1.5
***************
*** 10,20 ****
  
      <!-- CHANGE this property when you want to deploy the webapp to a different URL -->
!     <property name="webapp.name" value="${nant.project.name}"/>
  
      <property name="build.dir" value="build"/>
      <property name="src.dir" value="project"/>
      <property name="lib.dir" value="lib"/>
-     <property name="web.dir" value="c:\inetpub\wwwroot"/>
-     <property name="webapp.dir" value="${web.dir}\${webapp.name}"/>
      <property name="package.dir" value="package"/>
  
--- 10,19 ----
  
      <!-- CHANGE this property when you want to deploy the webapp to a different URL -->
!     <property name="webapp.name" value="ccnetdev"/>
!     <property name="webapp.dir" value=".\web\${webapp.name}"/>
  
      <property name="build.dir" value="build"/>
      <property name="src.dir" value="project"/>
      <property name="lib.dir" value="lib"/>
      <property name="package.dir" value="package"/>
  
***************
*** 22,26 ****
      <property name="console.exe" value="ccnet.exe"/>
      <property name="service.exe" value="service.exe"/>
!     <property name="web.dll" value="${webapp.name}.web.dll"/>
      <property name="integration.dll" value="ccnet.integration.test.dll"/>
  
--- 21,25 ----
      <property name="console.exe" value="ccnet.exe"/>
      <property name="service.exe" value="service.exe"/>
!     <property name="web.dll" value="ccnet.web.dll"/>
      <property name="integration.dll" value="ccnet.integration.test.dll"/>
  
***************
*** 44,48 ****
      <target name="clean" description="cleans up everything">
          <delete dir="${build.dir}" failonerror="false"/>
!         <mkdir dir="${build.dir}"/>
      </target>
  
--- 43,47 ----
      <target name="clean" description="cleans up everything">
          <delete dir="${build.dir}" failonerror="false"/>
!         <delete dir="${webapp.dir}" failonerror="false"/>
      </target>
  
***************
*** 64,68 ****
      </target>
  
- 
      <target name="compile.remote" depends="init" description="compiles remote interface">
          <csc target="library" output="${build.dir}\ccnet.remote.dll" debug="${debug}" define="TRACE" doc="${build.dir}\remote.xml">
--- 63,66 ----
***************
*** 224,244 ****
  
      <!-- DEPLOY -->
!     <target name="deploy" depends="compile,test.unit" description="deploys the web application">
  
!         <!-- Deploy web pages and images -->
!         <call target="deploy.content"/>
  
!         <!-- Deploy web assemblies -->
!         <copy todir="${webapp.dir}\bin" verbose="${verbosity}">
!             <fileset basedir="${build.dir}">
                  <includes name="${core.dll}"/>
                  <includes name="${web.dll}"/>
              </fileset>
          </copy>
-     </target>
- 
  
-     <!-- DEPLOY WEB CONTENT TO IIS -->
-     <target name="deploy.content" description="deploys the web content (html, gif, css, etc)">
          <copy todir="${webapp.dir}">
              <fileset basedir="${src.dir}\web">
--- 222,240 ----
  
      <!-- DEPLOY -->
!     <target name="deploy" depends="compile" description="deploys the web application">
!         <mkdir dir="${webapp.dir}" verbose="${verbosity}"/>
  
!         <!-- Create web application -->
!         <echo message="Setting up IIS V-Dir, physical [${webapp.dir}], virtual [${webapp.name}]" />
!         <mkiisdir dirpath="${webapp.dir}" vdirname="${webapp.name}"/>
  
!         <copy todir="${webapp.dir}\bin" overwrite="true">
!             <fileset basedir="build">
!                 <includes name="ccnet.remote.dll"/>
                  <includes name="${core.dll}"/>
                  <includes name="${web.dll}"/>
              </fileset>
          </copy>
  
          <copy todir="${webapp.dir}">
              <fileset basedir="${src.dir}\web">
***************
*** 250,254 ****
                  <includes name="**\*.wav"/>
                  <includes name="**\*.css"/>
!                 <!-- <includes name="log\*.xml"/> -->
                  <includes name="**\*.xsl"/>
                  <includes name="**\*.config"/>
--- 246,250 ----
                  <includes name="**\*.wav"/>
                  <includes name="**\*.css"/>
!                 <includes name="log\*.xml"/>
                  <includes name="**\*.xsl"/>
                  <includes name="**\*.config"/>
***************
*** 348,355 ****
      </target>
  
-     <target name="install">
-         <call target="install.webapp"/>
-     </target>
- 
      <target name="package.msi" depends="package.init" description="creates a zip file containing the two msi packages">
          <copy todir="${package.dir}\ccnet\ccnet.server">
--- 344,347 ----
***************
*** 380,400 ****
      </target>
  
-     <!-- CREATE IIS WEB APPLICATION AND DEPLOY WEB CONTENT -->
-     <target name="install.webapp">
-         <mkdir dir="${webapp.dir}" verbose="${verbosity}"/>
- 
-         <!-- Create web application -->
-         <mkiisdir dirpath="${webapp.dir}" vdirname="${nant.project.name}"/>
- 
-         <call target="deploy.content"/>
- 
-         <copy todir="${webapp.dir}\bin" overwrite="true">
-             <fileset basedir="build">
-                 <includes name="ccnet.core.dll"/>
-                 <includes name="ccnet.dll"/>
-             </fileset>
-         </copy>
-     </target>
- 
      <!-- EXTRA TEST TARGETS -->
      <!-- use logger:SourceForge.NAnt.XmlLogger to get xml log output -->
--- 372,375 ----
***************
*** 407,410 ****
--- 382,386 ----
      </target>
  
+     <!-- Comment by MR - what's this for? -->
      <target name="updateConfig">
          <property name="in" value="etc/ccnet_update.config"/>