Gentoo Attachment #46257 for bug #73018

View | Details | Raw Unified
Collapse All | Expand All

(-) rhino1_6R1.orig/build.properties (-1 / +1 lines)

Lines 48-54 classes: ${build.dir}/classes	Link Here

# compilation settings

# compilation settings

debug: on

debug: on

target-jvm: 1.1

target-jvm: 1.3

# jar generation settings

# jar generation settings

jar-compression: true

jar-compression: true

(-) rhino1_6R1.orig/src/build.xml (+1 lines)

Lines 15-20 Requires Ant version 1.2	Link Here

           deprecation="on"

           deprecation="on"

           debug="${debug}"

           debug="${debug}"

	   target="${target-jvm}"

	   target="${target-jvm}"

	   source="${target-jvm}"

    </javac>

    </javac>

    <copy todir="${classes}">

    <copy todir="${classes}">

(-) rhino1_6R1.orig/toolsrc/build.xml (-1 / +2 lines)

Lines 19-25 Requires Ant version 1.2	Link Here

           includes="org/**/*.java"

           includes="org/**/*.java"

           deprecation="on"

           deprecation="on"

           debug="${debug}"

           debug="${debug}"

	   target="${target-jvm}">

	   target="${target-jvm}"

	   source="${target-jvm}">

    </javac>

    </javac>

    <copy todir="${classes}">

    <copy todir="${classes}">

      <fileset dir="toolsrc" includes="org/**/*.properties" />

      <fileset dir="toolsrc" includes="org/**/*.properties" />

(-) rhino1_6R1.orig/toolsrc/org/mozilla/javascript/tools/debugger/build.xml (-3 / +1 lines)

Lines 3-9	Link Here

<project name="toolsrc" default="help" basedir=".">

<project name="toolsrc" default="help" basedir=".">

  <target name="properties">

  <target name="properties">

    <property name="swing-ex-url" value="http://java.sun.com/products/jfc/tsc/articles/treetable2/downloads/src.zip"/>

    <available file="downloaded/AbstractCellEditor.java"

    <available file="downloaded/AbstractCellEditor.java"

               property="swing-ex-available"/>

               property="swing-ex-available"/>

  </target>

  </target>

Lines 13-20	Link Here

         the files we don't need, and change the package

         the files we don't need, and change the package

-->

-->

    <mkdir dir="downloaded"/>

    <mkdir dir="downloaded"/>

    <get src="${swing-ex-url}" dest="downloaded/swingExSrc.zip"/>

    <unzip src="../../../../../../swingExSrc.zip" dest="downloaded/">

    <unzip src="downloaded/swingExSrc.zip" dest="downloaded/">

      <patternset>

      <patternset>

          <include name="AbstractCellEditor.java"/>

          <include name="AbstractCellEditor.java"/>

          <include name="JTreeTable.java"/>

          <include name="JTreeTable.java"/>

(-) rhino1_6R1.orig/xmlimplsrc/build.xml (-46 / +1 lines)

Lines 12-18	Link Here

  <target name="compile" unless="without-xmlimpl">

  <target name="compile" unless="without-xmlimpl">

    <available property="xbean-present?" file="${xbean.jar}" />

    <available property="xbean-present?" file="${xbean.jar}" />

    <antcall target="xbean-get" />

    <condition property="xmlimpl-compile?">

    <condition property="xmlimpl-compile?">

      <and>

      <and>

Lines 35-41	Link Here

    </condition>

    </condition>

    <antcall target="do-compile" />

    <antcall target="do-compile" />

    <antcall target="do-not-compile" />

  </target>

  </target>

Lines 48-53	Link Here

           deprecation="on"

           deprecation="on"

           debug="${debug}"

           debug="${debug}"

	   target="${target-jvm}"

	   target="${target-jvm}"

	   source="${target-jvm}"

	   classpathref="xmlimpl.classpath"

	   classpathref="xmlimpl.classpath"

	   failonerror="${xmlimpl.compile.failonerror}"

	   failonerror="${xmlimpl.compile.failonerror}"

Lines 55-69	Link Here

  </target>

  </target>

  <target name="do-not-compile" unless="xmlimpl-compile?">

<echo>

Skipping compilation of E4X implementation due to lack of

javax.xml.namespace.*, org.apache.xmlbeans.*  classes

</echo>

  </target>

  <target name="copy-source">

  <target name="copy-source">

    <mkdir dir="${dist.dir}/xmlimplsrc"/>

    <mkdir dir="${dist.dir}/xmlimplsrc"/>

    <copy todir="${dist.dir}/xmlimplsrc">

    <copy todir="${dist.dir}/xmlimplsrc">

Lines 79-117 javax.xml.namespace.*, org.apache.xmlbea	Link Here

               includes="org/mozilla/javascript/xmlimpl/**"/>

               includes="org/mozilla/javascript/xmlimpl/**"/>

    </delete>

    </delete>

  </target>

  </target>

  <target name="xbean-get" unless="xbean-present?">

    <property

     name="xbean.url"

     value="http://www.apache.org/dist/xml/xmlbeans/xmlbeans-current.zip"

/>

    <property name="xbean.tmp" location="${build.dir}/tmp-xbean" />

    <property name="xbean.zip" location="${xbean.tmp}/xbean.zip" />

    <mkdir dir="${xbean.tmp}"/>

    <get src="${xbean.url}" dest="${xbean.zip}" ignoreerrors="true" />

    <available property="xbean-zip-present?" file="${xbean.zip}" />

    <antcall target="xbean-unzip" />

  </target>

  <target name="xbean-unzip" if="xbean-zip-present?">

    <unzip src="${xbean.zip}" dest="${xbean.tmp}">

      <patternset includes="xmlbeans-*/lib/xbean.jar" />

    </unzip>

    <mkdir dir="${lib}" />

    <copy tofile="${xbean.jar}">

      <fileset dir="${xbean.tmp}" includes="xmlbeans-*/lib/xbean.jar" />

    </copy>

    <delete dir="${xbean.tmp}" />

  </target>

</project>

</project>

Attachment #46257: rhino-1.6-gentoo.patch for bug #73018