[svn:parrot] r45930 - in trunk: compilers/data_json tools/dev
plobsing at svn.parrot.org
plobsing at svn.parrot.org
Thu Apr 22 21:37:22 UTC 2010
Author: plobsing
Date: Thu Apr 22 21:37:22 2010
New Revision: 45930
URL: https://trac.parrot.org/parrot/changeset/45930
Log:
fix use of data_json so nci_thunk_gen works outside of the build tree.
now works inside the build tree too (crosses fingers)
Modified:
trunk/compilers/data_json/Defines.mak
trunk/compilers/data_json/Rules.mak
trunk/tools/dev/nci_thunk_gen.pir
Modified: trunk/compilers/data_json/Defines.mak
==============================================================================
--- trunk/compilers/data_json/Defines.mak Thu Apr 22 21:03:28 2010 (r45929)
+++ trunk/compilers/data_json/Defines.mak Thu Apr 22 21:37:22 2010 (r45930)
@@ -1,6 +1,6 @@
-DATA_JSON_LIB_PBCS = $(LIBRARY_DIR)/data_json.pbc
+DATA_JSON_LIB_PBCS = runtime/parrot/languages/data_json/data_json.pbc
-DATA_JSON_CLEANUPS = $(LIBRARY_DIR)/data_json.pbc \
+DATA_JSON_CLEANUPS = $(DATA_JSON_LIB_PBCS) \
compilers/data_json/data_json.pbc \
compilers/data_json/data_json/grammar.pir \
compilers/data_json/data_json/pge2pir.pir
Modified: trunk/compilers/data_json/Rules.mak
==============================================================================
--- trunk/compilers/data_json/Rules.mak Thu Apr 22 21:03:28 2010 (r45929)
+++ trunk/compilers/data_json/Rules.mak Thu Apr 22 21:37:22 2010 (r45930)
@@ -1,4 +1,5 @@
-$(LIBRARY_DIR)/data_json.pbc: compilers/data_json/data_json.pbc
+runtime/parrot/languages/data_json/data_json.pbc: compilers/data_json/data_json.pbc
+ $(MKPATH) runtime/parrot/languages/data_json
$(CP) compilers/data_json/data_json.pbc $@
compilers/data_json/data_json.pbc : \
Modified: trunk/tools/dev/nci_thunk_gen.pir
==============================================================================
--- trunk/tools/dev/nci_thunk_gen.pir Thu Apr 22 21:03:28 2010 (r45929)
+++ trunk/tools/dev/nci_thunk_gen.pir Thu Apr 22 21:37:22 2010 (r45930)
@@ -918,7 +918,7 @@
# decode table
.local pmc compiler
- load_bytecode 'data_json.pbc'
+ load_language 'data_json'
compiler = compreg 'data_json'
.local pmc table
More information about the parrot-commits
mailing list