From f7ab15d506312e68510df6678a9ce08906df0fca Mon Sep 17 00:00:00 2001
From: paullandes <paullandes@381a1f10-3442-0410-997e-ef331cd04102>
Date: Sat, 22 Nov 2008 22:28:59 +0000
Subject: [PATCH] emacs lisp build now works

git-svn-id: http://jdee.svn.sourceforge.net/svnroot/jdee/branches/paul_landes/jde@56 381a1f10-3442-0410-997e-ef331cd04102
---
 build.el                                      | 29 ----------------
 build.xml                                     | 33 +++++++++++--------
 ...-default.properties => default.properties} |  0
 BUGS => doc/BUGS                              |  0
 4 files changed, 20 insertions(+), 42 deletions(-)
 delete mode 100644 build.el
 rename config/{config-default.properties => default.properties} (100%)
 rename BUGS => doc/BUGS (100%)

diff --git a/build.el b/build.el
deleted file mode 100644
index 33bbfa9..0000000
--- a/build.el
+++ /dev/null
@@ -1,29 +0,0 @@
-;; -*- Mode: Emacs-Lisp -*- 
-
-;; Author: Dimitre Liotev (dl@znain.net)
-
-;; This file compiles the Elisp source files in the "lisp" directory.
-;; Invoke it in the following way:
-
-;;     emacs --script build.el
-
-;; Note that you must have the appropriate versions of the Cedet and
-;; Elib packages and the environment variables CEDET_HOME and ELIB_HOME
-;; must be defined in your environment.
-
-
-(load-file "./build-options.el")
-(add-to-list 'load-path (concat cedet-home "/common"))
-(add-to-list 'load-path (concat cedet-home "/eieio"))
-(add-to-list 'load-path (concat cedet-home "/semantic"))
-(add-to-list 'load-path (concat cedet-home "/semantic/bovine"))
-(add-to-list 'load-path (concat cedet-home "/speedbar"))
-(add-to-list 'load-path elib-home)
-(add-to-list 'load-path (expand-file-name"./lisp"))
-
-
-(message "%s" load-path)
-
-(load (expand-file-name "lisp/jde.el"))
-
-(byte-recompile-directory (expand-file-name "lisp") 0)
diff --git a/build.xml b/build.xml
index 6fa318f..2144b6c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<project name="jdee" default="compile">
+<project name="jdee" default="configure-ebuild">
 
   <property name="project.dir" location="."/>
 
@@ -34,7 +34,7 @@
     <property file="${user.home}/.jdee-config.properties"/>
 
     <!-- project specific defaults (not user or instance specific) -->
-    <property file="${project.dir}/config-default.properties"/>
+    <property file="${config.dir}/default.properties"/>
 
     <propertyfile file="${config.build.file}" comment="user editable build configuration parameters">
       <entry key="config.time" type="date" value="now"/>
@@ -44,33 +44,40 @@
     </propertyfile>
   </target>
 
-  <target name="configure-ebuild" depends="init">
+  <target name="configure-ebuild" depends="configure">
     <mkdir dir="${build.lisp.dir}"/>
+
+    <uptodate property="lisp-is-uptodate">
+      <srcfiles dir="${build.lisp.dir}" includes="*.el"/>
+      <mapper type="glob" from="*.el" to="*.elc"/>
+    </uptodate>
+
     <copy todir="${build.lisp.dir}">
       <fileset dir="${src.lisp.dir}" includes="*.el"/>
     </copy>
 
-    <!--uptodate property="lisp-is-uptodate">
-      <srcfiles dir="lisp" includes="*.el"/>
-      <mapper type="glob" from="*.el" to="*.elc"/>
-    </uptodate-->
-
 <echo file="${build.lisp.file}">
 (dolist (path '("common"
 		"eieio"
 		"semantic"
 		"semantic/bovine"
 		"speedbar"
-		elib-home
-		"lisp"))
-  (add-to-list 'load-path path t))
-(byte-recompile-directory (expand-file-name "lisp") 0)
+		))
+  (add-to-list 'load-path (expand-file-name path "${cedet.dir}") t))
+(message "LOAD PATH: %s" (mapconcat #'identity load-path ":"))
+(add-to-list 'load-path "${src.lisp.dir}")
+(byte-recompile-directory (expand-file-name "${build.lisp.dir}") 0)
 </echo>
   </target>
 
-  <target name="compile" depends="init-compile">
+  <target name="compile-ebuild" depends="configure-ebuild" if="lisp-is-uptodate">
+    <exec dir="${build.lisp.dir}" executable="emacs">
+      <arg value="--script"/>
+      <arg value="build.el"/>
+    </exec>
   </target>
 
+
   <target name="clean" depends="init">
     <delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
diff --git a/config/config-default.properties b/config/default.properties
similarity index 100%
rename from config/config-default.properties
rename to config/default.properties
diff --git a/BUGS b/doc/BUGS
similarity index 100%
rename from BUGS
rename to doc/BUGS