[Sandev-cvs] sand/apps/basics/build mainbuild.xml,1.27,1.28

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

Update of /cvsroot/sandev/sand/apps/basics/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26587

Modified Files:
	mainbuild.xml 
Log Message:
removed SAND_HOME property previously set to ${runenv.SAND_HOME}
modified scrubgen and other targets to use ../../.. rather than
${SANDHOME} as the base directory reference.

Index: mainbuild.xml
===================================================================
RCS file: /cvsroot/sandev/sand/apps/basics/build/mainbuild.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mainbuild.xml	19 Aug 2010 23:38:35 -0000	1.27
--- mainbuild.xml	22 Aug 2010 07:09:00 -0000	1.28
***************
*** 151,156 ****
           **************************************** -->

-     <!-- main root for referencing between dependent projects -->
-         <property name="SAND_HOME" value="${runenv.SAND_HOME}"/>
      <!-- need tools for code generators -->
          <property name="JAVA_LIB" value="${runenv.JAVA_HOME}/lib"/>
--- 151,154 ----
***************
*** 509,526 ****

! <!-- Hard clean just the generator output.  If you get into a circular
! build problem due to a partially compiled generator tag, use this
! target to scrub just the generator classes so you can get back to
! work.  This solves the problem where some partially compiled generator
! classes are out of sync with others and the build doesn't make it
! through the initial setup it needs.
  -->
  <target name="scrubgen" depends="checkenv">
!   <delete dir="${SAND_HOME}/apps/basics/build/genclasses"/>
!   <delete dir="${SAND_HOME}/apps/ui/build/genclasses"/>
!   <delete file="${SAND_HOME}/apps/basics/build/env/basics_gen.jar"
            failonerror="false"/>
!   <delete file="${SAND_HOME}/apps/basics/build/env/ui_gen.jar"
            failonerror="false"/>
  </target>

--- 507,527 ----

! <!-- Hard clean just the generator output.  If your build get stuck
! due to a partially compiled generator tag, and you can't build or
! scrub, use this target to scrub just the generator classes so you can
! get back to work.  This solves the problem where some partially
! compiled generator classes are out of sync with others and the build
! doesn't make it through the initial setup it needs.  
! 
! This assumes that we are in sand/apps/basics/build (or
! sand/xxx/xxx/xxx), and it only cleans out generators from basics or ui
  -->
  <target name="scrubgen" depends="checkenv">
!   <delete file="../../../apps/basics/build/env/basics_gen.jar"
            failonerror="false"/>
!   <delete file="../../../apps/basics/build/env/ui_gen.jar"
            failonerror="false"/>
+   <delete dir="../../../apps/basics/build/genclasses"/>
+   <delete dir="../../../apps/ui/build/genclasses"/>
  </target>

***************
*** 667,708 ****
      <scp todir="${publish.username}:${publish.password}@${publish.server}:${publish.remotedir}"
           trust="true">
!         <fileset dir="${SAND_HOME}">
              <include name="sand.zip"/>
          </fileset>
      </scp>
!     <delete file="${SAND_HOME}/sand.zip"/>
      <!-- Unpack the docs on the server -->
      <get src="http://${publish.server}/cgi-bin/unzip.cgi" 
!         dest="${SAND_HOME}/unused.foo" 
          verbose="true"/> 
!     <delete file="${SAND_HOME}/unused.foo"/>
  </target>

  <!-- Zip everything except CVS files and FTP the result to sourceforge -->
  <target name="publish.release" depends="publish.release.zip">
!   <echo message="FTP is no longer supported by sourceforge. Use web upload."/>
! <!--
!     <taskdef name="ftp" classname="org.apache.tools.ant.taskdefs.optional.net.FTP"/>
!     <ftp server="upload.sourceforge.net"
!         userid="anonymous"
!         password="bu...@sa..."
!         remotedir="incoming"
!         depends="yes"
!         passive="yes"
!         ignoreNoncriticalErrors="yes"
!         >
!         <fileset dir="${SAND_HOME}/../">
!             <include name="${publish.releasename}.zip"/>
!         </fileset>
!     </ftp>
!     <delete file="${SAND_HOME}/../${publish.releasename}.zip"/>
!     <echo message="don't forget to update publish.releasename in mainbuild.xml"/>
! -->
  </target>

  <!-- Zip all the open source code minus the CVS files -->
  <target name="publish.release.zip" depends="scrub">
!     <zip destfile="${SAND_HOME}/../${publish.releasename}.zip">
!         <fileset dir="${SAND_HOME}/../">
              <include name="sand/readme.html"/>
              <include name="sand/apps/basics/**/*.*"/>
--- 668,692 ----
      <scp todir="${publish.username}:${publish.password}@${publish.server}:${publish.remotedir}"
           trust="true">
!         <fileset dir="../../../">
              <include name="sand.zip"/>
          </fileset>
      </scp>
!     <delete file="../../../sand.zip"/>
      <!-- Unpack the docs on the server -->
      <get src="http://${publish.server}/cgi-bin/unzip.cgi" 
!         dest="../../../unused.foo" 
          verbose="true"/> 
!     <delete file="../../../unused.foo"/>
  </target>

<target name="publish.release" depends="publish.release.zip">
!   <echo message="Upload ${publish.releasename}.zip using the sourceforge admin interface."/>
  </target>

  <!-- Zip all the open source code minus the CVS files -->
  <target name="publish.release.zip" depends="scrub">
!     <zip destfile="../../../../${publish.releasename}.zip">
!         <fileset dir="../../../../">
              <include name="sand/readme.html"/>
              <include name="sand/apps/basics/**/*.*"/>
***************
*** 721,726 ****
  <!-- zip only the open source docs into SAND_HOME/sand.zip -->
  <target name="release.zip.docs" depends="checkenv">
!     <zip destfile="${SAND_HOME}/sand.zip">
!         <fileset dir="${SAND_HOME}/../">
              <include name="sand/*.html"/>
              <include name="sand/docs/**/*.*"/>
--- 705,710 ----
  <!-- zip only the open source docs into SAND_HOME/sand.zip -->
  <target name="release.zip.docs" depends="checkenv">
!     <zip destfile="../../../sand.zip">
!         <fileset dir="../../../../">
              <include name="sand/*.html"/>
              <include name="sand/docs/**/*.*"/>
***************
*** 745,750 ****
  <!-- zip all the docs into SAND_HOME/sand.zip -->
  <target name="zip.docs" depends="checkenv">
!     <zip destfile="${SAND_HOME}/sand.zip">
!         <fileset dir="${SAND_HOME}/../">
              <include name="sand/**/docs/**/*.*"/>
              <include name="sand/**/genjavadoc/**/*.*"/>
--- 729,734 ----
  <!-- zip all the docs into SAND_HOME/sand.zip -->
  <target name="zip.docs" depends="checkenv">
!     <zip destfile="../../../sand.zip">
!         <fileset dir="../../../../">
              <include name="sand/**/docs/**/*.*"/>
              <include name="sand/**/genjavadoc/**/*.*"/>
***************
*** 761,766 ****
  <!-- zip all the executable .jar/.war/.sar files into SAND_HOME/sandexe.zip -->
  <target name="zip.exe" depends="checkenv">
!     <zip destfile="${SAND_HOME}/sandexe.zip">
!         <fileset dir="${SAND_HOME}/platform/tools/env">
              <include name="*.jar"/>
              <include name="*.war"/>
--- 745,750 ----
  <!-- zip all the executable .jar/.war/.sar files into SAND_HOME/sandexe.zip -->
  <target name="zip.exe" depends="checkenv">
!     <zip destfile="../../../sandexe.zip">
!         <fileset dir="../../../platform/tools/env">
              <include name="*.jar"/>
              <include name="*.war"/>