Changeset 11515


Ignore:
Timestamp:
12/30/08 15:56:12 (13 years ago)
Author:
Mark Evenson
Message:

Remove references to building 'j' in the 'abcl' build.xml.

To build 'j', one needs additional sources and resources that [are
best found in the 'j' branch][j].

The best way to build 'j', is via using the [version of build.xml
before the great-ant-refactoring][j-build.xml]. An older version of
this file can be obtained via the proper digging through the
svn:common-lisp.net repository.

[j]: svn://common-lisp.net/project/armedbear/svn/trunk/j

[j-build.xml]: http://abcl-dynamic-install.googlecode.com/svn/trunk/abcl/j-build.xml

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build.xml

    r11499 r11515  
    1818    <property name="abcl.jar.path"
    1919        value="${dist.dir}/abcl.jar"/>
    20     <property name="j.jar.path"
    21         value="${dist.dir}/j.jar"/>
    2220
    2321    <target name="help">
     
    3331 abcl.clean
    3432    -- remove ABCL intermediate files</echo>
    35       <echo>Corresponding targets for J exist, but currently aren't as well tested.
    36       </echo>
     33      <echo>Corresponding targets for J have been removed.</echo>
    3734    </target>
    3835
     
    4138    <property name="abcl.build.path"
    4239        value="${build.classes.dir}/org/armedbear/lisp/build"/>
    43     <property name="j.version.path"
    44         value="${build.classes.dir}/org/armedbear/j/version"/>
    45     <property name="j.build.path"
    46         value="${build.classes.dir}/org/armedbear/j/build"/>
    4740
    4841    <target name="abcl.stamp" depends="abcl.compile">
     
    6861    </target>
    6962
    70     <target name="j.stamp" depends="abcl.stamp,j.compile">
    71       <echo message="${build}" file="${j.build.path}"/>   
    72     </target>
    73 
    7463    <target name="abcl.stamp.version" depends="abcl.compile">
    7564      <java fork="true"
     
    8675      <mkdir dir="${abcl.version.path}/.."/>
    8776      <echo message="${abcl.version}" file="${abcl.version.path}"/>
     77
     78      <!-- Set from commandline via -D or in 'build.properties' -->
     79      <property name="build.version" value="abcl.svn"/>
     80      <echo>Build-Version: ${build.version}</echo>
    8881    </target>
    8982
    9083    <target name="abcl.stamp.hostname">
    91       <property name="j.build.path"
    92     value="${build.classes.dir}/org/armedbear/j/build"/>
    9384      <exec executable="hostname" outputproperty="abcl.hostname"/>
    9485      <echo>abcl.hostname: ${abcl.hostname}</echo>
    95     </target>
    96 
    97     <target name="j.stamp.hostname">
    98       <echo message="${abcl.hostname}" file="${j.build.path}" append="yes"/>
    9986    </target>
    10087
     
    10289      <include name="org/armedbear/lisp/*.java"/>
    10390      <include name="org/armedbear/lisp/util/*.java"/>
    104       <include name="org/armedbear/Main.java"/>
    105     </patternset>
    106    
     91    </patternset>
     92
    10793    <patternset id="abcl.source.lisp">
    10894      <include name="org/armedbear/lisp/*.lisp"/>
    10995      <include name="org/armedbear/lisp/tests/*.lisp"/>
    110       <include name="org/armedbear/lisp/java/awt/*.lisp"/>
    111       <include name="org/armedbear/lisp/java/awt/*.java"/>
     96    </patternset>
     97
     98    <patternset id="abcl.scripting.source.java">
     99      <include name="org/armedbear/lisp/scripting/*.java"/>
     100      <include name="org/armedbear/lisp/scripting/util/*.java"/>
     101    </patternset>
     102
     103    <patternset id="abcl.scripting.source.lisp">
     104      <include name="org/armedbear/lisp/scripting/lisp/*.lisp"/>
    112105    </patternset>
    113106
     
    125118    </patternset>
    126119   
    127     <patternset id="j.source">
    128       <include name="Main.java"/>
    129       <include name="gnu/regexp/*.java"/>
    130       <include name="org/armedbear/j/**/*.java"/>
    131       <!-- Assumed to need the org.armedbear.lisp.awt.* classes as ABCL
    132            itself doesn't seem to need them. -->
    133       <include name="org/armedbear/lisp/awt/*.class"/>
    134     </patternset>
    135 
    136     <patternset id="j.objects">
    137       <patternset refid="abcl.objects"/>
    138       <include name="Main.class"/>
    139       <include name="gnu/regexp/*.class"/>
    140       <include name="org/armedbear/j/**/*.class"/>
    141     </patternset>
    142 
    143     <patternset id="j.resources.src">
    144       <include name="**/*.keywords"/>
    145       <include name="org/armedbear/j/version"/>
    146       <include name="org/armedbear/j/build"/>
    147       <include name="org/armedbear/j/snapshot"/>
    148       <include name="org/armedbear/j/images/*.png"/>
    149       <include name="gnu/regexp/MessagesBundle.properties"/>
    150     </patternset>
    151 
    152     <patternset id="j.resources.top">
    153       <include name="COPYING"/>
    154       <include name="doc/*.html"/>
    155       <include name="doc/*.css"/>
    156       <include name="themes/*"/>
    157       <include name="examples/*"/>
    158     </patternset>
    159 
    160120    <path id="abcl.classpath.dist">
    161121      <pathelement location="${abcl.jar.path}"/>
     
    169129      <echo>Compiled ABCL with java version: ${java.version}</echo>
    170130    </target>
    171 
    172     <target name="j.pre-compile" depends="abcl.pre-compile"/>
    173131
    174132    <target name="abcl.pre-compile">
     
    177135      <mkdir dir="${build.dir}"/>
    178136      <mkdir dir="${build.classes.dir}"/>
    179 
    180       <property name="j.compile.version.path"
    181     value="${build.classes.dir}/org/armedbear/j/version"/>
    182137
    183138      <property name="java.path"
     
    222177      <echo message="${build}"
    223178      file="${build.classes.dir}/org/armedbear/lisp/build"/>
    224     </target>
    225 
    226     <target name="j.compile" depends="j.pre-compile">
    227       <javac destdir="${build.classes.dir}"
    228        debug="true"
    229        target="1.5">
    230   <src path="${src.dir}"/>
    231   <patternset refid="j.source"/>
    232       </javac>
    233179    </target>
    234180
     
    251197      <exclude name="org/armedbear/lisp/runtime-class.lisp"/>
    252198      <exclude name="org/armedbear/lisp/run-benchmarks.lisp"/>
    253       <exclude name="org/armedbear/lisp/j.lisp"/>
    254199    </patternset>
    255200
     
    356301    </target>
    357302
    358     <target name="j.jar" depends="j.compile,j.stamp">
    359       <copy todir="${build.classes.dir}">
    360   <fileset dir="${basedir}/src">
    361     <patternset refid="j.objects"/>
    362     <patternset refid="j.resources.src"/>
    363   </fileset>
    364       </copy>
    365       <jar destfile="${j.jar.path}"
    366      compress="true"
    367      basedir="${build.classes.dir}">
    368   <patternset refid="j.objects"/>
    369   <patternset refid="j.resources.src"/>
    370   <manifest>
    371     <attribute name="Main-Class" value="Main"/>
    372     <section name="org/armedbear/lisp">
    373       <attribute name="Implementation-Title" value="ABCL"/>
    374       <attribute name="Implementation-Version"  value="${abcl.version}"/>
    375     </section>
    376   </manifest>
    377       </jar>
    378     </target>
    379 
    380     <target name="j.dist" depends="j.jar">
    381       <mkdir dir="${dist.dir}"/>
    382       <copy todir="dist">
    383   <fileset dir="${basedir}">
    384     <patternset refid="j.resources.top"/>
    385   </fileset>
    386       </copy>
    387     </target>
    388 
    389303    <target name="abcl.clean">
    390304      <delete dir="${build.dir}"/>
     
    410324  </fileset>
    411325      </apply>
    412     </target>
    413 
    414     <target name="j.jpty" depends="j.jpty.compile"/>
    415 
    416     <target name="j.jpty.compile" if="unix">
    417       <exec executable="gcc" dir="${src.dir}/jpty">
    418   <arg line="-Wall -O2 jpty.c -o jpty"/>
    419       </exec>
    420     </target>
    421 
    422     <target name="j.install" depends="j.jar,j.install.unix,j.install.windows">
    423       <property name="j.install.data.dir" value="${j.install.root}/share"/>
    424       <property name="j.install.bin.dir" value="${j.install.root}/bin"/>
    425 
    426       <mkdir dir="${j.install.data.dir}/j"/>
    427       <copy file="${dist.dir}/j.jar" todir="${j.install.data.dir}/j"/>
    428       <!-- set via '-Djava.options=JAVA_OPTIONS' or in 'build.properties -->
    429       <property name="java.options" value=""/>
    430       <copy file="${j.wrapper.file}.in" toFile="${j.install.bin.dir}/${j.wrapper.file}">
    431   <filterset>
    432     <filter token="JAVA"
    433       value="${java.path}"/>
    434     <filter token="JAVA_OPTIONS"
    435       value="${java.options}"/>
    436     <filter token="CLASSPATH"
    437       value="${j.install.data.dir}/j/j.jar"/>
    438   </filterset>
    439       </copy>
    440       <chmod file="${j.install.bin.dir}/j" perm="ugo+rx"/>
    441 
    442       <property name="j.install.themes.path"
    443     value="${j.install.data.dir}/j/themes"/>
    444       <mkdir dir="${j.install.themes.dir}"/>
    445       <copy todir="{j.install.themes.dir}">
    446   <fileset dir="${basedir}/themes"/>
    447       </copy>
    448 
    449       <property name="j.install.doc.path"
    450     value="${j.install.data.dir}/doc/j"/>
    451       <mkdir dir="${j.install.doc.dir}" />
    452 
    453       <copy file="${basedir}/src/jpty/jpty"
    454             todir="${j.install.bin.dir}"
    455       failonerror="false"/>
    456       <chmod file="${j.install.bin.dir}/jpty" perm="ugo+rx"/>
    457       <copy todir="${j.install.data.dir}/doc/j">
    458   <fileset dir="${basedir}/doc"/>
    459       </copy>
    460     </target>
    461 
    462     <target name="j.install.unix" depends="j.jpty" if="unix">
    463       <property name="j.install.root" value="/usr/local"/>
    464       <property name="j.wrapper.file" value="j"/>
    465     </target>
    466 
    467     <target name="j.install.windows" depends="j.jpty" if="windows">
    468       <property name="j.install.root" value="c:/j"/>
    469       <property name="j.wrapper.file" value="j.bat"/>
    470326    </target>
    471327
Note: See TracChangeset for help on using the changeset viewer.