[nant-commits] CVS: nant NAnt.build,1.183,1.184 NAnt.spec,1.1,1.2 release.xml,1.16,1.17

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/nant/nant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29641

Modified Files:
	NAnt.build NAnt.spec release.xml 
Log Message:
Fixed a bug in the rpm task, added changelog task (currently only does changes since last release).

Index: NAnt.build
===================================================================
RCS file: /cvsroot/nant/nant/NAnt.build,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** NAnt.build	8 Sep 2004 17:15:36 -0000	1.183
--- NAnt.build	20 Sep 2004 08:02:44 -0000	1.184
***************
*** 298,301 ****
--- 298,302 ----
              <arg value="${project.config}" />
              <arg value="self-sdkdoc" />
+             <arg value="changelog" />
              <arg value="-D:project.version=${project.version}" />
              <arg value="-targetframework:${framework::get-target-framework()}" />
***************
*** 381,384 ****
--- 382,420 ----
      </target>

+     <target name="changelog" depends="init">
+         <property name="start.date" value="2003/12/26"/>
+         <property name="now" value="${datetime::now()}"/>
+         <property name="end.date" value="${datetime::get-year(now)}/${datetime::get-month(now)}/${datetime::get-day(now)}"/>
+         
+         <property name="changes.name-without-extension" value="changelog_${string::replace(start.date, '/', '-')}_to_${string::replace(end.date, '/', '-')}"/>
+         
+         <property name="cvsroot" value="${file::get-content(nant.project.basedir + '/CVS/Root')}"/>
+         <echo message="Using cvsroot: ${cvsroot}"/>
+ 
+         <cvs-changelog  start="${start.date}"
+                         end="${end.date}"
+                         xmlfile="${build.dir}/${changes.name-without-extension}.xml"
+                         destination="${nant.project.basedir}"
+                         cvsroot="${cvsroot}"
+                         module="nant"
+                         />
+         <style  style="etc/changelog.xsl" 
+                 in="${build.dir}/${changes.name-without-extension}.xml" 
+                 out="${build.dir}/${changes.name-without-extension}.html" 
+                 >
+             <parameters>
+                 <parameter name="module" value="nant"/>
+                 <parameter name="title" value="NAnt Changelog ( ${project.version} )" />
+                 <parameter name="logo" value="doc/logo.gif"/>
+                 <parameter name="cvsweb" value="http://cvs.sourceforge.net/viewcvs.py/nant/" />
+                 <parameter name="start-date" value="${start.date}"/>
+                 <parameter name="end-date" value="${end.date}"/>
+             </parameters>
+         </style> 
+         
+         <delete file="${build.dir}/${changes.name-without-extension}.xml"/>
+ 
+     </target>
+     
      <target name="deploy-schema" depends="schema" description="Deploys the Schema to VS.Net schemas dirs. For now it only copies to 7.0 and 7.1">
          <!-- retrieve location of VS.NET 2002 schema store -->
***************
*** 643,648 ****
      </target>

!     <target name="rpm" depends="init">
          <echo message="Build dir: ${build.dir}"/>
          <nant buildfile="release.xml" target="prepare-rpm"/>
          <nant buildfile="release.xml" target="binary-rpm"/>
--- 679,690 ----
      </target>

!     <target name="rpm" depends="init, build">
          <echo message="Build dir: ${build.dir}"/>
+         <copy todir="${build.dir}">
+             <fileset>
+                 <include name="NAnt.spec" />
+             </fileset>
+         </copy>
+ 
          <nant buildfile="release.xml" target="prepare-rpm"/>
          <nant buildfile="release.xml" target="binary-rpm"/>

Index: NAnt.spec
===================================================================
RCS file: /cvsroot/nant/nant/NAnt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NAnt.spec	1 Sep 2004 07:44:43 -0000	1.1
--- NAnt.spec	20 Sep 2004 08:02:44 -0000	1.2
***************
*** 9,14 ****
  Vendor: http://nant.sourceforge.net
  Packager: http://nant.sourceforge.net
! Prefix: /usr/lib/NAnt
! BuildArch: i386
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  Requires: mono
--- 9,14 ----
  Vendor: http://nant.sourceforge.net
  Packager: http://nant.sourceforge.net
! Prefix: /usr
! BuildArch: noarch
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  Requires: mono
***************
*** 24,31 ****
  project web site (http://NAnt.sourceforge.net).

- %files
- %attr(755, root, root) %{_bindir}/%{name}
- %{_libdir}/%{name}-%{version}-%{release}/*
- 
  %pre
  echo "Installing NAnt ..."
--- 24,27 ----
***************
*** 38,64 ****

  %build
! if [ -d "$RPM_BUILD_ROOT" ] && [ -d "$RPM_BUILD_ROOT"%{_libdir} ] && [ -d "$RPM_BUILD_ROOT"%{_bindir} ]
  then
      echo BuildRoot is created.
  else
!     mkdir -p "$RPM_BUILD_ROOT"%{_libdir}
!     mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
  fi

  %install
! rm -rf "$RPM_BUILD_ROOT"%{_libdir}/%{name}-%{version}-%{release}
! mkdir "$RPM_BUILD_ROOT"%{_libdir}/%{name}-%{version}-%{release}
! echo 'mono '"$RPM_BUILD_ROOT"%{_libdir}/%{name}-%{version}-%{release}'/NAnt.exe' > "$RPM_BUILD_ROOT"%{_bindir}/%{name}
! cp -R bin/* "$RPM_BUILD_ROOT"%{_libdir}/%{name}-%{version}-%{release}

  %preun
  echo "Uninstalling NAnt ..."
  %postun
! rm -rf "$RPM_BUILD_ROOT"%{_bindir}/%{name}-%{version}-%{release}
! rm -rf ${RPM_BUILD_ROOT"%{_libdir}/%{name}
  echo "NAnt has been removed from your system."

  %clean
! [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"

  %changelog
--- 34,64 ----

  %build
! if [ -d $RPM_BUILD_ROOT ] && [ -d $RPM_BUILD_ROOT%{_libdir} ] && [ -d $RPM_BUILD_ROOT%{_bindir} ]
  then
      echo BuildRoot is created.
  else
!     mkdir -p $RPM_BUILD_ROOT%{_libdir}
!     mkdir -p $RPM_BUILD_ROOT%{_bindir}
  fi

  %install
! rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}-%{release}
! mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}-%{release}
! echo 'mono '$RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}-%{release}'/NAnt.exe' > $RPM_BUILD_ROOT%{_bindir}/%{name}
! chmod a+rwx $RPM_BUILD_ROOT%{_bindir}/%{name}
! cp -R bin/* $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}-%{release}

  %preun
  echo "Uninstalling NAnt ..."
  %postun
! rm -rf $RPM_BUILD_ROOT%{_bindir}/%{name}-%{version}-%{release}
! rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}
  echo "NAnt has been removed from your system."

+ %files
+ /usr/lib/%{name}-%{version}-%{release}/*
+ 
  %clean
! [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"/*

  %changelog

Index: release.xml
===================================================================
RCS file: /cvsroot/nant/nant/release.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** release.xml	2 Sep 2004 06:50:18 -0000	1.16
--- release.xml	20 Sep 2004 08:02:44 -0000	1.17
***************
*** 135,147 ****
          <mkdir dir="${rpm.base}/SPECS"/>
          <mkdir dir="${rpm.base}/SRPMS"/>
!         <mkdir dir="${rpm.working}/tmp"/>

!         <mkdir dir="${rpm.working}/tmp/NAnt-src"/>
!         <mkdir dir="${rpm.working}/tmp/NAnt-tar"/>

      </target>    

      <target name="prepare-rpm" depends="setup-rpm" description="Prepare the binaries for packaging.">
!         <copy todir="${rpm.working}/tmp/NAnt-src">
              <fileset basedir="${build.dir}">
                  <include name="bin/**"/>
--- 135,147 ----
          <mkdir dir="${rpm.base}/SPECS"/>
          <mkdir dir="${rpm.base}/SRPMS"/>
!         <mkdir dir="${rpm.base}/tmp"/>

!         <mkdir dir="${rpm.base}/tmp/NAnt-src"/>
!         <mkdir dir="${rpm.base}/tmp/NAnt-tar"/>

      </target>    

      <target name="prepare-rpm" depends="setup-rpm" description="Prepare the binaries for packaging.">
!         <copy todir="${rpm.base}/tmp/NAnt-src">
              <fileset basedir="${build.dir}">
                  <include name="bin/**"/>
***************
*** 153,165 ****
          <exec program="bash">
              <arg value="-c -o onecmd"/>
!             <arg value="'tar -cvzf ${cygwin.rpm.working}/tmp/NAnt-tar/NAnt.tar.gz -C${cygwin.rpm.working}/tmp/NAnt-src bin'"/>
          </exec>

!         <copy file="${rpm.working}/tmp/NAnt-tar/NAnt.tar.gz" tofile="${rpm.base}/SOURCES/NAnt.tar.gz" overwrite="true"/>
          <copy file="${build.dir}/NAnt.spec" tofile="${rpm.base}/SPECS/NAnt.spec" overwrite="true"/>
      </target>

      <target name="binary-rpm" description="Build the binary rpm for NAnt.">
!         <property name="commandline" value="rpmbuild -ba --buildroot=${cygwin.rpm.working} ${cygwin.rpm.base}/SPECS/NAnt.spec"/>
          <echo file="${rpm.base}/build.bat">bash -c '${commandline}'</echo>

--- 153,165 ----
          <exec program="bash">
              <arg value="-c -o onecmd"/>
!             <arg value="'tar -cvzf ${cygwin.rpm.base}/tmp/NAnt-tar/NAnt.tar.gz -C${cygwin.rpm.base}/tmp/NAnt-src bin'"/>
          </exec>

!         <copy file="${rpm.base}/tmp/NAnt-tar/NAnt.tar.gz" tofile="${rpm.base}/SOURCES/NAnt.tar.gz" overwrite="true"/>
          <copy file="${build.dir}/NAnt.spec" tofile="${rpm.base}/SPECS/NAnt.spec" overwrite="true"/>
      </target>

      <target name="binary-rpm" description="Build the binary rpm for NAnt.">
!         <property name="commandline" value="rpmbuild -ba --buildroot=${cygwin.rpm.base}/tmp ${cygwin.rpm.base}/SPECS/NAnt.spec"/>
          <echo file="${rpm.base}/build.bat">bash -c '${commandline}'</echo>