From cccf7638989275e57377e2e25595213caacb7da3 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Fri, 8 Jun 2012 20:54:47 +0200
Subject: [PATCH] Move lib/* to src/jit/*.

---
 Makefile                        | 2 +-
 doc/install.html                | 2 +-
 src/Makefile                    | 2 +-
 {lib => src/jit}/.gitignore     | 0
 {lib => src/jit}/bc.lua         | 0
 {lib => src/jit}/bcsave.lua     | 0
 {lib => src/jit}/dis_arm.lua    | 0
 {lib => src/jit}/dis_mips.lua   | 0
 {lib => src/jit}/dis_mipsel.lua | 0
 {lib => src/jit}/dis_ppc.lua    | 0
 {lib => src/jit}/dis_x64.lua    | 0
 {lib => src/jit}/dis_x86.lua    | 0
 {lib => src/jit}/dump.lua       | 0
 {lib => src/jit}/v.lua          | 0
 src/msvcbuild.bat               | 2 +-
 15 files changed, 4 insertions(+), 4 deletions(-)
 rename {lib => src/jit}/.gitignore (100%)
 rename {lib => src/jit}/bc.lua (100%)
 rename {lib => src/jit}/bcsave.lua (100%)
 rename {lib => src/jit}/dis_arm.lua (100%)
 rename {lib => src/jit}/dis_mips.lua (100%)
 rename {lib => src/jit}/dis_mipsel.lua (100%)
 rename {lib => src/jit}/dis_ppc.lua (100%)
 rename {lib => src/jit}/dis_x64.lua (100%)
 rename {lib => src/jit}/dis_x86.lua (100%)
 rename {lib => src/jit}/dump.lua (100%)
 rename {lib => src/jit}/v.lua (100%)

diff --git a/Makefile b/Makefile
index e17703ac..8117692e 100644
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ install: $(INSTALL_DEP)
 	  $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
 	  $(RM) $(FILE_PC).tmp
 	cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
-	cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+	cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
 	@echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
 	@echo ""
 	@echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
diff --git a/doc/install.html b/doc/install.html
index 3731b305..f487958d 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -329,7 +329,7 @@ Then follow the installation instructions below.
 Copy <tt>luajit.exe</tt> and <tt>lua51.dll</tt> (built in the <tt>src</tt>
 directory) to a newly created directory (any location is ok).
 Add <tt>lua</tt> and <tt>lua\jit</tt> directories below it and copy
-all Lua files from the <tt>lib</tt> directory of the distribution
+all Lua files from the <tt>src\jit</tt> directory of the distribution
 to the latter directory.
 </p>
 <p>
diff --git a/src/Makefile b/src/Makefile
index a0e98068..5977c373 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -401,7 +401,7 @@ LJCORE_O= lj_gc.o lj_err.o lj_char.o lj_bc.o lj_obj.o \
 LJVMCORE_O= $(LJVM_O) $(LJCORE_O)
 LJVMCORE_DYNO= $(LJVMCORE_O:.o=_dyn.o)
 
-LIB_VMDEF= ../lib/vmdef.lua
+LIB_VMDEF= jit/vmdef.lua
 LIB_VMDEFP= $(LIB_VMDEF)
 
 LUAJIT_O= luajit.o
diff --git a/lib/.gitignore b/src/jit/.gitignore
similarity index 100%
rename from lib/.gitignore
rename to src/jit/.gitignore
diff --git a/lib/bc.lua b/src/jit/bc.lua
similarity index 100%
rename from lib/bc.lua
rename to src/jit/bc.lua
diff --git a/lib/bcsave.lua b/src/jit/bcsave.lua
similarity index 100%
rename from lib/bcsave.lua
rename to src/jit/bcsave.lua
diff --git a/lib/dis_arm.lua b/src/jit/dis_arm.lua
similarity index 100%
rename from lib/dis_arm.lua
rename to src/jit/dis_arm.lua
diff --git a/lib/dis_mips.lua b/src/jit/dis_mips.lua
similarity index 100%
rename from lib/dis_mips.lua
rename to src/jit/dis_mips.lua
diff --git a/lib/dis_mipsel.lua b/src/jit/dis_mipsel.lua
similarity index 100%
rename from lib/dis_mipsel.lua
rename to src/jit/dis_mipsel.lua
diff --git a/lib/dis_ppc.lua b/src/jit/dis_ppc.lua
similarity index 100%
rename from lib/dis_ppc.lua
rename to src/jit/dis_ppc.lua
diff --git a/lib/dis_x64.lua b/src/jit/dis_x64.lua
similarity index 100%
rename from lib/dis_x64.lua
rename to src/jit/dis_x64.lua
diff --git a/lib/dis_x86.lua b/src/jit/dis_x86.lua
similarity index 100%
rename from lib/dis_x86.lua
rename to src/jit/dis_x86.lua
diff --git a/lib/dump.lua b/src/jit/dump.lua
similarity index 100%
rename from lib/dump.lua
rename to src/jit/dump.lua
diff --git a/lib/v.lua b/src/jit/v.lua
similarity index 100%
rename from lib/v.lua
rename to src/jit/v.lua
diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 09782db4..63467308 100644
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -46,7 +46,7 @@ buildvm -m libdef -o lj_libdef.h %ALL_LIB%
 @if errorlevel 1 goto :BAD
 buildvm -m recdef -o lj_recdef.h %ALL_LIB%
 @if errorlevel 1 goto :BAD
-buildvm -m vmdef -o ..\lib\vmdef.lua %ALL_LIB%
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%
 @if errorlevel 1 goto :BAD
 buildvm -m folddef -o lj_folddef.h lj_opt_fold.c
 @if errorlevel 1 goto :BAD