Author: bernhard
Date: Mon Sep 19 13:08:20 2005
New Revision: 9214
Modified:
trunk/MANIFEST.SKIP
trunk/config/gen/makefiles/editor.in
trunk/config/gen/makefiles/root.in
trunk/editor/ (props changed)
trunk/editor/README.pod
Log:
Fix 'make clean' to recurse into the editor directory and
'make distclean' to remove 'editor/Makefile. It also change the
behavior of 'editor/Makefile' so that the 'all' & 'clean' targets no
longer modify files outside of the parrot tree.
Thanks to Joshua Hoblitt [perl #37180]
Also tell SVN about generated files, add 'make help'
and let editor.in have real newlines.
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP (original)
+++ trunk/MANIFEST.SKIP Mon Sep 19 13:08:20 2005
@@ -1,5 +1,5 @@
# $Id$
-# generated by gen_manifest_skip.pl Sun Sep 4 07:27:16 2005
+# generated by gen_manifest_skip.pl Mon Sep 19 21:47:58 2005
#
# Please update t/src/manifest.t when adding patterns here
\B\.svn\b
@@ -186,6 +186,8 @@
# generated from svn:ignore of 'docs/html/imcc/docs/'
# generated from svn:ignore of 'docs/html/imcc/t/syn/'
# generated from svn:ignore of 'docs/html/io/'
+# generated from svn:ignore of 'docs/html/languages/befunge/t/'
+# generated from svn:ignore of 'docs/html/languages/bf/t/'
# generated from svn:ignore of 'docs/html/languages/conversion/examples/'
# generated from svn:ignore of 'docs/html/languages/forth/'
# generated from svn:ignore of 'docs/html/languages/jako/docs/'
@@ -200,6 +202,7 @@
# generated from svn:ignore of 'docs/html/languages/m4/t/'
# generated from svn:ignore of 'docs/html/languages/m4/tools/'
# generated from svn:ignore of 'docs/html/languages/miniperl/Miniperl/'
+# generated from svn:ignore of 'docs/html/languages/ook/t/'
# generated from svn:ignore of
'docs/html/languages/parrot_compiler/lib/Parrot/Test/'
# generated from svn:ignore of 'docs/html/languages/parrot_compiler/t/'
# generated from svn:ignore of 'docs/html/languages/perl6/P6C/'
@@ -213,8 +216,11 @@
# generated from svn:ignore of 'docs/html/languages/regex/lib/Regex/'
# generated from svn:ignore of 'docs/html/languages/regex/lib/Regex/Parse/'
# generated from svn:ignore of 'docs/html/languages/ruby/Yacc/'
+# generated from svn:ignore of 'docs/html/languages/scheme/'
# generated from svn:ignore of 'docs/html/languages/scheme/Scheme/'
+# generated from svn:ignore of 'docs/html/languages/scheme/t/'
# generated from svn:ignore of 'docs/html/languages/tcl/'
+# generated from svn:ignore of 'docs/html/languages/tcl/classes/'
# generated from svn:ignore of 'docs/html/languages/tcl/docs/'
# generated from svn:ignore of 'docs/html/languages/tcl/lib/'
# generated from svn:ignore of 'docs/html/languages/tcl/lib/commands/'
@@ -279,6 +285,10 @@
# generated from svn:ignore of 'editor/'
^editor/Makefile$
^editor/Makefile/
+^editor/imc\.vim$
+^editor/imc\.vim/
+^editor/imcc\.xml$
+^editor/imcc\.xml/
# generated from svn:ignore of 'encodings/'
^encodings/.*\.o$
^encodings/.*\.o/
@@ -737,6 +747,10 @@
^languages/ruby/pm_to_blib$
^languages/ruby/pm_to_blib/
# generated from svn:ignore of 'languages/ruby/Yacc/'
+# generated from svn:ignore of 'languages/ruby/blib/arch/auto/Ruby/'
+# generated from svn:ignore of 'languages/ruby/blib/lib/'
+# generated from svn:ignore of 'languages/ruby/blib/lib/auto/Ruby/'
+# generated from svn:ignore of 'languages/ruby/blib/man3/'
# generated from svn:ignore of 'languages/ruby/t/'
# generated from svn:ignore of 'languages/scheme/'
^languages/scheme/Makefile$
@@ -941,6 +955,7 @@
^t/benchmarks_.*\.pir/
^t/benchmarks_.*\.pasm$
^t/benchmarks_.*\.pasm/
+# generated from svn:ignore of 't/doc/'
# generated from svn:ignore of 't/dynclass/'
^t/dynclass/.*\.pbc$
^t/dynclass/.*\.pbc/
@@ -994,6 +1009,7 @@
^t/src/.*_.*$
^t/src/.*_.*/
# generated from svn:ignore of 't/stress/'
+# generated from svn:ignore of 't/tools/'
# generated from svn:ignore of 'tools/'
# generated from svn:ignore of 'tools/dev/'
# generated from svn:ignore of 'tools/docs/'
Modified: trunk/config/gen/makefiles/editor.in
==============================================================================
--- trunk/config/gen/makefiles/editor.in (original)
+++ trunk/config/gen/makefiles/editor.in Mon Sep 19 13:08:20 2005
@@ -1,42 +1,66 @@
-OPS_DIR = ../ops
-VIM_DIR = $(HOME)/.vim
-VIM_FT_DIR = $(VIM_DIR)/ftdetect
-VIM_IN_DIR = $(VIM_DIR)/indent
-VIM_SYN_DIR = $(VIM_DIR)/syntax
-
-PERL = ${perl}
-CP = ${cp}
-MKDIR = $(PERL) -e ${PQ}-d or mkdir $$_,0777 or die foreach @ARGV${PQ}
-RM_F = ${rm_f}
-
-default: all
-
-all: imc.vim vim-install
-
-imc.vim: imc.vim.in $(OPS_DIR)/*.ops
- $(CP) imc.vim.in imc.vim
- $(PERL) ops2vim.pl $(OPS_DIR)/*.ops >> imc.vim
-
-vim-install:
- $(MKDIR) $(VIM_DIR)
- $(MKDIR) $(VIM_SYN_DIR)
- $(CP) imc.vim $(VIM_SYN_DIR)
- $(CP) pasm.vim $(VIM_SYN_DIR)
- $(CP) pmc.vim $(VIM_SYN_DIR)
- $(MKDIR) $(VIM_FT_DIR)
- $(CP) filetype_parrot.vim $(VIM_FT_DIR)/parrot.vim
- $(MKDIR) $(VIM_IN_DIR)
- $(CP) indent_imc.vim $(VIM_IN_DIR)/imc.vim
-
-imc.kate:
- $(PERL) kate_syntax.pl '..${slash}' > imcc.xml
-
-clean:
- $(RM_F) $(VIM_SYN_DIR)/imc.vim
- $(RM_F) $(VIM_SYN_DIR)/pasm.vim
- $(RM_F) $(VIM_SYN_DIR)/pmc.vim
- $(RM_F) $(VIM_FT_DIR)/parrot.vim
- $(RM_F) $(VIM_IN_DIR)/imc.vim
-
-realclean: clean
- $(RM_F) Makefile
+# $Id$
+
+OPS_DIR = ../ops
+VIM_DIR = $(HOME)/.vim
+VIM_FT_DIR = $(VIM_DIR)/ftdetect
+VIM_IN_DIR = $(VIM_DIR)/indent
+VIM_SYN_DIR = $(VIM_DIR)/syntax
+
+PERL = ${perl}
+CP = ${cp}
+MKDIR = $(PERL) -e ${PQ}-d or mkdir $$_,0777 or die foreach @ARGV${PQ}
+RM_F = ${rm_f}
+
+default: all
+
+all: imc.vim imc.kate
+
+# This is a listing of all targets, that are meant to be called by users
+help :
+ @echo ""
+ @echo "Following targets are available for the user:"
+ @echo ""
+ @echo " all: generate imc.vim and imc.kate but do not
install it"
+ @echo " This is the default."
+ @echo " vim-install: Install syntax files for the magnificent
vim"
+ @echo " vim-uninstall: Uninstall syntax files for vim"
+ @echo " imc.kate: Syntax file for Kate"
+ @echo ""
+ @echo "Cleaning:"
+ @echo " clean: clean up local files"
+ @echo " realclean: clean up local files including Makefile"
+ @echo ""
+
+imc.vim: imc.vim.in $(OPS_DIR)/*.ops
+ $(CP) imc.vim.in imc.vim
+ $(PERL) ops2vim.pl $(OPS_DIR)/*.ops >> imc.vim
+
+vim-install: imc.vim
+ $(MKDIR) $(VIM_DIR)
+ $(MKDIR) $(VIM_SYN_DIR)
+ $(CP) imc.vim $(VIM_SYN_DIR)
+ $(CP) pasm.vim $(VIM_SYN_DIR)
+ $(CP) pmc.vim $(VIM_SYN_DIR)
+ $(MKDIR) $(VIM_FT_DIR)
+ $(CP) filetype_parrot.vim $(VIM_FT_DIR)/parrot.vim
+ $(MKDIR) $(VIM_IN_DIR)
+ $(CP) indent_imc.vim $(VIM_IN_DIR)/imc.vim
+
+imc.kate: imcc.xml
+
+imcc.xml:
+ $(PERL) kate_syntax.pl '..${slash}' > imcc.xml
+
+vim-uninstall:
+ $(RM_F) $(VIM_SYN_DIR)/imc.vim
+ $(RM_F) $(VIM_SYN_DIR)/pasm.vim
+ $(RM_F) $(VIM_SYN_DIR)/pmc.vim
+ $(RM_F) $(VIM_FT_DIR)/parrot.vim
+ $(RM_F) $(VIM_IN_DIR)/imc.vim
+
+clean:
+ $(RM_F) imc.vim
+ $(RM_F) imcc.xml
+
+realclean: clean
+ $(RM_F) Makefile
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in (original)
+++ trunk/config/gen/makefiles/root.in Mon Sep 19 13:08:20 2005
@@ -171,7 +171,8 @@ GEN_MAKEFILES = \
languages/perl6/Makefile \
languages/urm/Makefile \
languages/tcl/Makefile \
- languages/tcl/examples/Makefile
+ languages/tcl/examples/Makefile \
+ editor/Makefile
GEN_CONFIGS = \
include/parrot/config.h \
@@ -1186,6 +1187,15 @@ compilers-clean :
###############################################################################
#
+# editors targets:
+#
+###############################################################################
+
+editor-clean :
+ $(MAKE_C) editor clean
+
+###############################################################################
+#
# Testing Targets:
#
###############################################################################
@@ -1335,7 +1345,8 @@ clean : \
dynclasses-clean \
examples-clean \
imcc-clean \
- compilers-clean
+ compilers-clean \
+ editor-clean
${TEMP_cg_r}
$(RM_F) chartypes *.s *~ $(FLUID_FILES)
Modified: trunk/editor/README.pod
==============================================================================
--- trunk/editor/README.pod (original)
+++ trunk/editor/README.pod Mon Sep 19 13:08:20 2005
@@ -1,3 +1,5 @@
+# $Id$
+
=head1 NAME
editor/README.pod - Productivity Comes in Pretty Colors
@@ -7,7 +9,8 @@ editor/README.pod - Productivity Comes i
Included in this directory are some add-ins for making working on parrot (or in
parrot) easier, for various popular editors. Mostly that means
syntax-highlighting and automatic indenting. Read on to see what's available
for
-your favorite editor
+your favorite editor. For a summary on what is available do
+ make help
=head2 Vim
@@ -18,8 +21,9 @@ filetype script that tells vim to associ
and .pmc with the right syntax. The syntax files should be installed to
C<~/.vim/syntax/>; C<filetype_parrot.vim> should be installed to
C<~/.vim/ftdetect>; C<indent_imc.vim> should be called
C<~/.vim/indent/imc.vim>.
-C<make> in the C<editor/> dir will do this automatically. If you want
indenting,
-you should also place C<filetype indent on> somewhere in your vimrc.
+C<make vim-install> in the C<editor/> dir will do this automatically.
+If you want indenting, you should also place C<filetype indent on> somewhere in
+your vimrc.
=head2 Kate
@@ -59,7 +63,7 @@ using tabs in the pasm mode.
There is a script here to automatically generate a TAGS file, which works with
Vim and other editors that recognize ctags-format files. The tool "exuberant
ctags" is required. Run
- make tags
+ make tags
in the parrot root directory to build the tags file.
=cut
