re-run mk_language_shell.pl

fperrad · Feb 28, 2009 · 251b033 · 251b033
1 parent 2742e12
commit 251b033
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,9 +5,11 @@ Makefile
 *.o
 *.obj
 *.exe
+*.iss
 markdown
 installable_markdown
 
+*.tmp
 man
 
 src/gen_*.pir

diff --git a/config/makefiles/root.in b/config/makefiles/root.in
@@ -2,38 +2,38 @@
 # $Id$
 
 ## arguments we want to run parrot with
-PARROT_ARGS   =
+PARROT_ARGS   :=
 
 ## configuration settings
-VERSION       = @versiondir@
-BIN_DIR       = @bin_dir@
-LIB_DIR       = @lib_dir@$(VERSION)
-DOC_DIR       = @doc_dir@$(VERSION)
-MANDIR        = @mandir@$(VERSION)
+VERSION       := @versiondir@
+BIN_DIR       := @bin_dir@
+LIB_DIR       := @lib_dir@$(VERSION)
+DOC_DIR       := @doc_dir@$(VERSION)
+MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions
-O             = @o@
+O             := @o@
 
 # Various paths
-PERL6GRAMMAR  = $(LIB_DIR)/library/PGE/Perl6Grammar.pbc
-NQP           = $(LIB_DIR)/languages/nqp/nqp.pbc
-PCT           = $(LIB_DIR)/library/PCT.pbc
-PMC_DIR       = src/pmc
-OPS_DIR       = src/ops
+PERL6GRAMMAR  := $(LIB_DIR)/library/PGE/Perl6Grammar.pbc
+NQP           := $(LIB_DIR)/languages/nqp/nqp.pbc
+PCT           := $(LIB_DIR)/library/PCT.pbc
+PMC_DIR       := src/pmc
+OPS_DIR       := src/ops
 
 ## Setup some commands
-MAKE          = @make_c@
-PERL          = @perl@
-CAT           = @cat@
-CHMOD         = @chmod@
-CP            = @cp@
-MKPATH        = @mkpath@
-RM_F          = @rm_f@
-RM_RF         = @rm_rf@
-POD2MAN       = pod2man
+MAKE          := @make_c@
+PERL          := @perl@
+CAT           := @cat@
+CHMOD         := @chmod@
+CP            := @cp@
+MKPATH        := @mkpath@
+RM_F          := @rm_f@
+RM_RF         := @rm_rf@
+POD2MAN       := pod2man
 #IF(parrot_is_shared and not(cygwin or win32)):export LD_RUN_PATH := @blib_dir@:$(LD_RUN_PATH)
-PARROT        = ../../parrot@exe@
-PBC_TO_EXE    = ../../pbc_to_exe@exe@
+PARROT        := ../../parrot@exe@
+PBC_TO_EXE    := ../../pbc_to_exe@exe@
 #IF(darwin):
 #IF(darwin):# MACOSX_DEPLOYMENT_TARGET must be defined for OS X compilation/linking
 #IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
@@ -43,20 +43,19 @@ build: markdown.pbc
 
 all: build markdown@exe@ installable
 
-SOURCES = \
+SOURCES := \
   markdown.pir \
   src/Compiler.pir \
   src/Node.pir \
   src/gen_grammar.pir \
   src/gen_actions.pir \
   src/gen_builtins.pir
 
-BUILTINS_PIR = \
+BUILTINS_PIR := \
   src/builtins/length.pir
 
-DOCS = README
+DOCS := README
 
-# the default target
 markdown.pbc: $(SOURCES)
 	$(PARROT) $(PARROT_ARGS) -o markdown.pbc markdown.pir
 
@@ -122,9 +121,9 @@ t/MarkdownTest_1.0: t/MarkdownTest_1.0.zip
 
 codetest: codetest-c codetest-make codetest-perl codetest-pir codetest-pod
 
-T_MAKE  = config//makefiles//root.in
-T_PERL  = Configure.pl t//harness t//*.t t//Parrot//Test//*.pm
-T_PIR   = markdown.pir src//Compiler.pir src//Node.pir src//builtins//length.pir
+T_MAKE  := config//makefiles//root.in
+T_PERL  := Configure.pl t//harness t//*.t t//Parrot//Test//*.pm
+T_PIR   := markdown.pir src//Compiler.pir src//Node.pir src//builtins//length.pir
 
 codetest-c:
 
@@ -178,28 +177,31 @@ win32-inno-installer: installable
 	-$(MKPATH) man/html
 	pod2html --infile markdown.pir --outfile man/html/parrot-markdown.html
 	$(CP) installable_markdown@exe@ parrot-markdown.exe
-	cd @build_dir@ && $(PERL) tools/dev/mk_inno_language.pl markdown
-	cd @build_dir@ && iscc parrot-markdown.iss
+	$(PERL) @build_dir@/tools/dev/mk_inno_language.pl markdown
+	iscc parrot-markdown.iss
 
-TEST_CLEANUPS = \
+TEST_CLEANUPS := \
   "t/*.html" \
   "t/*.text"
 
 testclean:
 	$(RM_RF) t/MarkdownTest_1.0
 	$(RM_F) $(TEST_CLEANUPS)
 
-CLEANUPS = \
+CLEANUPS := \
   markdown.pbc \
   "src/gen_*.pir" \
   "*.c" \
   "*$(O)" \
   markdown@exe@ \
 #IF(win32):  parrot-markdown.exe \
+#IF(win32):  parrot-markdown.iss \
+#IF(win32):  "setup-parrot-*.exe" \
   installable_markdown@exe@
 
 clean: testclean
 	$(RM_F) $(CLEANUPS)
+	$(RM_RF) man
 
 realclean: clean
 	$(RM_F) Makefile t/MarkdownTest_1.0.zip