Script updates

.appveyor.yml

@@ -11,7 +11,7 @@ branches:
   - master
 
 build_script:
-- cmd: appveyor.msvs.bat
+- cmd: ci\appveyor.msvs.bat
 
 test: off
 deploy: off

.circleci/config.yml

@@ -0,0 +1,29 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+orbs:
+  win: circleci/[email protected]
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    executor:
+      name: win/default
+      shell: cmd.exe
+    steps:
+      - checkout
+      - run:
+          name: build
+          shell: cmd.exe
+          command: ci\ci.mingw.bat
+
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  mingw:
+    jobs:
+      - build
+

.github/workflows/c-cpp.yml

@@ -21,11 +21,11 @@ jobs:
           lua-all
           lua-all.tar.gz
           luajit-2.0
-        key: ${{ runner.os }}-cacher-1
+        key: ${{ runner.os }}-cacher-2
         restore-keys: |
-          ${{ runner.os }}-cacher-1
+          ${{ runner.os }}-cacher-2
     - name: Build & Test Linux
-      run: ./.github/workflows/ci.linux.sh
+      run: chmod +x ./ci/ci.linux.sh && ./ci/ci.linux.sh
       shell: bash
   build_mingw:
     runs-on: windows-latest
@@ -39,10 +39,10 @@ jobs:
           lua-all
           lua-all.tar.gz
           luajit-2.0
-        key: ${{ runner.os }}-cacher-1
+        key: ${{ runner.os }}-cacher-2
         restore-keys: |
-          ${{ runner.os }}-cacher-1
+          ${{ runner.os }}-cacher-2
     - name: Build & Test Windows
-      run: call .github\workflows\ci.mingw.bat
+      run: ci\ci.mingw.bat
       shell: cmd
 

.travis.yml

@@ -17,23 +17,23 @@ branches:
 
 
 before_script:
-  - chmod +x travis.linux.sh
-  - chmod +x travis.mac.sh
-  - chmod +x build.linux.sh
-  - chmod +x build.mac.sh
-  - chmod +x prereqs.sh
+  - chmod +x ./ci/travis.linux.sh
+  - chmod +x ./ci/travis.mac.sh
+  - chmod +x ./build.linux.sh
+  - chmod +x ./build.mac.sh
+  - chmod +x ./prereqs.sh
 
 
 jobs:
   allow_failures:
   - os: osx
   include:
     - stage: build
-      script: ./travis.linux.sh
+      script: ./ci/travis.linux.sh
       os: linux
       dist: trusty
     - stage: build
-      script: ./travis.mac.sh
+      script: ./ci/travis.mac.sh
       osx_image: xcode12.2
       os: osx
 

Makefile

@@ -22,7 +22,7 @@
 
 debug=0
 debug_coverage=0
-GCC=gcc
+CC=gcc
 OBJCOPY=objcopy
 AR=ar
 MAKE=make
@@ -39,7 +39,6 @@ PLATS=Windows MSVS Unix MacOS Linux
 
 FE_Windows=.bat
 FE_MSVS=.msvs.bat
-FE_MSVC=.msvs.bat
 FE_Unix=.sh
 FE_Linux=.sh
 FE_MacOS=.sh
@@ -50,10 +49,8 @@ PRE_Unix=./
 PRE_Linux=./
 PRE_MacOS=./
 
-
 # No need to modify below
 none:
-	$(warning Make is a joke)
 	@echo "Please do 'make PLAT=plat' where `plat` is one of these:"
 	@echo "    $(PLATS)"
 	@echo "Use these targets: clean-prereqs prereqs clean-build build"
@@ -71,37 +68,26 @@ default: none
 
 
 prereqs:
-	$(warning Make is a joke)
 	$(PRE_$(PLAT))prereqs$(FE_$(PLAT)) download
 
 driver:
-	$(warning Make is a joke)
 	$(PRE_$(PLAT))build$(FE_$(PLAT)) driver $(LUA_VER)
 
 package:
-	$(warning Make is a joke)
 	$(PRE_$(PLAT))build$(FE_$(PLAT)) package $(LUA_VER)
 
-
 clean-build:
-	$(warning Make is a joke)
 	$(PRE_$(PLAT))build$(FE_$(PLAT)) clean
 
 clean-prereqs:
-	$(warning Make is a joke)
 	$(PRE_$(PLAT))prereqs$(FE_$(PLAT)) clean
 
-
 reset-prereqs:
-	$(warning Make is a joke)
 	$(PRE_$(PLAT))prereqs$(FE_$(PLAT)) reset
 
+install:
+	$(PRE_$(PLAT))build$(FE_$(PLAT)) install $(PREFIX)
 
 uninstall:
-	$(warning Make is a joke)
-	$(error This program deletes by manual removal. Please delete it yourself.)
-
-install:
-	$(warning Make is a joke)
-	$($PRE_$(PLAT))build$(FE_$(PLAT)) install $(PREFIX)
+	$(PRE_$(PLAT))build$(FE_$(PLAT)) uninstall $(PREFIX)
 

build.linux.sh

@@ -48,10 +48,11 @@ help_message() {
 	printf """
 Usage:
 
-    build build lua-x.x.x           Builds the driver with a default package
+    build driver lua-x.x.x          Builds the driver with a default package
     build package lua-x.x.x         Creates packages for the driver
     build clean                     Cleans the environment of built files
-    build install {directory}       Installs to a pre-created directory
+    build install {directory}       Installs to a directory
+    build uninstall {directory}     Uninstalls an installation
     build -? /? --help              Shows this help message
 
 build and package accepts:
@@ -69,8 +70,9 @@ Listens to these variables:
     GCC_VER        - stdlib version     Default: gnu99
 
 Notes:
-    After building, you may need to configure LD_LIBRARY_PATH to bin/Release/* to test
-
+    After building, you may need to configure LD_LIBRARY_PATH=. or bin/Release/* to test
+    Uninstall will delete the directory you give it and the installed libraries
+	When uninstalling it's helpful to pipe yes in
 """
 	exit 0
 }
@@ -117,22 +119,6 @@ if [[ "${1}" == "clean" ]]; then
 	exit 0
 fi
 
-
-# - Basic Installer --------------------------------------------------
-
-
-if [[ "${1}" == "install" ]]; then
-	[[ -z "${2}" ]] && error "please specify where to install to" $LINENO
-	[[ -d "${2}" ]] || error "please create the destination folder first" $LINENO
-
-	printf "Installing to directory (${2})...\n"
-	cp -r -i ${CWD}/bin/Release/* "${2}"
-
-	printf "Done.\n"
-	exit 0
-fi
-
-
 # - Basic GCC Setup --------------------------------------------------
 
 
@@ -156,6 +142,56 @@ incdir="${CWD}/include"
 dirs="-L${srcdir} -L${libdir} -L${dlldir} -I${srcdir} -I${incdir}"
 
 
+# - Basic Installer --------------------------------------------------
+
+
+if [[ "${1}" == "install" ]]; then
+	installdir=${2}
+	if [[ -z "${2}" ]]; then
+		installdir=/usr/local/bin/LuaConsole
+	fi
+
+	printf "Installing to directory (${installdir})...\n"
+	install -D -T "${root}/luaw" "${installdir}/luaw"
+	install -D -T "${root}/lua.ico" "${installdir}/lua.ico"
+	install ${root}/liblua*.* "/usr/local/lib"
+	install ${root}/liblc* "${installdir}"
+	install -D ${root}/lang/* -t "${installdir}/lang"
+	pushd ${root}
+		echo liblua*.* > "${installdir}/installation.config"
+	popd
+	ldconfig
+
+	printf "Done. Don't forget to add '${installdir}' to your PATH.\n"
+	exit 0
+fi
+
+
+# - Basic Uninstaller --------------------------------------------------
+
+
+if [[ "${1}" == "uninstall" ]]; then
+	if [[ -z "${2}" ]]; then
+		installdir=/usr/local/bin/LuaConsole
+	else
+		installdir="${2}"
+	fi
+	printf "Deleting installed dependencies\n"
+	if [[ ! -f "${installdir}/installation.config" ]]; then
+		error "installation file missing. uninstallation failed" $LINENO
+	fi
+	for dep in $(cat "${installdir}/installation.config"); do
+		rm -i "/usr/local/lib/$dep"
+	done
+	printf "Deleting installation directory (${installdir})...\n"
+	rm -r -i "${installdir}"
+	ldconfig
+
+	printf "Done.\n"
+	exit 0
+fi
+
+
 # - Basic Cache Checking ---------------------------------------------
 
 
@@ -182,9 +218,7 @@ build_luajit() {
 		cp lualib.h "${incdir}"
 		cp lauxlib.h "${incdir}"
 		cp luajit.h "${incdir}"
-		ln libluajit.so libluajit-5.1.so.2
 		cp libluajit.so "${dlldir}"
-		cp libluajit-5.1.so.2 "${dlldir}"
 	popd
 
 	printf "Finished locally building & installing luajit.\n"
@@ -349,5 +383,5 @@ if [[ "$1" == "package" ]]; then
 	exit 0
 fi
 
-error "This shouldn't be reached!\n" $LINENO
+help_message
 

build.mingw.bat

@@ -80,6 +80,9 @@ setlocal
 		echo Remove %CWD%\lib\*.a
 		del %CWD%\lib\*.a
 		rmdir /S /Q %CWD%\bin
+		pushd %CWD%\luajit-2.0\src
+			%MAKE% clean LUAJIT_A=libmingw_luajit.dll.a
+		popd
 
 		echo Done.
 		exit /b 0
@@ -110,7 +113,6 @@ setlocal
 	REM - Basic GCC Setup --------------------------------------------------
 
 
-	REM GCC setup
 	IF [0] EQU [%debug%] (
 		set attrib=-std=gnu11 -Wall -O2
 		set root=%CWD%\bin\Release
@@ -232,8 +234,7 @@ setlocal
 	REM --------------------------------------------------------------------
 
 
-	echo This shouldn't be reached!
-	goto failure
+	goto help
 
 
 	REM --------------------------------------------------------------------
@@ -244,11 +245,10 @@ setlocal
 		echo Locally building luajit %CWD%\luajit-2.0 ...
 
 		pushd %CWD%\luajit-2.0\src
-			IF EXIST "mingw_libluajit.dll" (
+			IF EXIST "mingw_libluajit.dll.a" (
 				echo libluajit.dll already cached.
 			) ELSE (
-				%MAKE% -j%NUMBER_OF_PROCESSORS%
-				move lua51.dll	mingw_libluajit.dll
+				%MAKE% -j%NUMBER_OF_PROCESSORS% TARGET_DLLNAME=libluajit.dll TARGET_DLLDOTANAME=libmingw_luajit.dll.a
 			)
 
 			echo Locally installing luajit %CWD% ...
@@ -257,7 +257,8 @@ setlocal
 			copy /Y lualib.h		%incdir%\lualib.h
 			copy /Y lauxlib.h		%incdir%\lauxlib.h
 			copy /Y luajit.h		%incdir%\luajit.h
-			copy /Y mingw_libluajit.dll	%dlldir%\libluajit.dll
+			copy /Y libluajit.dll	%dlldir%\libluajit.dll
+			copy /Y libmingw_luajit.dll.a ..\..\lib\libmingw_luajit.dll.a
 		popd
 
 		echo Finished locally building / installing luajit.
@@ -316,13 +317,13 @@ setlocal
 	setlocal
 		IF [%1] == [luajit] (
 			set luaverdef=-DLUA_JIT_51
-			set luaverout=%dlldir%\libluajit.dll
+			set luaverout=-lmingw_luajit.dll
 		) ELSE (
-			set luaverout=%dlldir%\lib%1.dll
+			set luaverout=-l%1
 		)
 
 		echo Compiling luaw driver package %1...
-		%gcc% %attrib% %dirs% %luaverdef% -D__USE_MINGW_ANSI_STDIO=1 -DLC_LD_DLL -c %srcdir%\ldata.c %srcdir%\jitsupport.c
+		%gcc% %attrib% %dirs% -D__USE_MINGW_ANSI_STDIO=1 -DLC_LD_DLL %luaverdef% -c %srcdir%\ldata.c %srcdir%\jitsupport.c
 
 		echo Linking luaw driver package liblc%1.dll...
 		%GCC% %attrib% %dirs% -shared -o liblc%1.dll ldata.o jitsupport.o %luaverout%
@@ -358,7 +359,7 @@ REM Simplex help message
 :help
 	echo Usage:
 	echo.
-	echo     build build lua-x.x.x           Builds the driver with a default package
+	echo     build driver lua-x.x.x          Builds the driver with a default package
 	echo     build package lua-x.x.x         Creates packages for the driver
 	echo     build clean                     Cleans the environment of built files
 	echo     build install [directory]       Installs to a pre-created directory

build.msvs.bat

@@ -355,7 +355,7 @@ REM Simplex help message
 :help
 	echo Usage:
 	echo.
-	echo     build build lua-x.x.x           Builds the driver with a default package
+	echo     build driver lua-x.x.x          Builds the driver with a default package
 	echo     build package lua-x.x.x         Creates packages for the driver
 	echo     build clean                     Cleans the environment of built files
 	echo     build install [directory]       Installs to a pre-created directory