Changeset 12354

Timestamp:

01/09/10 20:26:51 (13 years ago)

Author:

Mark Evenson

Message:

Align Netbeans build with pure Ant-based build.

Netbeans no longer copies the lisp-based source to the build
directory, meaning the final FASLs refer to the original source
location like in the Ant-based build.

Location:

trunk/abcl

Files:

• nbproject/project.properties (modified) (2 diffs)
• netbeans-build.xml (modified) (1 diff)

trunk/abcl/nbproject/project.properties

@@ -2 +2 @@
 application.vendor=
 build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form,**/*.lisp
 # This directory is removed when the project is cleaned:
 build.dir=build
 build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
 # Only compile against the classpath explicitly listed here:
 build.sysclasspath=ignore
@@ -44 +45 @@
 javadoc.version=false
 javadoc.windowtitle=
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
 jnlp.codebase.type=local
 jnlp.codebase.url=file:/Users/evenson/work/abcl/dist/

trunk/abcl/netbeans-build.xml

@@ -8 +8 @@
 
   <target name="-post-compile">
-    <echo>build.classes.dir: ${build.classes.dir}</echo>
-      <copy todir="${build.classes.dir}">
-  <fileset dir="${basedir}/src">
-    <patternset refid="abcl.source.lisp"/>
-  </fileset>
-      </copy>
-
-      <java classpath="${build.classes.dir}"
-      fork="true"
-      classname="org.armedbear.lisp.Main">
-  <arg value="--noinit"/>
-  <arg value="--eval"/>
-  <arg value="(compile-system :zip nil :quit t)"/>
-      </java>
+    <antcall target="abcl.compile.lisp"/>
   </target>
 </project>