[Archive-access-cvs] archive-access/projects/wera/src/installer build.xml,1.2,1.3 build-wera.xml,1.2,1.3

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/installer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14007/src/installer

Modified Files:
	build.xml build-wera.xml 
Log Message:


Index: build-wera.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/installer/build-wera.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build-wera.xml	21 Oct 2005 11:12:07 -0000	1.2
--- build-wera.xml	23 Oct 2005 15:39:59 -0000	1.3
***************
*** 9,12 ****
--- 9,13 ----
      <input message="Please enter sourceforge-username, hit enter for default [sverreb]:" addproperty="nwa.sfuser" defaultvalue="sverreb"/>
      <input message="Please enter CVS-TAG to build from. Note! The tag has to exist. Hit enter for default [head]:" addproperty="wera.cvstag" defaultvalue="head"/>
+     <input message="Please enter release number to name this build. Leave empty to use date or tag in build name:" addproperty="wera.relno" defaultvalue=""/>
      <echo message="CVS-user: ${nwa.sfuser}"/>
      
***************
*** 18,22 ****
      <!-- Properties for generating documentation  -->
      <property name="releasenotes.xml" value="${cvsexport}/archive-access/projects/wera/src/articles/releasenotes.xml"/>
!     <property name="releasenotes.html" value="${cvsexport}/releasenotes.html"/>
      
      <property name="input.file" value="${cvsexport}/archive-access/projects/wera/src/articles/manual.xml"/>
--- 19,23 ----
      <!-- Properties for generating documentation  -->
      <property name="releasenotes.xml" value="${cvsexport}/archive-access/projects/wera/src/articles/releasenotes.xml"/>
!     <property name="releasenotes.html" value="${cvsexport}/articles/releasenotes.html"/>
      
      <property name="input.file" value="${cvsexport}/archive-access/projects/wera/src/articles/manual.xml"/>
***************
*** 29,35 ****
  
      <echo message="Fetching source code ... "/>
!     <tstamp>
!       <format property="weraversion" pattern="yyyyMMddHHmm"/>
! 	</tstamp>
      <if>
        <equals arg1="${wera.cvstag}" arg2="head" />
--- 30,46 ----
  
      <echo message="Fetching source code ... "/>
!   
!     <if>
!       <equals arg1="${wera.relno}" arg2="" />
!       <then>
!         <tstamp>
!           <format property="weraversion" pattern="yyyyMMddHHmm"/>
!         </tstamp>
!       </then>
!       <else>
!         <property name="weraversion" value="${wera.relno}"/>
!       </else>
!     </if>
!     
      <if>
        <equals arg1="${wera.cvstag}" arg2="head" />

Index: build.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/installer/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	21 Oct 2005 11:12:07 -0000	1.2
--- build.xml	23 Oct 2005 15:39:59 -0000	1.3
***************
*** 38,47 ****
      </copy>
  
!     <mkdir dir="${apacheWebRootDir}/wera/manual"/>
!     <mkdir dir="${apacheWebRootDir}/wera/manual/images"/>
!     <copy file="${basedir}/temp/manual/manual.html" tofile="${apacheWebRootDir}/wera/manual/manual.html"/>
!     <!--<copy file="${basedir}/temp/manual/manual.pdf" tofile="${apacheWebRootDir}/wera/manual/manual.pdf"/>-->
!     <copy todir="${apacheWebRootDir}/wera/manual/images">
!       <fileset dir="${basedir}/temp/manual/images"/>
      </copy>
  
--- 38,47 ----
      </copy>
  
!     <mkdir dir="${apacheWebRootDir}/wera/articles"/>
!     <mkdir dir="${apacheWebRootDir}/wera/articles/images"/>
!     <copy file="${basedir}/temp/articles/manual.html" tofile="${apacheWebRootDir}/wera/articles/manual.html"/>
!     <!--<copy file="${basedir}/temp/articles/manual.pdf" tofile="${apacheWebRootDir}/wera/manual/manual.pdf"/>-->
!     <copy todir="${apacheWebRootDir}/wera/articles/images">
!       <fileset dir="${basedir}/temp/articles/images"/>
      </copy>