Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Makefile to copy over compatibility and tools directories, and

Browse Source 
updated launcher script to list installed nomsu versions.
This commit is contained in:
Bruce Hill 2018-07-18 01:42:12 -07:00
parent d5cfaa37be
commit 328f5cd3bb
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -17,7 +17,7 @@ CORE_NOM_FILES= $(wildcard core/*.nom)
CORE_LUA_FILES= $(patsubst %.nom,%.lua,$(CORE_NOM_FILES)) CORE_LUA_FILES= $(patsubst %.nom,%.lua,$(CORE_NOM_FILES))
LIB_NOM_FILES= $(wildcard lib/*.nom) LIB_NOM_FILES= $(wildcard lib/*.nom)
LIB_LUA_FILES= $(patsubst %.nom,%.lua,$(LIB_NOM_FILES)) LIB_LUA_FILES= $(patsubst %.nom,%.lua,$(LIB_NOM_FILES))
PEG_FILE= nomsu.peg PEG_FILES= $(wildcard nomsu.*.peg)
GET_VERSION= $(LUA_BIN) nomsu.lua --version GET_VERSION= $(LUA_BIN) nomsu.lua --version
all: build optimize all: build optimize
@ -36,7 +36,7 @@ test: build optimize
@$(LUA_BIN) nomsu.lua -c $< @$(LUA_BIN) nomsu.lua -c $<
.DELETE_ON_ERROR: version .DELETE_ON_ERROR: version
version: $(LUA_FILES) $(CORE_NOM_FILES) $(LIB_NOM_FILES) $(PEG_FILE) version: $(LUA_FILES) $(CORE_NOM_FILES) $(LIB_NOM_FILES)
@$(LUA_BIN) nomsu.lua --version > version || exit @$(LUA_BIN) nomsu.lua --version > version || exit
build: $(LUA_FILES) build: $(LUA_FILES)
@ -47,7 +47,7 @@ optimize: build $(CORE_LUA_FILES) $(LIB_LUA_FILES)
.PHONY: clean .PHONY: clean
clean: clean:
@echo "\033[1mDeleting...\033[0m" @echo "\033[1mDeleting...\033[0m"
@rm -rvf version core/*.lua lib/*.lua @rm -rvf version core/*.lua lib/*.lua tools/*.lua tests/*.lua compatibility/*.lua
.PHONY: install .PHONY: install
install: build version optimize install: build version optimize
@ -68,7 +68,7 @@ install: build version optimize
&& chmod +x $$prefix/bin/nomsu$$version \ && chmod +x $$prefix/bin/nomsu$$version \
&& cp -v nomsu $$prefix/bin \ && cp -v nomsu $$prefix/bin \
&& cp -v doc/nomsu.1 $$prefix/share/man/man1 \ && cp -v doc/nomsu.1 $$prefix/share/man/man1 \
&& cp -rv $(LUA_FILES) $(PEG_FILE) core lib tests $$prefix/share/nomsu/$$version; && cp -rv $(LUA_FILES) $(PEG_FILES) core lib compatibility tools tests $$prefix/share/nomsu/$$version;
.PHONY: uninstall .PHONY: uninstall
uninstall: version uninstall: version

3
doc/nomsu.1
View File

@ -30,6 +30,9 @@ If no input files are provided, \fBnomsu\fR will run in interactive mode.
.BI \-V " version" .BI \-V " version"
Specify the desired Nomsu version (defaults to the latest installed version). E.g. \fBnomsu -V 1.2\fR or \fBnomsu -V 1.2.5.9\fR Specify the desired Nomsu version (defaults to the latest installed version). E.g. \fBnomsu -V 1.2\fR or \fBnomsu -V 1.2.5.9\fR
.TP .TP
.BI \-L
List the installed versions of Nomsu (if \fB-V\fR is supplied, only print versions that match the requested pattern).
.TP
.B \-O .B \-O
Run the compiler in optimized mode (use precompiled .lua versions of .nom files, when available) Run the compiler in optimized mode (use precompiled .lua versions of .nom files, when available)
.TP .TP

8
nomsu
View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
while getopts ':V:' flag; do while getopts ':V:L' flag; do
case "${flag}" in case "${flag}" in
V) VERSION="${OPTARG/./\.}\\b" ;; V) VERSION="${OPTARG/./\.}\\b" ;;
L) LIST="YES" ;;
esac esac
done done
@ -11,6 +12,11 @@ else
candidates=$(ls $(dirname $BASH_SOURCE) | grep "^nomsu[0-9.]\+$") candidates=$(ls $(dirname $BASH_SOURCE) | grep "^nomsu[0-9.]\+$")
fi fi
if [[ $LIST ]]; then
echo "$candidates"
exit
fi
if [[ $candidates ]]; then if [[ $candidates ]]; then
eval $(dirname $BASH_SOURCE)/$(echo "$candidates" | sort -V | tail -n 1) $@ eval $(dirname $BASH_SOURCE)/$(echo "$candidates" | sort -V | tail -n 1) $@
else else