Update of /cvsroot/ndoc/ndoc
In directory sc8-pr-cvs1:/tmp/cvs-serv25768
Modified Files:
NDoc.build NDoc.build.include NDoc.build.package
Log Message:
- Now compiles assemblies directly in the ndoc/bin folder instead of ndoc/build/bin.
- The package target generates the zip file without copying files around.
- The zip target can be called to create the zip file with the current assemblies.
Index: NDoc.build
===================================================================
RCS file: /cvsroot/ndoc/ndoc/NDoc.build,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NDoc.build 22 Jul 2003 16:50:28 -0000 1.13
--- NDoc.build 22 Jul 2003 22:19:41 -0000 1.14
***************
*** 6,10 ****
<property name="project.build.config" value="debug" readonly="false" />
<property name="project.build.package" value="false" readonly="false" />
! <property name="build.dir" value="${nant.project.basedir}/build/${nant.project.name}-${project.version}"
readonly="false" />
<!-- Include helpers -->
--- 6,10 ----
<property name="project.build.config" value="debug" readonly="false" />
<property name="project.build.package" value="false" readonly="false" />
! <property name="build.dir" value="${nant.project.basedir}/bin"
readonly="false" />
<!-- Include helpers -->
***************
*** 147,150 ****
--- 147,151 ----
+ those targets are to help debugging ndoc on mono::
-->
***************
*** 158,162 ****
<target name="mono-core" description="Builds Core on mono::">
<call target="set-mono-1.0-runtime-configuration" force="true" />
! <call target="check-current-bin-dir" force="true" />
<nant buildfile="src/Core/Core.build" target="compile" inheritall="true" />
</target>
--- 159,163 ----
<target name="mono-core" description="Builds Core on mono::">
<call target="set-mono-1.0-runtime-configuration" force="true" />
! <call target="clean-current-bin-dir" force="true" />
<nant buildfile="src/Core/Core.build" target="compile" inheritall="true" />
</target>
***************
*** 166,170 ****
<target name="mono-msdn" description="Builds the msdn documenter on mono::">
<call target="set-mono-1.0-runtime-configuration" force="true" />
! <call target="check-current-bin-dir" force="true" />
<nant buildfile="src/Documenter/Msdn/Msdn.build" target="compile" inheritall="true" />
</target>
--- 167,171 ----
<target name="mono-msdn" description="Builds the msdn documenter on mono::">
<call target="set-mono-1.0-runtime-configuration" force="true" />
! <call target="clean-current-bin-dir" force="true" />
<nant buildfile="src/Documenter/Msdn/Msdn.build" target="compile" inheritall="true" />
</target>
Index: NDoc.build.include
===================================================================
RCS file: /cvsroot/ndoc/ndoc/NDoc.build.include,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NDoc.build.include 21 Jul 2003 23:57:56 -0000 1.10
--- NDoc.build.include 22 Jul 2003 22:19:42 -0000 1.11
***************
*** 251,257 ****
<property name="current.build.defines" value="${build.defines},NET,NET_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/bin/.net-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${build.dir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
--- 251,257 ----
<property name="current.build.defines" value="${build.defines},NET,NET_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/.net-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
***************
*** 269,275 ****
<property name="current.build.defines" value="${build.defines},NET,NET_1_1" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/bin/.net-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${build.dir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
--- 269,275 ----
<property name="current.build.defines" value="${build.defines},NET,NET_1_1" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/.net-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
***************
*** 288,294 ****
<property name="current.build.defines" value="${build.defines},NETCF,NETCF_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/bin/${current.runtime.config}-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${build.dir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
--- 288,294 ----
<property name="current.build.defines" value="${build.defines},NETCF,NETCF_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/${current.runtime.config}-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
***************
*** 306,312 ****
<property name="current.build.defines" value="${build.defines},MONO,MONO_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/bin/${current.runtime.config}-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${build.dir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
--- 306,312 ----
<property name="current.build.defines" value="${build.defines},MONO,MONO_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/${current.runtime.config}-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
***************
*** 324,330 ****
<property name="current.build.defines" value="${build.defines},SSCLI,SSCLI_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/bin/${current.runtime.config}-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${build.dir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
--- 324,330 ----
<property name="current.build.defines" value="${build.defines},SSCLI,SSCLI_1_0" readonly="false" />
<property name="current.build.optimize" value="${build.optimize}" readonly="false" />
! <property name="current.bin.dir" value="${build.dir}/${current.runtime.config}-${current.runtime.version}"
readonly="false" />
! <property name="current.sdkdoc.dir" value="${nant.project.basedir}/doc/sdk/${current.runtime.config}/${current.runtime.version}"
readonly="false" />
<property name="current.sdkdoc.debug" value="${sdkdoc.debug}" readonly="false" />
Index: NDoc.build.package
===================================================================
RCS file: /cvsroot/ndoc/ndoc/NDoc.build.package,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NDoc.build.package 21 Jul 2003 23:57:56 -0000 1.2
--- NDoc.build.package 22 Jul 2003 22:19:42 -0000 1.3
***************
*** 1,83 ****
<?xml version="1.0" ?>
<project name="NDoc-package" xmlnds="http://tempuri.org/nant-vs.xsd">
<!--
-->
<target name="package" description="Build and Package distribution" depends="check-project-version">
- <property name="current.package.zipfile" value="build/${nant.project.name}-${project.version}.zip" />
<!-- set flag to indicate that this is a package build -->
<property name="project.build.package" value="true" readonly="false" />
<call target="clean-build-dir" force="true" />
- <call target="package-examples" force="true" />
- <call target="package-src" force="true" />
- <call target="package-doc" force="true" />
- <call target="package-release-files" force="true" />
<call target="compile-release" force="true" />
! <call target="create-package-zipfile" force="true" />
! </target>
! <!--
!
! -->
! <target name="package-examples" depends="check-build-dir">
! <mkdir dir="${build.dir}/examples" />
! <copy todir="${build.dir}/examples">
! <fileset basedir="examples">
! <includes name="*.*" />
! </fileset>
! </copy>
! </target>
! <!--
!
! -->
! <target name="package-src" depends="check-build-dir">
! <mkdir dir="${build.dir}/src" />
! <copy todir="${build.dir}/src">
! <fileset basedir="src">
! <includes name="**/*" />
! <excludes name="Addins/**" />
! <excludes name="NDocGen/**" />
! <excludes name="Documenter/Msdn7/**" />
! <excludes name="**/bin/**" />
! <excludes name="**/obj/**" />
! <excludes name="**/*.csproj.user" />
! <excludes name="**/gc.log" />
! </fileset>
! </copy>
! </target>
! <!--
!
! -->
! <target name="package-doc" depends="check-build-dir">
! <mkdir dir="${build.dir}/doc" />
! <copy todir="${build.dir}/doc">
! <fileset basedir="doc">
! <includes name="**/*.*" />
! </fileset>
! </copy>
</target>
<!--
-->
! <target name="package-release-files" depends="check-build-dir">
! <copy todir="${build.dir}">
<fileset basedir=".">
<includes name="COPYING.txt" />
! <includes name="NDoc.build.*" />
<includes name="README.txt" />
<includes name="NDoc.sln" />
- </fileset>
- </copy>
- </target>
- <!--
! -->
! <target name="create-package-zipfile" depends="check-build-dir, check-current-package-zipfile">
! <!-- delete the specified zipfile if it already exists -->
! <delete file="${current.package.zipfile}" />
! <zip zipfile="${current.package.zipfile}" ziplevel="9">
! <fileset basedir="${build.dir}">
! <includes name="**/*" />
! <!-- file created by mono compiler -->
! <excludes name="**/gc.log" />
</fileset>
</zip>
--- 1,42 ----
<?xml version="1.0" ?>
<project name="NDoc-package" xmlnds="http://tempuri.org/nant-vs.xsd">
+ <property name="current.package.zipfile" value="${nant.project.name}-devel-v${project.version}.zip" />
<!--
-->
<target name="package" description="Build and Package distribution" depends="check-project-version">
<!-- set flag to indicate that this is a package build -->
<property name="project.build.package" value="true" readonly="false" />
<call target="clean-build-dir" force="true" />
<call target="compile-release" force="true" />
! <call target="zip" force="true" />
</target>
<!--
-->
! <target name="zip" depends="check-build-dir, check-current-package-zipfile">
! <!-- delete the specified zipfile if it already exists -->
! <delete file="${current.package.zipfile}" failonerror="false" />
! <zip zipfile="${current.package.zipfile}" ziplevel="9">
<fileset basedir=".">
<includes name="COPYING.txt" />
! <includes name="NDoc.build*" />
<includes name="README.txt" />
<includes name="NDoc.sln" />
! <includes name="bin/**" />
! <includes name="doc/**" />
! <!--includes name="examples/*" /-->
!
! <includes name="src/**/*" />
! <excludes name="src/Addins/**" />
! <excludes name="src/NDocGen/**" />
! <excludes name="src/**/bin/**" />
! <excludes name="src/**/obj/**" />
!
! <excludes name="**/gc.log" /> <!-- file created by mono compiler -->
! <excludes name="**/*.user" />
! <excludes name="**/*.suo" />
! <excludes name="**/.#*" /> <!-- CVS backup files -->
</fileset>
</zip>
|