Use target from versions

Author: javalikescript

Makefile

@@ -1,32 +1,12 @@
-
-UNAME_S := $(shell uname -s)
-UNAME_M := $(shell uname -m)
-MK_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-
-ARCH = x86_64
-
-ifeq ($(UNAME_S),Linux)
-	PLAT ?= linux
-else
-	PLAT ?= windows
-	MK_PATH := $(subst /c/,C:/,$(MK_PATH))
-endif
-
-ifdef HOST
-	CROSS_PREFIX ?= $(HOST)-
-	ifneq (,$(findstring arm,$(HOST)))
-		ARCH = arm
-	else ifneq (,$(findstring aarch64,$(HOST)))
-		ARCH = aarch64
-	endif
-endif
-
-LUACLIBS := ../luaclibs
-LUACLIBS_DIST := $(LUACLIBS)/dist-$(PLAT)
-#LUAJLS := $(LUACLIBS)/luajls
-LUAJLS := $(LUACLIBS_DIST)
+LUACLIBS := ../luaclibs/dist
+LUAJLS := $(LUACLIBS)
 LHA_DIST := dist
 
+PLAT ?= $(shell grep ^platform $(LUACLIBS)/versions.txt | cut -f2)
+TARGET_NAME ?= $(shell grep ^target $(LUACLIBS)/versions.txt | cut -f2)
+RELEASE_DATE = $(shell date '+%Y%m%d')
+RELEASE_NAME ?= -$(TARGET_NAME).$(RELEASE_DATE)
+
 SO_windows=dll
 EXE_windows=.exe
 ZIP_windows=.zip
@@ -40,67 +20,65 @@ EXE := $(EXE_$(PLAT))
 MAIN_MK := $(MK_$(PLAT))
 ZIP := $(ZIP_$(PLAT))
 
-GCC_NAME ?= $(shell $(CROSS_PREFIX)gcc -dumpmachine)
-LUA_DATE = $(shell date '+%Y%m%d')
-DIST_SUFFIX ?= -$(GCC_NAME).$(LUA_DATE)
-
-WEBVIEW_ARCH = x64
-ifeq (,$(findstring x86_64,$(GCC_NAME)))
-  WEBVIEW_ARCH = x86
-endif
-
 main: dist-archive
 
 show:
-	@echo ARCH: $(ARCH)
 	@echo PLAT: $(PLAT)
-	@echo DIST_SUFFIX: $(DIST_SUFFIX)
-	@echo UNAME_S: $(UNAME_S)
-	@echo UNAME_M: $(UNAME_M)
-
-dist-copy-linux:
-	cp -u $(LUACLIBS_DIST)/linux.$(SO) $(LHA_DIST)/bin/
-	cp -u lha.sh $(LHA_DIST)/
-
-dist-copy-windows:
-	cp -u $(LUACLIBS_DIST)/lua*.$(SO) $(LHA_DIST)/bin/
-	-cp -u $(LUACLIBS_DIST)/win32.$(SO) $(FCUT_DIST_CLUA)/
-	cp -u lha.bat $(LHA_DIST)/
-
-dist-copy: dist-copy-$(PLAT)
-	cp -u $(LUACLIBS_DIST)/lua$(EXE) $(LHA_DIST)/bin/
-	cp -u $(LUACLIBS_DIST)/cjson.$(SO) $(LHA_DIST)/bin/
-	cp -u $(LUACLIBS_DIST)/luv.$(SO) $(LHA_DIST)/bin/
-	cp -u $(LUACLIBS_DIST)/openssl.$(SO) $(LHA_DIST)/bin/
-	cp -u $(LUACLIBS_DIST)/serial.$(SO) $(LHA_DIST)/bin/
-	cp -u $(LUACLIBS_DIST)/zlib.$(SO) $(LHA_DIST)/bin/
-	cp -ru $(LUACLIBS_DIST)/sha1/ $(LHA_DIST)/lua/
-	cp -u $(LUACLIBS_DIST)/XmlParser.lua $(LHA_DIST)/lua/
-	cp -u $(LUACLIBS_DIST)/sha1.lua $(LHA_DIST)/lua/
-	-cp -u $(LUACLIBS_DIST)/lpeg.$(SO) $(LHA_DIST)/bin/
+	@echo TARGET_NAME: $(TARGET_NAME)
+	@echo RELEASE_DATE: $(RELEASE_DATE)
+	@echo RELEASE_NAME: $(RELEASE_NAME)
+
+dist-bin-linux:
+	cp -u $(LUACLIBS)/linux.$(SO) $(LHA_DIST)/bin/
+
+dist-bin-windows:
+	cp -u $(LUACLIBS)/lua*.$(SO) $(LHA_DIST)/bin/
+	-cp -u $(LUACLIBS)/win32.$(SO) $(FCUT_DIST_CLUA)/
+
+dist-bin: dist-bin-$(PLAT)
+	cp -u $(LUACLIBS)/lua$(EXE) $(LHA_DIST)/bin/
+	cp -u $(LUACLIBS)/cjson.$(SO) $(LHA_DIST)/bin/
+	cp -u $(LUACLIBS)/luv.$(SO) $(LHA_DIST)/bin/
+	cp -u $(LUACLIBS)/openssl.$(SO) $(LHA_DIST)/bin/
+	cp -u $(LUACLIBS)/serial.$(SO) $(LHA_DIST)/bin/
+	cp -u $(LUACLIBS)/zlib.$(SO) $(LHA_DIST)/bin/
+	-cp -u $(LUACLIBS)/lpeg.$(SO) $(LHA_DIST)/bin/
+
+dist-any:
+	cp -ru $(LUACLIBS)/sha1/ $(LHA_DIST)/lua/
+	cp -u $(LUACLIBS)/sha1.lua $(LHA_DIST)/lua/
+	cp -u $(LUACLIBS)/XmlParser.lua $(LHA_DIST)/lua/
 	cp -ru $(LUAJLS)/jls/ $(LHA_DIST)/lua/
 	cp -ru lha/ $(LHA_DIST)/lua/
+	cp -u lha.sh $(LHA_DIST)/
+	cp -u lha.bat $(LHA_DIST)/
 	cp -u *.lua $(LHA_DIST)/
 	cp -ru extensions/ $(LHA_DIST)/
 	cp -ru assets/ $(LHA_DIST)/extensions/web-base/
 
 dist-clean:
 	rm -rf $(LHA_DIST)
 
+dist-bin-prepare:
+	mkdir $(LHA_DIST)/bin
+
 dist-prepare:
 	-mkdir $(LHA_DIST)
-	mkdir $(LHA_DIST)/bin
 	mkdir $(LHA_DIST)/lua
 	mkdir $(LHA_DIST)/work
 
-dist: dist-clean dist-prepare dist-copy
+dist: dist-clean dist-prepare dist-any
+
+dist-full: dist dist-bin-prepare dist-bin
 
 dist.tar.gz:
-	cd $(LHA_DIST) && tar --group=jls --owner=jls -zcvf lha$(DIST_SUFFIX).tar.gz *
+	cd $(LHA_DIST) && tar --group=jls --owner=jls -zcvf lha$(RELEASE_NAME).tar.gz *
 
 dist.zip:
-	cd $(LHA_DIST) && zip -r lha$(DIST_SUFFIX).zip *
+	cd $(LHA_DIST) && zip -q -r lha$(RELEASE_NAME).zip *
 
 dist-archive: dist dist$(ZIP)
 
+dist-full-archive release: dist-full dist$(ZIP)
+
 .PHONY: dist