diff --git a/Makefile b/Makefile index bb8ee08..87e8670 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ PROJECT_VERSION=`./debianize.sh getversion` DISTPREFIX=artloglaby DISTJAR=$(DISTPREFIX)-$(PROJECT_VERSION).jar +JDEE_VERSION=2.4.1 all: build.xml dist/lib/$(DISTJAR) @@ -25,6 +26,8 @@ clean: cleanall: clean rm -rf debian rm -rf deb + rm -rf download + @( [ -d ~/.emacs.d/jdee-$(JDEE_VERSION) ] && echo "DON'T remove installed ~/.emacs.d/jdee-$(JDEE_VERSION). To remove jdee do 'make removejdee'" ) || true debian: mkdir debian @@ -43,4 +46,20 @@ debian/%: deb: debian debian/rules debian/control debian/compat debian/changelog deb/javadoc deb/jlibs dpkg-buildpackage -uc -us -.PHONY: clean all cleanall getname deb +/usr/bin/emacs: + sudo apt-get install emacs + +download/jdee-bin-$(JDEE_VERSION).tar.bz2: + mkdir -p download; cd download; wget http://sourceforge.net/projects/jdee/files/jdee/$(JDEE_VERSION)/jdee-bin-$(JDEE_VERSION).tar.bz2 + +~/.emacs.d/jdee-$(JDEE_VERSION): /usr/bin/emacs download/jdee-bin-$(JDEE_VERSION).tar.bz2 + mkdir -p ~/.emacs.d; tar -xjf download/jdee-bin-$(JDEE_VERSION).tar.bz2 -C ~/.emacs.d + echo "(add-to-list 'load-path \"~/.emacs.d/jdee-$(JDEE_VERSION)/lisp\")\n(load \"jde\")" >>~/.emacs.d/init.el + +emacsdevenv: ~/.emacs.d/jdee-$(JDEE_VERSION) + +removejdee: + rm -rf ~/.emacs.d/jdee-$(JDEE_VERSION) + sed -i -n -e "/^(add-to-list 'load-path \"~\/\.emacs\.d\/jdee-$(JDEE_VERSION)\/lisp\")$$/d" -e "/^(load \"jde\")$$/d" -e"/^.*$$/p" ~/.emacs.d/init.el + +.PHONY: clean all cleanall getname deb emacsdevenv removejdee diff --git a/doit.sh b/doit.sh index daf657c..0fb6d5a 100755 --- a/doit.sh +++ b/doit.sh @@ -213,7 +213,7 @@ action=initial while [[ $action != quit ]] do - action=$($DIALOG --menu "Ultra Light IDE" 20 80 12 readme "Read me" clean "Clean All" ant "Ant build" run "Run it" list_labs "Show Labyrinth with blender" test "Test it" code "Code" codebg "Code in background" deb "Debian package" properties "Edit Properties" create "Create a new class" quit "Quit" 3>&1 1>&2 2>&3) + action=$($DIALOG --menu "Ultra Light IDE" 20 80 12 readme "Read me" clean "Clean All" ant "Ant build" run "Run it" list_labs "Show Labyrinth with blender" test "Test it" code "Code" codebg "Code in background" deb "Debian package" properties "Edit Properties" create "Create a new class" emacsdevenv "Setup Emacs java bindings JDEE" quit "Quit" 3>&1 1>&2 2>&3) if [[ $action == run ]] then @@ -263,5 +263,8 @@ do elif [[ $action == list_labs ]] then list_labs ./lab + elif [[ $action == emacsdevenv ]] + then + make $action fi done diff --git a/java/TODO b/java/TODO index f9c82d4..fc5d406 100644 --- a/java/TODO +++ b/java/TODO @@ -12,4 +12,5 @@ CONSOLE : * saving in stream ( better than in toString() that basically fails... ) - format : -3D format ( for 3Dprinting ) \ No newline at end of file +3D format ( for 3Dprinting ) +