Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- update vba targets to its new name vmb
  • Loading branch information
jceb committed Aug 26, 2011
1 parent b6fdc49 commit 569a5fc
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
24 changes: 12 additions & 12 deletions Makefile
Expand Up @@ -23,32 +23,32 @@ check: tests/run_tests.py
cd tests && python run_tests.py

clean: documentation
@rm -rf ${PLUGIN}.vba ${PLUGIN}.vba.gz tmp files
@rm -rf ${PLUGIN}.vmb ${PLUGIN}.vmb.gz tmp files
cd $^ && $(MAKE) $@

${PLUGIN}.vba: check build_vba.vim clean
${PLUGIN}.vmb: check build_vmb.vim clean
$(MAKE) DESTDIR=$(PWD)/tmp VIMDIR= install
find tmp -type f | sed -e 's/^tmp\///' > files
cp build_vba.vim tmp
cd tmp && vim --cmd 'let g:plugin_name="${PLUGIN}"' -s build_vba.vim
[ -e tmp/${PLUGIN}.vmb ] && mv tmp/${PLUGIN}.vmb tmp/$@ || true
cp build_vmb.vim tmp
cd tmp && vim --cmd 'let g:plugin_name="${PLUGIN}"' -s build_vmb.vim
[ -e tmp/${PLUGIN}.vba ] && mv tmp/${PLUGIN}.vba tmp/$@ || true
mv tmp/$@ .

${PLUGIN}.vba.gz: ${PLUGIN}.vba
@rm -f ${PLUGIN}.vba.gz
${PLUGIN}.vmb.gz: ${PLUGIN}.vmb
@rm -f ${PLUGIN}.vmb.gz
gzip $^

vba: ${PLUGIN}.vba
vmb: ${PLUGIN}.vmb

vba.gz: ${PLUGIN}.vba.gz
vmb.gz: ${PLUGIN}.vmb.gz

docs: documentation
cd $^ && $(MAKE)

installvba: ${PLUGIN}.vba install_vba.vim
installvmb: ${PLUGIN}.vmb install_vmb.vim
rm -rvf ${VIMPLUGINDIR}
mkdir -p "${VIMPLUGINDIR}"
vim --cmd "let g:installdir='${VIMPLUGINDIR}'" -s install_vba.vim $^
vim --cmd "let g:installdir='${VIMPLUGINDIR}'" -s install_vmb.vim $^
@echo "Plugin was installed in ${VIMPLUGINDIR}. Make sure you are using a plugin loader like pathegon, otherwise the ${PLUGIN} might not work properly."

.PHONY: all build test check install clean vba vba.gz docs installvba
.PHONY: all build test check install clean vmb vmb.gz docs installvmb
File renamed without changes.
19 changes: 10 additions & 9 deletions doc/org.txt
Expand Up @@ -52,14 +52,14 @@ Prerequisites~
hyperlinks won't work. Other plugins that integrate well with vim orgmode
are listed in section Suggested plugins.

From .vba file~
From .vbm file~
If you want to install the vim-orgmode plugin for a single user, this is
the preferred way. The stable releases can be downloaded at
http://www.vim.org/scripts/script.php?script_id=3642

Open the file in vim and source it. Restart vim and the plugin is active:

$ vim orgmode.vba
$ vim orgmode.vbm
>
:so %
<
Expand All @@ -69,13 +69,13 @@ From .vba file~
Installation into a specific directory~
If you want to install the plugin into a specific directory, e.g. when you
are using pathogen, then just add the desired directory to the runtimepath
before sourcing the vba-file.
before sourcing the vbm-file.

When updating from a previous version I recommend deleting the whole
$HOME/.vim/bundle/orgmode directory to prevent out dated .pyc files
spoiling the update.

$ vim orgmode.vba.gz
$ vim orgmode.vbm.gz
>
:set rtp=$HOME/.vim/bundle/orgmode,&rtp
:so %
Expand Down Expand Up @@ -296,9 +296,9 @@ Building a Vimball~
following command in the root folder of this plugin. Please make sure that
vim is installed on your computer:

make vba
make vbm

For installing the plugin form the resulting orgmode.vba.gz file, please
For installing the plugin form the resulting orgmode.vbm.gz file, please
refer to the Installation section.

Building a Debian Package~
Expand Down Expand Up @@ -329,9 +329,9 @@ Source code~
test/ - Tests to verify the consistency and correctness
of the plugin
syntax/ - Syntax highlighting
build_vba.vim - Build file for creating a Vimball
install_vba.vim - Local installation of vba via make target
installvba
build_vbm.vim - Build file for creating a Vimball
install_vbm.vim - Local installation of vbm via make target
installvbm
LICENSE - License Information
README.org - Documentation
Makefile
Expand Down Expand Up @@ -450,6 +450,7 @@ LINKS *org-links*
CHANGELOG *org-changelog*

0.4.0-0
- update vba targets to its new name vmb
- demoting a newly created second level heading doesn't cause all children to
be deleted anymore (closes issue #65)
- add error message for missing dependencies (closes issue #59)
Expand Down
2 changes: 1 addition & 1 deletion install_vba.vim → install_vmb.vim
@@ -1,4 +1,4 @@
:exec 'set rtp='.g:installdir
:e orgmode.vba
:e orgmode.vbm
:so %
:q!

0 comments on commit 569a5fc

Please sign in to comment.