diff options
| author | Andre Fischer <af@apache.org> | 2011-12-16 12:59:55 +0000 |
|---|---|---|
| committer | Andre Fischer <af@apache.org> | 2011-12-16 12:59:55 +0000 |
| commit | 1a85ae2b616d939c5beba46e550f7837fc693b2b (patch) | |
| tree | 84da573ecba70ca173af47cd24b84e6fc88cad55 /scripting | |
| parent | 54de47df2adf9cac89cd315a2b340c858339c830 (diff) | |
118674: Made category B code optional and disabled by default.
Diffstat (limited to 'scripting')
| -rwxr-xr-x | scripting/java/build.xml | 23 | ||||
| -rw-r--r-- | scripting/prj/build.lst | 2 |
2 files changed, 22 insertions, 3 deletions
diff --git a/scripting/java/build.xml b/scripting/java/build.xml index e068237d4618..3513092e13b4 100755 --- a/scripting/java/build.xml +++ b/scripting/java/build.xml @@ -45,6 +45,15 @@ <property environment="env"/> <property name="env.BSH_JAR" value="${solar.jar}/bsh.jar"/> + <target name="eval_environment"> + <condition property="with_rhino"> + <equals arg1="${env.ENABLE_JAVASCRIPT}" arg2="YES" /> + </condition> + <condition property="with_beanshell"> + <equals arg1="${env.ENABLE_BEANSHELL}" arg2="YES" /> + </condition> + </target> + <!-- ==================== classpath setting ============================ --> <path id="idlclasspath"> <pathelement location="${solar.jar}/jurt.jar"/> @@ -95,10 +104,12 @@ </target> <!-- ======================== Compile Classes ========================== --> - <target name="compile" depends="prepare"> + <target name="compile" depends="prepare, eval_environment"> <javac srcdir="com" destdir="${jardir}" includes="**/*.java" classpathref="idlclasspath" debug="${debug}" optimize="${optimize}" deprecation="off"> + <exclude name="**/provider/javascript/*.java" unless="with_rhino" /> + <exclude name="**/provider/beanshell/*.java" unless="with_beanshell" /> <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/> </javac> <javac srcdir="Framework/" destdir="${jardir}" @@ -156,7 +167,7 @@ </target> <!-- ===================== jar ========================= --> - <target name="jar" depends="compile"> + <target name="jar.provider.java" depends="compile"> <jar jarfile="${jardir}/ScriptProviderForJava.jar" basedir="${jardir}"> <manifest> @@ -168,7 +179,9 @@ </manifest> <include name="**/provider/java/*.class"/> </jar> + </target> + <target name="jar.provider.beanshell" depends="compile" if="with_beanshell"> <jar jarfile="${jardir}/ScriptProviderForBeanShell.jar" basedir="${jardir}"> <manifest> @@ -183,7 +196,9 @@ <include name="**/provider/beanshell/*.bsh"/> </fileset> </jar> + </target> + <target name="jar.provider.javascript" depends="compile" if="with_rhino"> <jar jarfile="${jardir}/ScriptProviderForJavaScript.jar" basedir="${jardir}"> <manifest> @@ -198,7 +213,9 @@ <include name="**/provider/javascript/*.js"/> </fileset> </jar> + </target> + <target name="jar.scriptframework" depends="compile"> <jar jarfile="${jardir}/ScriptFramework.jar" basedir="${jardir}"> <manifest> @@ -214,7 +231,9 @@ <include name="**/container/*.class"/> <include name="**/io/*.class"/> </jar> + </target> + <target name="jar" depends="jar.provider.java,jar.provider.beanshell,jar.provider.javascript,jar.scriptframework"> </target> <target name="idesupport.jar" depends="idesupport.compile"> diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst index d0ceb4cb818c..cedb0d6cc08e 100644 --- a/scripting/prj/build.lst +++ b/scripting/prj/build.lst @@ -1,4 +1,4 @@ -tc scripting : oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL +tc scripting : oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 RHINO:rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL tc scripting usr1 - all tc1_mkout NULL tc scripting\inc nmake - all tc1_inc NULL tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL |