move *.pbc in ./library

fperrad · Feb 21, 2009 · 2071b41 · 2071b41
1 parent 8956a4a
commit 2071b41
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 27 deletions.
diff --git a/config/makefiles/root.in b/config/makefiles/root.in
@@ -40,10 +40,10 @@ OPS_FILES = $(OPSDIR)/wmls.ops
 OPSLIB    = wmls
 
 PBCS = \
- $(LIBPATH)/wmlslang.pbc \
- $(LIBPATH)/wmlsfloat.pbc \
- $(LIBPATH)/wmlsstring.pbc \
- $(LIBPATH)/wmlsconsole.pbc
+ library/wmlslang.pbc \
+ library/wmlsfloat.pbc \
+ library/wmlsstring.pbc \
+ library/wmlsconsole.pbc
 
 GEN_PIR = \
  src/opcode.pir \
@@ -52,7 +52,7 @@ GEN_PIR = \
 all: \
  pmc/wmls_group$(LOAD_EXT) \
  ops/wmls_ops$(LOAD_EXT) \
- src/WMLScript.pbc \
+ library/WMLScript.pbc \
  $(PBCS)
 
 pmc/wmls_group$(LOAD_EXT) : $(PMC_FILES)
@@ -67,9 +67,9 @@ ops/wmls_ops$(LOAD_EXT) : $(OPS_FILES)
 	@cd $(OPSDIR) && $(OPSBUILD) linklibs $(OPSLIB)
 	@cd $(OPSDIR) && $(OPSBUILD) copy "--destination=$(PARROT_DYNEXT)" $(OPSLIB)
 
-src/WMLScript.pbc: src/WMLScript.pir \
+library/WMLScript.pbc: src/WMLScript.pir \
  src/script.pir src/wmlsstdlibs.pir $(GEN_PIR)
-	$(PARROT) -o src/WMLScript.pbc src/WMLScript.pir
+	$(PARROT) -o library/WMLScript.pbc src/WMLScript.pir
 
 src/opcode.pir: src/translation.rules build/translator.pl \
  build/SRM/Stack.pm build/SRM/Register.pm
@@ -79,17 +79,17 @@ src/opcode.pir: src/translation.rules build/translator.pl \
 src/stdlibs.pir: src/wmlslibs.cfg build/stdlibs.pl
 	$(PERL) build/stdlibs.pl --output src/stdlibs.pir src/wmlslibs.cfg
 
-$(LIBPATH)/wmlslang.pbc: $(LIBPATH)/wmlslang.pir
-	$(PARROT) --output=$(LIBPATH)/wmlslang.pbc $(LIBPATH)/wmlslang.pir
+library/wmlslang.pbc: $(LIBPATH)/wmlslang.pir
+	$(PARROT) --output=library/wmlslang.pbc $(LIBPATH)/wmlslang.pir
 
-$(LIBPATH)/wmlsfloat.pbc: $(LIBPATH)/wmlsfloat.pir
-	$(PARROT) --output=$(LIBPATH)/wmlsfloat.pbc $(LIBPATH)/wmlsfloat.pir
+library/wmlsfloat.pbc: $(LIBPATH)/wmlsfloat.pir
+	$(PARROT) --output=library/wmlsfloat.pbc $(LIBPATH)/wmlsfloat.pir
 
-$(LIBPATH)/wmlsstring.pbc: $(LIBPATH)/wmlsstring.pir
-	$(PARROT) --output=$(LIBPATH)/wmlsstring.pbc $(LIBPATH)/wmlsstring.pir
+library/wmlsstring.pbc: $(LIBPATH)/wmlsstring.pir
+	$(PARROT) --output=library/wmlsstring.pbc $(LIBPATH)/wmlsstring.pir
 
-$(LIBPATH)/wmlsconsole.pbc: $(LIBPATH)/wmlsconsole.pir
-	$(PARROT) --output=$(LIBPATH)/wmlsconsole.pbc $(LIBPATH)/wmlsconsole.pir
+library/wmlsconsole.pbc: $(LIBPATH)/wmlsconsole.pir
+	$(PARROT) --output=library/wmlsconsole.pbc $(LIBPATH)/wmlsconsole.pir
 
 # regenerate the Makefile
 Makefile: config/makefiles/root.in
@@ -188,7 +188,7 @@ testclean:
 
 BUILD_CLEANERS = \
  $(GEN_PIR) \
- "src/*.pbc" \
+ "*.pbc" \
  "$(PMCDIR)/*.dump" \
  "$(PMCDIR)/*.c" \
  "$(PMCDIR)/*.h" \
@@ -198,7 +198,7 @@ BUILD_CLEANERS = \
  "$(OPSDIR)/*.h" \
  "$(OPSDIR)/*$(LOAD_EXT)" \
  "$(OPSDIR)/*$(O)" \
- "$(LIBPATH)/*.pbc"
+ "library/*.pbc"
 
 clean:
 	$(RM_F) $(BUILD_CLEANERS) $(TEST_CLEANERS)

diff --git a/library/.gitignore b/library/.gitignore
@@ -0,0 +1,2 @@
+
+*.pbc
diff --git a/src/script.pir b/src/script.pir
@@ -104,7 +104,7 @@
 
   $P0 = get_hll_global '@stdlibs'
   unless null $P0 goto L1
-  load_bytecode 'languages/wmlscript/src/WMLScript.pbc'
+  load_bytecode 'languages/wmlscript/library/WMLScript.pbc'
 L1:
 PIRCODE
 

diff --git a/src/wmlsstdlibs.pir b/src/wmlsstdlibs.pir
@@ -27,10 +27,10 @@ See "WMLScript Standard Libraries Specification".
 
 .sub '__onload' :load :anon
 #    print "__onload (wmlsstdlibs.pir)\n"
-    load_bytecode 'languages/wmlscript/runtime/wmlslang.pbc'
-    load_bytecode 'languages/wmlscript/runtime/wmlsfloat.pbc'
-    load_bytecode 'languages/wmlscript/runtime/wmlsstring.pbc'
-    load_bytecode 'languages/wmlscript/runtime/wmlsconsole.pbc'
+    load_bytecode 'languages/wmlscript/library/wmlslang.pbc'
+    load_bytecode 'languages/wmlscript/library/wmlsfloat.pbc'
+    load_bytecode 'languages/wmlscript/library/wmlsstring.pbc'
+    load_bytecode 'languages/wmlscript/library/wmlsconsole.pbc'
 
     new $P0, 'Hash'
     $P1 = getLang()

diff --git a/t/runtime.t b/t/runtime.t
@@ -24,7 +24,7 @@ pir_output_is( << 'CODE', << 'OUTPUT', 'WMLScript.pbc' );
 .loadlib 'wmls_ops'
 
 .sub '_init' :anon
-  load_bytecode 'languages/wmlscript/src/WMLScript.pbc'
+  load_bytecode 'languages/wmlscript/library/WMLScript.pbc'
 .end
 
 .sub 'function0' :anon

diff --git a/wmls2pbc.pir b/wmls2pbc.pir
@@ -23,7 +23,7 @@ wmlsd, wmls2pir, wmlsi
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'languages/wmlscript/src/WMLScript.pbc'
+    load_bytecode 'languages/wmlscript/library/WMLScript.pbc'
     .local int argc
     .local string progname
     .local string filename

diff --git a/wmls2pir.pir b/wmls2pir.pir
@@ -23,7 +23,7 @@ wmlsd, wmls2pbc, wmlsi
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'languages/wmlscript/src/WMLScript.pbc'
+    load_bytecode 'languages/wmlscript/library/WMLScript.pbc'
     .local int argc
     .local string progname
     .local string filename

diff --git a/wmlsd.pir b/wmlsd.pir
@@ -23,7 +23,7 @@ wmls2pir, wmls2pbc, wmlsi
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'languages/wmlscript/src/WMLScript.pbc'
+    load_bytecode 'languages/wmlscript/library/WMLScript.pbc'
     .local int argc
     .local string progname
     .local string filename

diff --git a/wmlsi.pir b/wmlsi.pir
@@ -24,7 +24,7 @@ wmlsd, wmls2pir, wmls2pbc
 
 .sub 'main' :main
     .param pmc argv
-    load_bytecode 'languages/wmlscript/src/WMLScript.pbc'
+    load_bytecode 'languages/wmlscript/library/WMLScript.pbc'
     .local int argc
     .local string progname
     .local string filename