Restored build with interactive org-publish-project support

5 files changed, 28 insertions, 37 deletions

diff --git a/Makefile.am b/Makefile.am
index 614df2f..60d1168 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,7 @@
 SUBDIRS = etc src
 
-# FIXME: use automake settings
-docdir=doc
-orgdir=org
-srcdir=src
-builddir=pub
-
 # FIXME: use a timestamp for builds: -newer $buildstamp
-ALL_ORG_FILES = $(shell find $docdir $orgdir -type f -name "*.org" -print 2>/dev/null)
-EXPORT_PAGES = $(echo $(ALL_ORG_FILES) | sed 's/.org/.html/g')
-EXPORT_PAGES += $(echo $(ALL_ORG_FILES) | sed 's/.org/.pdf/g')
-EXPORT_PAGES += $(echo $(ALL_ORG_FILES) | sed 's/.org/.txt/g')
-
-mkexport = emacs \
- -no-site-file -q -batch -l $(srcdir)/org-batch.el \
- --visit ${2/.*/.org} -f org-export-as-$1
-
-%.html : %.org
- $(call mkexport,html,$@) > $(builddir)/$(basename ${@/.*/.html})
-
-%.pdf : %.org
- $(call mkexport,pdf,$@) > $(builddir)/$(basename ${@/.*/.pdf})
-
-%.txt : %.org
- $(call mkexport,ascii,$@) > $(builddir)/$(basename ${@/.*/.txt})
+ORG_FILES = $(shell find doc org -type f -name "*.org" -print 2>/dev/null)
 
 # FIXME: use awk-server, or check more dependencies such as a web server...
 test:
@@ -41,7 +19,9 @@ test:
 @echo "sudo kill `cat etc/apache/test.pid`"
 @echo
 
-all: ${EXPORT_PAGES}
+all:
+ @mkdir pub
+ @emacs -batch -Q -l src/org-batch.el -f org-publish-project -- "autorg"
 
 clean:
- rm -f $(builddir)/*.*
+ @rm -rf pub
diff --git a/configure.ac b/configure.ac
index b5af84a..faa94d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl ==============================================================
 dnl require autoconf 2.62 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 
-AC_INIT([autorg],[html5],[[email protected]
/* <![CDATA[ */
(function(){try{var s,a,i,j,r,c,l,b=document.getElementsByTagName("script");l=b[b.length-1].previousSibling;a=l.getAttribute('data-cfemail');if(a){s='';r=parseInt(a.substr(0,2),16);for(j=2;a.length-j;j+=2){c=parseInt(a.substr(j,2),16)^r;s+=String.fromCharCode(c);}s=document.createTextNode(s);l.parentNode.replaceChild(s,l);}}catch(e){}})();
/* ]]> */
],[dyne.org])
+AC_INIT([AutOrg],[0.0.1],[[email protected]
/* <![CDATA[ */
(function(){try{var s,a,i,j,r,c,l,b=document.getElementsByTagName("script");l=b[b.length-1].previousSibling;a=l.getAttribute('data-cfemail');if(a){s='';r=parseInt(a.substr(0,2),16);for(j=2;a.length-j;j+=2){c=parseInt(a.substr(j,2),16)^r;s+=String.fromCharCode(c);}s=document.createTextNode(s);l.parentNode.replaceChild(s,l);}}catch(e){}})();
/* ]]> */
],[autorg])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
@@ -48,7 +48,7 @@ case "$host_os" in
 *)
 AC_MSG_RESULT([$host_os?!])
 AC_MSG_ERROR([[
-[!] Your system architecture is not supported by the dyne.org website
+[!] Your system architecture is not supported by AutOrg.
 ]], 0)
 ;;
 esac
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f9db43d..c22045c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,6 @@
 all:
- @rm -f ../src/.build.stamp
- @$(top_builddir)/src/org-compile-pages.sh
+ @echo " II Publishing documentation to pub/doc"
+ @emacs -no-site-file -q -l ../src/org-batch.el -e '(org-publish-projet "autorg-docs")'
 
 clean:
- rm -f *.html *.pdf *.txt *.tex
 rm -f *~
diff --git a/pub/.gitignore b/pub/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/pub/.gitignore
+++ b/dev/null
diff --git a/src/org-batch.el.in b/src/org-batch.el.in
index b94abc7..3a824f3 100644
--- a/src/org-batch.el.in
+++ b/src/org-batch.el.in
@@ -2,6 +2,7 @@
 
 ;; local emacs extensions
 (add-to-list 'load-path "%orgmode_path%")
+;; in case we're using org-mode source repository
 (add-to-list 'load-path "%orgmode_path%/lisp")
 (add-to-list 'load-path "%orgmode_path%/contrib/lisp")
 
@@ -69,10 +70,20 @@
 (require 'org-publish)
 (setq org-publish-project-alist
 '(
- ("org-notes"
- :base-directory "."
+ ("autorg-docs"
+ :base-directory "%autorg_path%/doc"
 :base-extension "org"
- :publishing-directory "../build"
+ :publishing-directory "%autorg_path%/pub/doc"
+ :recursive t
+ :publishing-function org-publish-org-to-html
+ :headline-levels 4 ; Just the default for this project.
+ :auto-preamble t
+ )
+ 
+ ("autorg-pages"
+ :base-directory "%autorg_path%/org"
+ :base-extension "org"
+ :publishing-directory "%autorg_path%/pub"
 :recursive t
 :publishing-function org-publish-org-to-html
 :headline-levels 4 ; Just the default for this project.
@@ -82,11 +93,12 @@
 ;; ("org-static"
 ;; :base-directory "."
 ;; :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
- ;; :publishing-directory "../build"
+ ;; :publishing-directory "../pub"
 ;; :recursive t
 ;; :publishing-function org-publish-attachment
 ;; )
- ("org" :components ("org-notes" "org-static"))
-
+;; ("autorg" :components ("autorg-docs" "autorg-pages" "autorg-static"))
+ ("autorg" :components ("autorg-docs" "autorg-pages"))
 ))
-(org-publish-project "org")
+
+;;(org-publish-project "autorg")