[armedbear-cvs] r12354 - in trunk/abcl: . nbproject

[Mark Evenson]

Author: mevenson
Date: Sat Jan  9 15:26:51 2010
New Revision: 12354

Log:
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.


Modified:
   trunk/abcl/nbproject/project.properties
   trunk/abcl/netbeans-build.xml

Modified: trunk/abcl/nbproject/project.properties
==============================================================================
--- trunk/abcl/nbproject/project.properties	(original)
+++ trunk/abcl/nbproject/project.properties	Sat Jan  9 15:26:51 2010
@@ -1,10 +1,11 @@
 application.title=abcl
 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
 build.test.classes.dir=${build.dir}/test/classes
@@ -43,6 +44,7 @@
 javadoc.use=true
 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/
 jnlp.enabled=false

Modified: trunk/abcl/netbeans-build.xml
==============================================================================
--- trunk/abcl/netbeans-build.xml	(original)
+++ trunk/abcl/netbeans-build.xml	Sat Jan  9 15:26:51 2010
@@ -7,20 +7,7 @@
   <import file="nbproject/build-impl.xml"/>
 
   <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>