# New Ticket Created by  Dennis Rieks 
# Please include the string:  [perl #30344]
# in the subject line of all future correspondence about this issue. 
# <URL: http://rt.perl.org:80/rt3/Ticket/Display.html?id=30344 >


Hi,

some changes to run "nmake clean" on windows with nmake / vc6.

patch description:

MAINFEST.patch (file parrot/MAINFEST)
-added config/gen/makefiles/parrot_compiler.in
-removed languages/parrot_compiler/Makefile

bf.in.patch (file parrot/config/gen/makefiles/bf.in)
-added PERL = ${perl} nmake need this, don't know why

miniperl.in.patch (file parrot/config/gen/makefiles/miniperl.in)
-added RM_F = ${rm_f}
-replaced rm -f with $(RM_F)

ook.in.patch (file parrot/config/gen/makefiles/ook.in)
-added PERL = ${perl} nmake need this, don't know why

root.in.patch (file parrot/config/gen/makefiles/root.in)
-added line "languages/parrot_compiler/Makefile"

makefiles.pl.patch (file parrot/config/gen/makefiles.pl)
-added genfile entry for parrot_compiler.in

parrot_compiler.in
-new file "config/gen/makefiles/parrot_compiler.in" 

Don't forget to cvs remove languages/parrot_compiler/Makefile

Dennis

--
Dennis Rieks
[EMAIL PROTECTED]
--- parrot.current/config/gen/makefiles/bf.in	2003-10-01 13:54:34.000000000 +0200
+++ parrot.drieks/config/gen/makefiles/bf.in	2004-06-17 19:24:06.000000000 +0200
@@ -1,5 +1,5 @@
 RM_F = ${rm_f}
-
+PERL = ${perl}
 PARROT=../../parrot

 all: build
--- parrot.current/MANIFEST	2004-06-17 20:27:46.000000000 +0200
+++ parrot.drieks/MANIFEST	2004-06-17 21:12:00.000000000 +0200
@@ -169,6 +169,7 @@
 config/gen/makefiles/imcc.in                      []
 config/gen/makefiles/jako.in                      []
 config/gen/makefiles/languages.in                 []
+config/gen/makefiles/parrot_compiler.in           []
 config/gen/makefiles/libparrot_def.in             []
 config/gen/makefiles/m4.in                        []
 config/gen/makefiles/miniperl.in                  []
@@ -2132,7 +2133,6 @@
 languages/ook/hello.ook                           [ook]
 languages/ook/ook.pasm                            [ook]
 languages/ook/test.ook                            [ook]
-languages/parrot_compiler/Makefile                []
 languages/parrot_compiler/parrot.pasm             []
 languages/parrot_compiler/sample.pasm             []
 languages/perl6/ChangeLog                         [perl6]
--- parrot.current/config/gen/makefiles/miniperl.in	2003-10-23 04:04:38.000000000 +0200
+++ parrot.drieks/config/gen/makefiles/miniperl.in	2004-06-17 19:27:16.000000000 +0200
@@ -11,6 +11,7 @@
 ASM=$(IMCC) -a --output-pbc
 MINIPERLC=$(PERL) miniperlc
 INTERP=./${test_prog}
+RM_F = ${rm_f}

 #
 # Default target:
@@ -58,7 +59,7 @@
 all: test.pbc and.pbc foo.pbc

 clean:
-	rm -f \
+	$(RM_F) \
 foo.pasm foo.pbc \
 t/*/*.pasm \
 t/*/*.pbc \
--- parrot.current/config/gen/makefiles/ook.in	2003-07-16 03:37:32.000000000 +0200
+++ parrot.drieks/config/gen/makefiles/ook.in	2004-06-17 19:28:54.000000000 +0200
@@ -1,5 +1,5 @@
 RM_F = ${rm_f}
-
+PERL = ${perl}
 PARROT = ../../parrot

 all: build
PERL = ${perl}
RM_F = ${rm_f}
PARROT = ../../parrot

all :
        $(PARROT) -o parrot.pbc parrot.pasm
        $(PARROT) parrot.pbc < sample.pasm > sample.pbc
        $(PARROT) sample.pbc

clean :
        $(RM_F) core
        $(RM_F) *.pbc
--- parrot.current/config/gen/makefiles/root.in	2004-06-10 17:06:50.000000000 +0200
+++ parrot.drieks/config/gen/makefiles/root.in	2004-06-17 19:38:30.000000000 +0200
@@ -90,6 +90,7 @@
     Makefile \
     languages/Makefile \
     docs/Makefile \
+    languages/parrot_compiler/Makefile \
     languages/jako/Makefile \
     languages/miniperl/Makefile \
     languages/scheme/Makefile \
--- parrot.current/config/gen/makefiles.pl	2004-06-17 09:24:46.000000000 +0200
+++ parrot.drieks/config/gen/makefiles.pl	2004-06-17 20:56:12.000000000 +0200
@@ -83,6 +83,8 @@
           commentType => '#', replace_slashes => 1);
   genfile('config/gen/makefiles/dynoplibs.in',   'dynoplibs/Makefile',
           commentType => '#', replace_slashes => 1);
+  genfile('config/gen/makefiles/parrot_compiler.in', 'languages/parrot_compiler/Makefile',
+          commentType => '#', replace_slashes => 1);


   # set up docs/Makefile, partly based on the .ops in the root dir

Reply via email to