Menu
▾
▴
[Smartfrog-checkins] core/smartfrog build.xml,1.53,1.54
|
From: Steve L. <st...@us...> - 2005-08-26 13:04:10
|
Update of /cvsroot/smartfrog/core/smartfrog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv370/smartfrog Modified Files: build.xml Log Message: use properties more; use <java> instead of <exec> for jjdoc. some classpath fixup. Index: build.xml =================================================================== RCS file: /cvsroot/smartfrog/core/smartfrog/build.xml,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** build.xml 2 Aug 2005 05:14:29 -0000 1.53 --- build.xml 26 Aug 2005 13:04:00 -0000 1.54 *************** *** 44,48 **** <property name="Name.Company" value="(C) Copyright 1998-2005 Hewlett-Packard Development Company, LP"/> <property name="version" value="CORE"/> - <!--property name="Version" value="3.04.019.beta"/--> <property name="year" value="2005"/> <echo level="verbose"> --- 44,47 ---- *************** *** 91,107 **** <!-- =================================================================== --> <path id="smartfrog.class.path"> ! <pathelement path="${classpath};lib/log4j-1.2.8.jar"/> ! <pathelement path="${classpath};lib/jmxri.jar"/> ! <pathelement path="${classpath};lib/mx4j-tools.jar"/> ! <pathelement path="${classpath};lib/sf-scripting.jar"/> ! <pathelement path="${classpath};lib/bsh-1.3.0.jar"/> </path> <!-- =================================================================== --> <!-- Global properties --> <!-- =================================================================== --> <!-- properties file to modify version.sf --> <property file="sf-build-version.properties"/> ! <!-- override point --> ! <property file="build.properties"/> <property environment="env"/> <!-- Release Directories --> --- 90,109 ---- <!-- =================================================================== --> <path id="smartfrog.class.path"> ! <pathelement path="${classpath}"/> ! <pathelement location="lib/log4j-1.2.8.jar"/> ! <pathelement location="lib/jmxri.jar"/> ! <pathelement location="lib/mx4j-tools.jar"/> ! <pathelement location="lib/sf-scripting.jar"/> ! <pathelement location="lib/bsh-1.3.0.jar"/> </path> <!-- =================================================================== --> <!-- Global properties --> <!-- =================================================================== --> + <!-- local and one level up settings are read in before anything else --> + <property file="build.properties"/> + <property file="../build.properties"/> <!-- properties file to modify version.sf --> <property file="sf-build-version.properties"/> ! <property environment="env"/> <!-- Release Directories --> *************** *** 178,182 **** --> <!-- save everything to a file --> ! <property name="Version" value="${sf.majorRelease}.${sf.minorRelease}.${sf.build}${sf.status}"/> <!-- save everything to a file --> --- 180,185 ---- --> <!-- save everything to a file --> ! <property name="smartfrog.version" value="${sf.majorRelease}.${sf.minorRelease}.${sf.build}${sf.status}"/> ! <property name="Version" value="${smartfrog.version}"/> <!-- save everything to a file --> *************** *** 266,270 **** <!-- 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"/> </javac> --- 269,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"/> </javac> *************** *** 278,285 **** 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"/> </rmic> --- 284,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"/> </rmic> *************** *** 446,455 **** </javadoc> <!-- Java doc for the grammars --> ! <exec executable="java"> ! <arg line="-cp ${javacc.dir}/javacc.jar"/> ! <arg line="jjdoc"/> <arg line="-OUTPUT_FILE=${docs}/DefaultParser.html"/> <arg line="${src}/org/smartfrog/sfcore/languages/sf/DefaultParser.jj"/> ! </exec> </target> <!-- =================================================================== --> --- 454,464 ---- </javadoc> <!-- Java doc for the grammars --> ! <java classname="jjdoc" failonerror="true"> <arg line="-OUTPUT_FILE=${docs}/DefaultParser.html"/> <arg line="${src}/org/smartfrog/sfcore/languages/sf/DefaultParser.jj"/> ! <classpath> ! <pathelement location="${javacc.dir}/javacc.jar"/> ! </classpath> ! </java> </target> <!-- =================================================================== --> *************** *** 487,496 **** <!-- 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> <!-- sfServices.jar --> <target name="sfServicesJar" depends="build,target-names"> ! <jar jarfile="${sf-services.jar}" basedir="${build.classes.dir}" includes="**/services/**" manifest="${manifestName}"/> </target> --- 496,507 ---- <!-- 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> <!-- sfServices.jar --> <target name="sfServicesJar" depends="build,target-names"> ! <jar jarfile="${sf-services.jar}" basedir="${build.classes.dir}" ! includes="**/services/**" manifest="${manifestName}"/> </target> *************** *** 504,521 **** <target name="jars" depends="initdist,sfJar,sfServicesJar,sfExamplesJar"> </target> ! <!-- =================================================================== --> ! <!-- Initialization path for SF Libs --> ! <!-- =================================================================== --> ! <!-- ! path id="smartfrog.run.class.path"> ! <pathelement location="${dist.lib.dir}/smartfrog.jar"/> ! <pathelement location="${dist.lib.dir}/sfServices.jar"/> ! <pathelement location="${dist.lib.dir}/sfExamples.jar"/> ! </path ! --> <!-- =================================================================== --> <!-- build, create jars and signs them. --> <!-- =================================================================== --> <target name="secureBuild" depends="build,jars,signJars"/> <!-- =================================================================== --> <!-- create security buld file --> --- 515,524 ---- <target name="jars" depends="initdist,sfJar,sfServicesJar,sfExamplesJar"> </target> ! <!-- =================================================================== --> <!-- build, create jars and signs them. --> <!-- =================================================================== --> <target name="secureBuild" depends="build,jars,signJars"/> + <!-- =================================================================== --> <!-- create security buld file --> *************** *** 565,568 **** --- 568,572 ---- <!-- =================================================================== --> <target name="fromclean" depends="clean,sfParseTest,dist"/> + <!-- =================================================================== --> <!-- sfParse parsertargets --> *************** *** 570,578 **** <target name="sfParseTest" depends="build,jars"> <java classname="org.smartfrog.SFParse" failonerror="true" fork="true"> - <!--classpathref="smartfrog.run.class.path"--> <classpath> ! <pathelement location="${dist.lib.dir}/smartfrog-${Version}.jar"/> ! <pathelement location="${dist.lib.dir}/sfServices-${Version}.jar"/> ! <pathelement location="${dist.lib.dir}/sfExamples-${Version}.jar"/> <pathelement location="${dist.lib.dir}/sf-scripting.jar"/> </classpath> --- 574,581 ---- <target name="sfParseTest" depends="build,jars"> <java classname="org.smartfrog.SFParse" failonerror="true" fork="true"> <classpath> ! <pathelement location="${smartfrog.jar}"/> ! <pathelement location="${sf-services.jar}"/> ! <pathelement location="${sf-examples.jar}"/> <pathelement location="${dist.lib.dir}/sf-scripting.jar"/> </classpath> |