[O] Build fail on OSX

2012-10-03 Thread Neuwirth Erich
Until now, I was able to build from git (OSX 10.8.2, Emacs 24.2),
but just now 
make up1 
fails with the following error


make[1]: Nothing to be done for `all'.
rm -f org-version.el org-loaddefs.el org-version.elc org-loaddefs.elc
install -m 644 -p ../contrib/lisp/org-e-ascii.el 
../contrib/lisp/org-e-beamer.el ../contrib/lisp/org-e-groff.el 
../contrib/lisp/org-e-html.el ../contrib/lisp/org-e-latex.el 
../contrib/lisp/org-e-man.el ../contrib/lisp/org-e-odt.el 
../contrib/lisp/org-e-publish.el ../contrib/lisp/org-e-texinfo.el 
../contrib/lisp/org-md.el ../contrib/lisp/org-export.el .
org-version: 7.9.2 (release_7.9.2-390-g50fe7c.dirty)
Loading /Users/neuwirth/devel/org-mode/lisp/org-compat.el (source)...
Loading /Users/neuwirth/devel/org-mode/mk/org-fixup.el (source)...
Wrong number of arguments: (lambda (org-release org-git-version) Make the file 
org-version.el in the current directory.
This function is internally used by the build system and should
be used by foreign build systems or installers to produce this
file in the installation directory of org-mode.  Org will not
work correctly if this file is not present (except directly from
the Git work tree). (with-temp-buffer (insert ;;; org-version.el --- 
autogenerated file, do not edit
;;
;;; Code:
;;;###autoload
(defun org-release ()
  \The release version of org-mode.
  Inserted by installing org-mode or when a release is made.\
   (let ((org-release \ org-release \))
 org-release))
;;;###autoload
(defun org-git-version ()
  \The Git version of org-mode.
  Inserted by installing org-mode or when a release is made.\
   (let ((org-git-version \ org-git-version \))
 org-git-version))


(provide 'org-version)


;; Local Variables:
;; version-control: never
;; no-byte-compile: t
;; coding: utf-8
;; End:
;;; org-version.el ends here
) (toggle-read-only 0) (write-file org-version.el))), 3
make[1]: *** [org-version.el] Error 255
make: *** [all] Error 2




Re: [O] Build fail on OSX

2012-10-03 Thread Bastien
Hi Erich,

Neuwirth Erich erich.neuwi...@univie.ac.at writes:

 Until now, I was able to build from git (OSX 10.8.2, Emacs 24.2),
 but just now 
 make up1 
 fails with the following error

Please git pull manually before using make up1 and let us know if 
this fixes your problem.

Thanks,

-- 
 Bastien



Re: [O] Build fail on OSX

2012-10-03 Thread Neuwirth Erich
The probleme persists even if I try what you suggested/

On Oct 3, 2012, at 11:52 AM, Bastien b...@altern.org wrote:

 Hi Erich,
 
 Neuwirth Erich erich.neuwi...@univie.ac.at writes:
 
 Until now, I was able to build from git (OSX 10.8.2, Emacs 24.2),
 but just now 
 make up1 
 fails with the following error
 
 Please git pull manually before using make up1 and let us know if 
 this fixes your problem.
 
 Thanks,
 
 -- 
 Bastien




Re: [O] Build fail on OSX

2012-10-03 Thread Achim Gratz
Neuwirth Erich writes:
 The probleme persists even if I try what you suggested/

You need to be a bit more specific if you want help.

make up0
make config
make up1

Also, this indicates that you have local changes:
org-version: 7.9.2 (release_7.9.2-390-g50fe7c.dirty)

git status

The error you've reported originally seems to be a mismatch between the
Makefile (eithzer default.mk or local.mk) and org-fixup.el, but that
should have been fixed by Bastien already.


Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

Wavetables for the Waldorf Blofeld:
http://Synth.Stromeko.net/Downloads.html#BlofeldUserWavetables




Re: [O] Build fail on OSX

2012-10-03 Thread Neuwirth Erich
I do have my own local.mk (at the end of the message)

where set things up OSXwise.

I also add things for the new exporter and for R
ORG_ADD_CONTRIB = org-e-* org-md org-export # e.g. the new exporter
BTEST_EXTRA = ess-site  # load ESS for R tests

Here is more of my output:

Mahler:org-mode neuwirth$ make up0
git remote update
Fetching origin
git pull
Already up-to-date.
Mahler:org-mode neuwirth$ make config

= Emacs executable and Installation paths
EMACS   = /Applications/Emacs.app/Contents/MacOS/Emacs
DESTDIR = 
ORGCM   = dirall
ORG_MAKE_DOC= info html pdf
lispdir = /Applications/Emacs.App/Contents/Resources/site-lisp/org
infodir = /Applications/Emacs.App/Contents/Resources/info
datadir = /Applications/Emacs.App/Contents/Resources/etc/org
testdir = /var/folders/cl/zktxb0v51ng7jfv0mspj2w94gn/T//tmp-orgtest
= Additional files from contrib/lisp
org-e-ascii.el org-e-beamer.el org-e-groff.el org-e-html.el org-e-latex.el 
org-e-man.el org-e-odt.el org-e-publish.el org-e-texinfo.el org-md.el 
org-export.el
= Org version
make:  Org-mode version 7.9.2 (release_7.9.2-399-g2e9427.dirty = 
/Applications/Emacs.App/Contents/Resources/site-lisp/org)



make up1 produces (towards the end)

make[1]: Nothing to be done for `all'.
rm -f org-version.el org-loaddefs.el org-version.elc org-loaddefs.elc
install -m 644 -p ../contrib/lisp/org-e-ascii.el 
../contrib/lisp/org-e-beamer.el ../contrib/lisp/org-e-groff.el 
../contrib/lisp/org-e-html.el ../contrib/lisp/org-e-latex.el 
../contrib/lisp/org-e-man.el ../contrib/lisp/org-e-odt.el 
../contrib/lisp/org-e-publish.el ../contrib/lisp/org-e-texinfo.el 
../contrib/lisp/org-md.el ../contrib/lisp/org-export.el .
org-version: 7.9.2 (release_7.9.2-399-g2e9427.dirty)
Loading /Users/neuwirth/devel/org-mode/lisp/org-compat.el (source)...
Loading /Users/neuwirth/devel/org-mode/mk/org-fixup.el (source)...
Saving file /Users/neuwirth/devel/org-mode/lisp/org-version.el...
Loading vc-git...
Wrote /Users/neuwirth/devel/org-mode/lisp/org-version.el
org-install: 7.9.2 (release_7.9.2-399-g2e9427.dirty)
Loading /Users/neuwirth/devel/org-mode/lisp/org-compat.el (source)...
Loading /Users/neuwirth/devel/org-mode/mk/org-fixup.el (source)...
Symbol's function definition is void: org-make-org-install
make[1]: *** [org-loaddefs.el] Error 255
make: *** [all] Error 2







Here is my local.mk (which worked up until now)



local.mk
Description: Binary data


Re: [O] Build fail on OSX

2012-10-03 Thread Achim Gratz
Neuwirth Erich writes:
 = Org version
 make:  Org-mode version 7.9.2 (release_7.9.2-399-g2e9427.dirty = 
 /Applications/Emacs.App/Contents/Resources/site-lisp/org)

We still don't know why a freshly pulled Org is dirty.  That seems
very strange, so again, what is the output of git status?

 Here is my local.mk (which worked up until now)

Remove the part after ##-8--- or compare to mk/default.mk and
take note of the changes that have been made there.



Regards,
Achim.
-- 
+[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves




Re: [O] Build fail on OSX

2012-10-03 Thread Neuwirth Erich
The problem was my fault.
I simply used the old local.mk.
After creating a new local.mk from mk/default.mk
and changing the settings in there, building works again.




On Oct 3, 2012, at 6:52 PM, Achim Gratz strom...@nexgo.de wrote:

 Neuwirth Erich writes:
 = Org version
 make:  Org-mode version 7.9.2 (release_7.9.2-399-g2e9427.dirty = 
 /Applications/Emacs.App/Contents/Resources/site-lisp/org)
 
 We still don't know why a freshly pulled Org is dirty.  That seems
 very strange, so again, what is the output of git status?
 
 Here is my local.mk (which worked up until now)
 
 Remove the part after ##-8--- or compare to mk/default.mk and
 take note of the changes that have been made there.
 
 
 
 Regards,
 Achim.
 -- 
 +[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]+
 
 Wavetables for the Terratec KOMPLEXER:
 http://Synth.Stromeko.net/Downloads.html#KomplexerWaves