Permalink
Browse files

No longer deletes ilg files.

  • Loading branch information...
1 parent b3546aa commit a0233269ae11916fa854c2a8a292e2cd7f07da72 @mattfidler committed Dec 7, 2012
Showing with 472 additions and 280 deletions.
  1. +9 −0 Readme.org
  2. +19 −0 dir
  3. +56 −7 org-readme.el
  4. +388 −0 org-readme.info
  5. +0 −273 org-readme.texi
View
@@ -223,6 +223,9 @@ Add a Variables section to Readme.org
*** org-readme-build-el-get-recipe
Builds a el-get recipe based on github information
+*** org-readme-build-info
+Builds library-name.info from Reade.org using texi. Requires =org-readme-build-texi= to be non-nil, pandoc and makeinfo to be found. This will also create the directory entry using install-info, if it is found.
+
*** org-readme-build-markdown
Builds Readme.md from Readme.org
@@ -238,6 +241,9 @@ Default template for blank Readme.org Files. LIB-NAME is replaced with the libra
*** org-readme-drop-markdown-after-build-texi
Removes Readme.md after texinfo is generated
+*** org-readme-drop-texi-after-build-info
+Removes the texi information after building info files.
+
*** org-readme-marmalade-server
Marmalade server website. This should start with http: and should notend with a trailing forward slash, just like the default value of http://marmalade-repo.org
@@ -283,6 +289,9 @@ Value: (keymap
* History
+ - 07-Dec-2012 :: No longer deletes ilg files. (Matthew L. Fidler)
+ - 07-Dec-2012 :: Bug fix for info generation. (Matthew L. Fidler)
+ - 07-Dec-2012 :: Added mecahism to build info files and dir files for elpa package. (Matthew L. Fidler)
- 07-Dec-2012 :: Get description from info file. (Matthew L. Fidler)
- 07-Dec-2012 :: The description should now be picked up. (Matthew L. Fidler)
- 07-Dec-2012 :: Attempting to update description. (Matthew L. Fidler)
View
@@ -0,0 +1,19 @@
+This is the file .../info/dir, which contains the
+topmost node of the Info hierarchy, called (dir)Top.
+The first time you invoke Info you start off looking at this node.
+
+File: dir, Node: Top This is the top of the INFO tree
+
+ This (the Directory node) gives a menu of major topics.
+ Typing "q" exits, "?" lists all Info commands, "d" returns here,
+ "h" gives a primer for first-timers,
+ "mEmacs<Return>" visits the Emacs manual, etc.
+
+ In Emacs, you can click mouse button 2 on a menu item or cross reference
+ to select it.
+
+* Menu:
+
+Emacs lisp libraries
+* org-readme: (org-readme). Integrate Readme.org and Commentary/Change
+ Logs.
View
@@ -79,6 +79,15 @@
;;; Change Log:
;; 07-Dec-2012 Matthew L. Fidler
;; Last-Updated: Wed Aug 22 13:11:26 2012 (-0500) #794 (Matthew L. Fidler)
+;; No longer deletes ilg files.
+;; 07-Dec-2012 Matthew L. Fidler
+;; Last-Updated: Wed Aug 22 13:11:26 2012 (-0500) #794 (Matthew L. Fidler)
+;; Bug fix for info generation.
+;; 07-Dec-2012 Matthew L. Fidler
+;; Last-Updated: Wed Aug 22 13:11:26 2012 (-0500) #794 (Matthew L. Fidler)
+;; Added mecahism to build info files and dir files for elpa package.
+;; 07-Dec-2012 Matthew L. Fidler
+;; Last-Updated: Wed Aug 22 13:11:26 2012 (-0500) #794 (Matthew L. Fidler)
;; Get description from info file.
;; 07-Dec-2012 Matthew L. Fidler
;; Last-Updated: Wed Aug 22 13:11:26 2012 (-0500) #794 (Matthew L. Fidler)
@@ -403,6 +412,16 @@
:type 'boolean
:group 'org-readme)
+(defcustom org-readme-build-info t
+ "Builds library-name.info from Reade.org using texi. Requires `org-readme-build-texi' to be non-nil, pandoc and makeinfo to be found. This will also create the directory entry using install-info, if it is found."
+ :type 'boolean
+ :group 'org-readme)
+
+(defcustom org-readme-drop-texi-after-build-info t
+ "Removes the texi information after building info files."
+ :type 'boolean
+ :group 'org-readme)
+
(defcustom org-readme-add-functions-to-readme t
"Add a Functions section to Readme.org"
:type 'boolean
@@ -1067,12 +1086,37 @@ Returns file name if created."
(delete-file "Readme.md")
(shell-command
(concat "git rm Readme.md")))
- (shell-command
- (concat "git add "
- (concat
- (file-name-sans-extension
- (file-name-nondirectory (buffer-file-name)))
- ".texi"))))
+ (if (and org-readme-drop-texi-after-build-info
+ (file-exists-p (concat
+ (file-name-sans-extension
+ (file-name-nondirectory (buffer-file-name)))
+ ".info")))
+ (progn
+ (delete-file (concat
+ (file-name-sans-extension
+ (file-name-nondirectory (buffer-file-name)))
+ ".texi"))
+ (shell-command
+ (concat "git add "
+ (concat
+ (file-name-sans-extension
+ (file-name-nondirectory (buffer-file-name)))
+ ".info")))
+ (if (file-exists-p (expand-file-name "dir"
+ (file-name-directory (buffer-file-name))))
+ (shell-command
+ (concat "git add dir")))
+ (shell-command
+ (concat "git rm "
+ (file-name-sans-extension
+ (file-name-nondirectory (buffer-file-name)))
+ ".texi")))
+ (shell-command
+ (concat "git add "
+ (concat
+ (file-name-sans-extension
+ (file-name-nondirectory (buffer-file-name)))
+ ".texi")))))
(when (file-exists-p "Readme.md")
(shell-command
@@ -1197,7 +1241,12 @@ When COMMENT-ADDED is non-nil, the comment has been added and the syncing should
(insert base)
(insert "). ")
(insert desc)
- (insert "\n@end direntry\n")))))))
+ (insert "\n@end direntry\n")))
+ (when (and org-readme-build-info
+ (executable-find "makeinfo"))
+ (shell-command (concat "makeinfo " base ".texi"))
+ (when (executable-find "install-info")
+ (shell-command (concat "install-info --dir-file=dir " base ".info"))))))))
(when (and (featurep 'http-post-simple)
org-readme-sync-marmalade)
Oops, something went wrong.

0 comments on commit a023326

Please sign in to comment.