From 196a9e264f0b7735d88743ee6cfb302a7f8b2b6b Mon Sep 17 00:00:00 2001 From: Luke Gorrie Date: Fri, 7 Jul 2017 08:39:55 +0000 Subject: [PATCH] Makefile: s/LuaJIT 2.1.0-beta2/RaptorJIT 1.0.0-alpha1/ --- Makefile | 20 ++++++++++---------- src/Makefile | 30 +++++++++++------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 4370b4bbbe..1d70f23428 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ############################################################################## -# LuaJIT top level Makefile for installation. Requires GNU Make. +# RaptorJIT top level Makefile for installation. Requires GNU Make. # # Please read doc/install.html before changing any variables! # @@ -13,10 +13,10 @@ # Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h ############################################################################## -MAJVER= 2 -MINVER= 1 +MAJVER= 1 +MINVER= 0 RELVER= 0 -PREREL= -beta2 +PREREL= -alpha1 VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) ABIVER= 5.1 @@ -109,12 +109,12 @@ endif INSTALL_DEP= src/luajit default all $(INSTALL_DEP): - @echo "==== Building LuaJIT $(VERSION) ====" + @echo "==== Building RaptorJIT $(VERSION) ====" $(MAKE) -C src - @echo "==== Successfully built LuaJIT $(VERSION) ====" + @echo "==== Successfully built RaptorJIT $(VERSION) ====" install: $(INSTALL_DEP) - @echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ====" + @echo "==== Installing RaptorJIT $(VERSION) to $(PREFIX) ====" $(MKDIR) $(INSTALL_DIRS) cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T) cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || : @@ -130,7 +130,7 @@ install: $(INSTALL_DEP) $(RM) $(FILE_PC).tmp cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC) cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB) - @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ====" + @echo "==== Successfully installed RaptorJIT $(VERSION) to $(PREFIX) ====" @echo "" @echo "Note: the development releases deliberately do NOT install a symlink for luajit" @echo "You can do this now by running this command (with sudo):" @@ -140,7 +140,7 @@ install: $(INSTALL_DEP) uninstall: - @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ====" + @echo "==== Uninstalling RaptorJIT $(VERSION) from $(PREFIX) ====" $(UNINSTALL) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC) for file in $(FILES_JITLIB); do \ $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \ @@ -150,7 +150,7 @@ uninstall: done $(LDCONFIG) $(INSTALL_LIB) $(RMDIR) $(UNINSTALL_DIRS) || : - @echo "==== Successfully uninstalled LuaJIT $(VERSION) from $(PREFIX) ====" + @echo "==== Successfully uninstalled RaptorJIT $(VERSION) from $(PREFIX) ====" ############################################################################## diff --git a/src/Makefile b/src/Makefile index a746787d12..795ee73b35 100644 --- a/src/Makefile +++ b/src/Makefile @@ -10,8 +10,8 @@ # Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h ############################################################################## -MAJVER= 2 -MINVER= 1 +MAJVER= 1 +MINVER= 0 RELVER= 0 ABIVER= 5.1 NODOTABIVER= 51 @@ -24,14 +24,6 @@ NODOTABIVER= 51 # removing the '#' in front of them. Make sure you force a full recompile # with "make clean", followed by "make" if you change any options. # -DEFAULT_CC = clang -# -# LuaJIT builds as a native 32 or 64 bit binary by default. -CC= $(DEFAULT_CC) -# -# Use this if you want to force a 32 bit build on a 64 bit multilib OS. -#CC= $(DEFAULT_CC) -m32 -# # Since the assembler part does NOT maintain a frame pointer, it's pointless # to slow down the C part by not omitting it. Debugging, tracebacks and # unwinding are not affected -- the assembler part has frame unwind @@ -161,8 +153,8 @@ TARGET_LD= $(CROSS)$(CC) TARGET_AR= $(CROSS)ar rcus 2>/dev/null TARGET_LIBPATH= $(or $(PREFIX),/usr/local)/$(or $(MULTILIB),lib) -TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER) -TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib +TARGET_SONAME= libraptorjit-$(ABIVER).so.$(MAJVER) +TARGET_DYLIBNAME= libraptorjit-$(ABIVER).$(MAJVER).dylib TARGET_DYLIBPATH= $(TARGET_LIBPATH)/$(TARGET_DYLIBNAME) TARGET_DLLNAME= lua$(NODOTABIVER).dll TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME) @@ -253,17 +245,17 @@ LJVMCORE_DYNO= $(LJVMCORE_O:.o=_dyn.o) LIB_VMDEF= jit/vmdef.lua LIB_VMDEFP= $(LIB_VMDEF) -LUAJIT_O= luajit.o -LUAJIT_A= libluajit.a -LUAJIT_SO= libluajit.so -LUAJIT_T= luajit +LUAJIT_O= raptorjit.o +LUAJIT_A= raptorjit.a +LUAJIT_SO= libraptorjit.so +LUAJIT_T= raptorjit ALL_T= $(LUAJIT_T) $(LUAJIT_A) $(LUAJIT_SO) $(HOST_T) ALL_HDRGEN= lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h \ host/buildvm_arch.h ALL_GEN= $(LJVM_S) $(ALL_HDRGEN) $(LIB_VMDEFP) WIN_RM= *.obj *.lib *.exp *.dll *.exe *.manifest *.pdb *.ilk -ALL_RM= $(ALL_T) $(ALL_GEN) *.o host/*.o $(WIN_RM) +ALL_RM= $(ALL_T) *.o host/*.o $(WIN_RM) ############################################################################## # Build mode handling. @@ -365,7 +357,7 @@ lj_folddef.h: $(BUILDVM_T) lj_opt_fold.c $(LUAJIT_O): $(E) "CC $@" - $(Q)$(TARGET_STCC) $(TARGET_ACFLAGS) -c -o $@ $< + $(Q)$(TARGET_STCC) $(TARGET_ACFLAGS) -c -o $@ luajit.c $(HOST_O): %.o: %.c $(E) "HOSTCC $@" @@ -389,6 +381,6 @@ $(LUAJIT_SO): $(LJVMCORE_O) $(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP) $(E) "LINK $@" $(Q)$(TARGET_LD) $(TARGET_ALDFLAGS) -o $@ $(LUAJIT_O) $(TARGET_O) $(TARGET_ALIBS) - $(E) "OK Successfully built LuaJIT" + $(E) "OK Successfully built RaptorJIT" ##############################################################################