Menu
▾
▴
[Smartfrog-checkins] core/smartfrog build.xml,1.56,1.57 buildRelease.xml,1.27,1.28 rmitargets,1.34,1.35
|
From: Julio G. <ju...@us...> - 2005-12-16 14:36:31
|
Update of /cvsroot/smartfrog/core/smartfrog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13547/smartfrog Modified Files: build.xml buildRelease.xml rmitargets Log Message: New automatic test scripts. Index: rmitargets =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/rmitargets,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** rmitargets 13 Dec 2005 17:40:02 -0000 1.34 --- rmitargets 16 Dec 2005 14:36:20 -0000 1.35 *************** *** 63,64 **** --- 63,65 ---- org/smartfrog/services/os/java/FlattenLocalFilesPolicy.class org/smartfrog/services/os/java/LoadClassImpl.class + org/smartfrog/services/ant/AntImpl.class \ No newline at end of file Index: build.xml =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/build.xml,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** build.xml 17 Nov 2005 07:32:06 -0000 1.56 --- build.xml 16 Dec 2005 14:36:20 -0000 1.57 *************** *** 96,99 **** --- 96,100 ---- <pathelement location="lib/sf-scripting.jar"/> <pathelement location="lib/bsh-1.3.0.jar"/> + <pathelement location="lib/ant.jar"/> </path> <!-- =================================================================== --> *************** *** 105,109 **** <!-- properties file to modify version.sf --> <property file="sf-build-version.properties"/> ! <property environment="env"/> <!-- Release Directories --> --- 106,110 ---- <!-- properties file to modify version.sf --> <property file="sf-build-version.properties"/> ! <property environment="env"/> <!-- Release Directories --> *************** *** 132,135 **** --- 133,137 ---- <property name="jdocs" value="${docs}/jdocs"/> <property name="SFjdocs" value="${docs}/SFjdocs"/> + <property name="test" value="test"/> <property name="dist.lib.dir" location="${dist.dir}/${lib}"/> <property name="dist.bin.dir" location="${dist.dir}/${bin}"/> *************** *** 142,145 **** --- 144,148 ---- <property name="dist.SFjdocs.dir" location="${dist.dir}/${SFjdocs}"/> <property name="java.class.path" location="${dist.dir}/${SFjdocs}"/> + <property name="dist.test.dir" location="${dist.dir}/${test}"/> <!--property name="redist" value="redist"/ --> <property name="examplesFiles" value="org/smartfrog/examples/**/*"/> *************** *** 236,239 **** --- 239,243 ---- <mkdir dir="${dist.signedLib.dir}"/> <mkdir dir="${dist.src.dir}"/> + <mkdir dir="${dist.test.dir}"/> </target> <!-- =================================================================== --> *************** *** 270,276 **** <!-- Compile the java code --> <echo>${javac.java.version} build.compiler=${build.compiler} javac.compiler=${javac.compiler}</echo> ! <javac compiler="${javac.compiler}" srcdir="${src.dir}" ! includes="**/*.java" destdir="${build.classes.dir}" ! debug="${javac.debug.mode}" debuglevel="${javac.debug.level}" includeAntRuntime="false" source="${javac.java.version}" target="${javac.java.version}"> <classpath refid="smartfrog.class.path"/> --- 274,280 ---- <!-- Compile the java code --> <echo>${javac.java.version} build.compiler=${build.compiler} javac.compiler=${javac.compiler}</echo> ! <javac compiler="${javac.compiler}" srcdir="${src.dir}" ! includes="**/*.java" destdir="${build.classes.dir}" ! debug="${javac.debug.mode}" debuglevel="${javac.debug.level}" includeAntRuntime="false" source="${javac.java.version}" target="${javac.java.version}"> <classpath refid="smartfrog.class.path"/> *************** *** 285,293 **** We'd need to fork rmic to get decent isolation. --> ! <rmic includesfile="${rmitargets}" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> <classpath refid="smartfrog.class.path"/> </rmic> ! <rmic includesfile="${rmitargets}Examples" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> <classpath refid="smartfrog.class.path"/> --- 289,297 ---- We'd need to fork rmic to get decent isolation. --> ! <rmic includesfile="${rmitargets}" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> <classpath refid="smartfrog.class.path"/> </rmic> ! <rmic includesfile="${rmitargets}Examples" compiler="${rmic.compiler}" stubversion="1.2" base="${build.classes.dir}"> <classpath refid="smartfrog.class.path"/> *************** *** 399,402 **** --- 403,417 ---- </copy> </target> + + <!-- =================================================================== --> + <!-- --> + <!-- =================================================================== --> + <target name="copyTest" depends="initdist"> + <copy todir="${dist.test.dir}"> + <fileset dir="${test}"> + <include name="**/*"/> + </fileset> + </copy> + </target> <!-- =================================================================== --> <!-- Copy binary files. --> *************** *** 472,476 **** <pathelement location="${javacc.dir}/javacc.jar"/> </classpath> ! </java> </target> <!-- =================================================================== --> --- 487,491 ---- <pathelement location="${javacc.dir}/javacc.jar"/> </classpath> ! </java> </target> <!-- =================================================================== --> *************** *** 508,512 **** <!-- SmartFrog Jar --> <target name="sfJar" depends="build,target-names"> ! <jar jarfile="${smartfrog.jar}" basedir="${build.classes.dir}" includes="**/smartfrog/**" excludes="**/services/**,**/examples/**" manifest="${manifestName}"/> </target> --- 523,527 ---- <!-- SmartFrog Jar --> <target name="sfJar" depends="build,target-names"> ! <jar jarfile="${smartfrog.jar}" basedir="${build.classes.dir}" includes="**/smartfrog/**" excludes="**/services/**,**/examples/**" manifest="${manifestName}"/> </target> *************** *** 514,518 **** <target name="sfServicesJar" depends="build,target-names"> ! <jar jarfile="${sf-services.jar}" basedir="${build.classes.dir}" includes="**/services/**" manifest="${manifestName}"/> </target> --- 529,533 ---- <target name="sfServicesJar" depends="build,target-names"> ! <jar jarfile="${sf-services.jar}" basedir="${build.classes.dir}" includes="**/services/**" manifest="${manifestName}"/> </target> *************** *** 532,536 **** <!-- =================================================================== --> <target name="secureBuild" depends="build,jars,signJars"/> ! <!-- =================================================================== --> <!-- create security buld file --> --- 547,551 ---- <!-- =================================================================== --> <target name="secureBuild" depends="build,jars,signJars"/> ! <!-- =================================================================== --> <!-- create security buld file --> *************** *** 548,552 **** <!-- DIST --> <!-- =================================================================== --> ! <target name="dist" depends="build,initdist,jars,copylibs,copybins,copyPrivate,copydocs, copyexamples,copyTestCA,buildSetup,fixCRLF,srczip" description="Prepares distribution package"> </target> <!-- =================================================================== --> --- 563,567 ---- <!-- DIST --> <!-- =================================================================== --> ! <target name="dist" depends="build,initdist,jars,copylibs,copybins,copyPrivate,copydocs, copyexamples,copyTestCA,copyTest,buildSetup,fixCRLF,srczip" description="Prepares distribution package"> </target> <!-- =================================================================== --> *************** *** 580,584 **** <!-- =================================================================== --> <target name="fromclean" depends="clean,sfParseTest,dist"/> ! <!-- =================================================================== --> <!-- sfParse parsertargets --> --- 595,599 ---- <!-- =================================================================== --> <target name="fromclean" depends="clean,sfParseTest,dist"/> ! <!-- =================================================================== --> <!-- sfParse parsertargets --> Index: buildRelease.xml =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/buildRelease.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** buildRelease.xml 17 Nov 2005 07:32:06 -0000 1.27 --- buildRelease.xml 16 Dec 2005 14:36:20 -0000 1.28 *************** *** 231,238 **** <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/csfExtensions.pdf"/> <include name="${dist}/docs/jdocs/**"/> --- 231,238 ---- <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/csfExtensions.pdf"/> <include name="${dist}/docs/jdocs/**"/> *************** *** 258,267 **** <include name="docs/ant_tasks_for_smartfrog.pdf"/> <include name="docs/IDE_development.pdf"/> ! <include name="docs/components/filesystem.pdf"/> <include name="docs/csfExtensions.pdf"/> ! <include name="docs/components/**"/> ! <include name="docs/antTasksManual/**"/> ! <include name="docs/skin/**"/> ! <include name="docs/images/**"/> <include name="lib/**"/> <!--include name="lib/**/*-${version}.jar"/> --- 258,267 ---- <include name="docs/ant_tasks_for_smartfrog.pdf"/> <include name="docs/IDE_development.pdf"/> ! <include name="docs/components/filesystem.pdf"/> <include name="docs/csfExtensions.pdf"/> ! <include name="docs/components/**"/> ! <include name="docs/antTasksManual/**"/> ! <include name="docs/skin/**"/> ! <include name="docs/images/**"/> <include name="lib/**"/> <!--include name="lib/**/*-${version}.jar"/> *************** *** 270,273 **** --- 270,274 ---- <include name="private/**"/> <include name="testCA/**"/> + <include name="test/**"/> <include name="javacc/*"/> <include name="build.xml"/> *************** *** 308,317 **** <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/filesystem.pdf"/> <include name="${dist}/docs/csfExtensions.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/jdocs/**"/> </zipfileset> --- 309,318 ---- <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/filesystem.pdf"/> <include name="${dist}/docs/csfExtensions.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/jdocs/**"/> </zipfileset> *************** *** 346,355 **** <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/filesystem.pdf"/> <include name="${dist}/docs/csfExtensions.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/jdocs/**"/> </tarfileset> --- 347,356 ---- <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/filesystem.pdf"/> <include name="${dist}/docs/csfExtensions.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/jdocs/**"/> </tarfileset> *************** *** 384,393 **** <include name="docs/ant_tasks_for_smartfrog.pdf"/> <include name="docs/IDE_development.pdf"/> ! <include name="docs/components/filesystem.pdf"/> <include name="docs/csfExtensions.pdf"/> ! <include name="docs/components/**"/> ! <include name="docs/antTasksManual/**"/> ! <include name="docs/skin/**"/> ! <include name="docs/images/**"/> <include name="lib/**"/> <!--include name="lib/*-${version}.jar"/> --- 385,394 ---- <include name="docs/ant_tasks_for_smartfrog.pdf"/> <include name="docs/IDE_development.pdf"/> ! <include name="docs/components/filesystem.pdf"/> <include name="docs/csfExtensions.pdf"/> ! <include name="docs/components/**"/> ! <include name="docs/antTasksManual/**"/> ! <include name="docs/skin/**"/> ! <include name="docs/images/**"/> <include name="lib/**"/> <!--include name="lib/*-${version}.jar"/> *************** *** 396,399 **** --- 397,401 ---- <include name="private/**"/> <include name="testCA/**"/> + <include name="test/**"/> <include name="javacc/*"/> <include name="build.xml"/> *************** *** 449,458 **** <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/filesystem.pdf"/> <include name="${dist}/docs/csfExtensions.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/jdocs/**"/> </tarfileset> --- 451,460 ---- <include name="${dist}/docs/ant_tasks_for_smartfrog.pdf"/> <include name="${dist}/docs/IDE_development.pdf"/> ! <include name="${dist}/docs/components/filesystem.pdf"/> <include name="${dist}/docs/csfExtensions.pdf"/> ! <include name="${dist}/docs/components/**"/> ! <include name="${dist}/docs/antTasksManual/**"/> ! <include name="${dist}/docs/skin/**"/> ! <include name="${dist}/docs/images/**"/> <include name="${dist}/docs/jdocs/**"/> </tarfileset> |