Merge branch 'with_winxed' into with_winxed_2

MANIFEST

@@ -862,6 +862,10 @@ ext/nqp-rx/t/p6regex/rx_modifiers                           [test]
 ext/nqp-rx/t/p6regex/rx_quantifiers                         [test]
 ext/nqp-rx/t/p6regex/rx_subrules                            [test]
 ext/nqp-rx/t/p6regex/rx_syntax                              [test]
+ext/winxed/Defines.mak                                      []
+ext/winxed/Rules.mak                                        []
+ext/winxed/compiler.pir                                     []
+ext/winxed/driver.pir                                       []
 frontend/parrot/main.c                                      []
 frontend/parrot_debugger/main.c                             []
 frontend/pbc_dump/main.c                                    []

MANIFEST.generated

@@ -153,6 +153,8 @@ installable_pbc_merge                            [main]bin
 installable_pbc_merge.exe                        [main]bin
 installable_pbc_to_exe                           [main]bin
 installable_pbc_to_exe.exe                       [main]bin
+installable_winxed                               [main]bin
+installable_winxed.exe                           [main]bin
 lib/Parrot/Config/Generated.pm                   [devel]lib
 lib/Parrot/PMC.pm                                [devel]lib
 lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm               [devel]lib
@@ -248,6 +250,7 @@ runtime/parrot/include/tm.pasm                   [main]
 runtime/parrot/include/vtable_methods.pasm       [main]
 runtime/parrot/include/warnings.pasm             [main]
 runtime/parrot/languages/JSON/JSON.pir           [data_json]
+runtime/parrot/languages/winxed/winxed.pbc       [winxed]
 runtime/parrot/library/Archive/Tar.pbc           [main]
 runtime/parrot/library/Archive/Zip.pbc           [main]
 runtime/parrot/library/CGI/QueryHash.pbc         [main]

config/gen/makefiles/root.in

@@ -131,6 +131,7 @@ include compilers/pct/Defines.mak
 include compilers/opsc/Defines.mak
 include ext/nqp-rx/Defines.mak
 include compilers/data_json/Defines.mak
+include ext/winxed/Defines.mak
 
 ###############################################################################
 #
@@ -530,6 +531,7 @@ NQP_RX              = .@slash@parrot-nqp$(EXE)
 NCI_THUNK_GEN       = .@slash@parrot_nci_thunk_gen$(EXE)
 PROVE               = .@slash@parrot-prove$(EXE)
 OPS2C               = .@slash@ops2c$(EXE)
+WINXED              = .@slash@winxed$(EXE)
 
 # Installable executables
 INSTALLABLEPARROT    = .@slash@installable_parrot$(EXE)
@@ -543,6 +545,7 @@ INSTALLABLENQP       = .@slash@installable_parrot-nqp$(EXE)
 INSTALLABLENCITHUNKGEN = .@slash@installable_parrot_nci_thunk_gen$(EXE)
 INSTALLABLEPROVE     = .@slash@installable_parrot-prove$(EXE)
 INSTALLABLEOPS2C    = .@slash@installable_ops2c$(EXE)
+INSTALLABLEWINXED   = .@slash@installable_winxed$(EXE)
 
 # Libraries
 LIBPARROT_STATIC    = @blib_dir@/@libparrot_static@
@@ -624,6 +627,8 @@ all : \
     $(DATA_JSON_LIB_PBCS) \
     $(JSON_LANG) \
     $(NQP_LIB_PBCS) \
+    $(WINXED_LANG) \
+    $(WINXED) \
 #IF(has_dynamic_linking):    $(DYNOPLIBS_TARGETS) \
 #IF(has_dynamic_linking):    $(LIBNCI_TEST_SO) \
     $(GEN_LIBRARY) \
@@ -834,7 +839,7 @@ world : parrot_utils
 
 parrot_utils : all $(PDUMP) $(DIS) $(PDB) $(PBC_MERGE) $(PBC_TO_EXE) $(PARROT_CONFIG) src/install_config$(O) $(PROVE) $(OPS2C)
 
-installable: all $(INSTALLABLEPARROT) $(INSTALLABLEPDUMP) $(INSTALLABLEDIS) $(INSTALLABLEPDB) $(INSTALLABLEPBC_MERGE) $(INSTALLABLEPBCTOEXE) $(INSTALLABLECONFIG) $(INSTALLABLENQP) $(INSTALLABLENCITHUNKGEN) $(INSTALLABLEPROVE) $(INSTALLABLEOPS2C)
+installable: all $(INSTALLABLEPARROT) $(INSTALLABLEPDUMP) $(INSTALLABLEDIS) $(INSTALLABLEPDB) $(INSTALLABLEPBC_MERGE) $(INSTALLABLEPBCTOEXE) $(INSTALLABLECONFIG) $(INSTALLABLENQP) $(INSTALLABLENCITHUNKGEN) $(INSTALLABLEPROVE) $(INSTALLABLEOPS2C) $(INSTALLABLEWINXED)
 
 bootstrap-ops : $(OPS2C)
 	$(OPS2C) --core --quiet
@@ -2250,6 +2255,7 @@ clean : \
 	$(RM_F) $(DYNOPLIBS_CLEANUPS) $(DYNPMC_CLEANUPS)
 	$(RM_F) $(GEN_PASM_INCLUDES) $(GEN_PM_INCLUDES)
 	$(RM_F) $(NQPRX_CLEANUPS)  $(OPSC_CLEANUPS)
+	$(RM_F) $(WINXED_CLEANUPS)
 	$(RM_RF) blib
 
 prog-clean :
@@ -2269,11 +2275,13 @@ prog-clean :
     $(INSTALLABLENQP) \
     $(INSTALLABLENCITHUNKGEN) \
     $(INSTALLABLEPROVE) \
+    $(INSTALLABLEWINXED) \
     pbc_to_exe.pbc pbc_to_exe.c pbc_to_exe$(O) pbc_to_exe$(EXE) \
     $(NCI_THUNK_GEN) parrot_nci_thunk_gen.c parrot_nci_thunk_gen$(O) parrot_nci_thunk_gen.pbc \
     ops2c.pbc ops2c.c ops2c$(O) ops2c$(EXE) ops2c.pir \
     parrot-prove.pbc parrot-prove.c parrot-prove$(O) parrot-prove$(EXE) \
     parrot_config$(EXE) parrot_config.c parrot_config$(O) parrot_config.pbc \
+    winxed.pbc winxed.c winxed$(O) $(WINXED) \
     compilers/imcc/main$(O) \
     $(PDUMP) frontend/pbc_dump/main$(O) frontend/pbc_dump/packdump$(O) \
     $(PDB) frontend/parrot_debugger/main$(O) \
@@ -3053,6 +3061,7 @@ include compilers/opsc/Rules.mak
 include compilers/tge/Rules.mak
 include compilers/data_json/Rules.mak
 include ext/nqp-rx/Rules.mak
+include ext/winxed/Rules.mak
 
 # Local variables:
 #   mode: makefile

ext/winxed/Defines.mak

@@ -0,0 +1,3 @@
+WINXED_LANG = runtime/parrot/languages/winxed/winxed.pbc
+
+WINXED_CLEANUPS = $(WINXED_LANG)

ext/winxed/Rules.mak

@@ -0,0 +1,14 @@
+# Build winxed snapshot.
+
+$(WINXED_LANG): ext/winxed/compiler.pir $(PARROT)
+	$(MKPATH) runtime/parrot/languages/winxed
+	$(PARROT) -o $@ ext/winxed/compiler.pir
+
+winxed.pbc: ext/winxed/driver.pir $(PARROT)
+	$(PARROT) -o $@ ext/winxed/driver.pir
+
+$(WINXED) : winxed.pbc $(PBC_TO_EXE)
+	$(PBC_TO_EXE) winxed.pbc
+
+$(INSTALLABLEWINXED) : winxed.pbc src/install_config$(O) $(PBC_TO_EXE)
+	$(PBC_TO_EXE) winxed.pbc --install