Skip to content

Commit fbe8386

Browse files
javalikescriptjavalikescript
committed
Convert files to unix
1 parent 10ac23c commit fbe8386

File tree

7 files changed

+598
-598
lines changed

7 files changed

+598
-598
lines changed

‎LICENSE

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
Copyright 2019-2022 SPYL, javalikescript@free.fr
2-
3-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4-
associated documentation files (the "Software"), to deal in the Software without restriction,
5-
including without limitation the rights to use, copy, modify, merge, publish, distribute,
6-
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
7-
furnished to do so, subject to the following conditions:
8-
9-
The above copyright notice and this permission notice shall be included in all copies or
10-
substantial portions of the Software.
11-
12-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
13-
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
15-
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1+
Copyright 2019-2022 SPYL, javalikescript@free.fr
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4+
associated documentation files (the "Software"), to deal in the Software without restriction,
5+
including without limitation the rights to use, copy, modify, merge, publish, distribute,
6+
sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
7+
furnished to do so, subject to the following conditions:
8+
9+
The above copyright notice and this permission notice shall be included in all copies or
10+
substantial portions of the Software.
11+
12+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
13+
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
14+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
15+
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎Makefile

+89-89
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
1-
LUACLIBS := ../luaclibs/dist
2-
LUAJLS := $(LUACLIBS)
3-
LHA_DIST := dist
4-
5-
# make LUACLIBS=../luaclibs/dist-aarch64-pi LUAJLS=../luajls release
6-
7-
PLAT ?= $(shell grep ^platform $(LUACLIBS)/versions.txt | cut -f2)
8-
TARGET_NAME ?= $(shell grep ^target $(LUACLIBS)/versions.txt | cut -f2)
9-
RELEASE_DATE = $(shell date '+%Y%m%d')
10-
RELEASE_NAME ?= -$(TARGET_NAME).$(RELEASE_DATE)
11-
12-
SO_windows=dll
13-
EXE_windows=.exe
14-
ZIP_windows=.zip
15-
16-
SO_linux=so
17-
EXE_linux=
18-
ZIP_linux=.tar.gz
19-
20-
SO := $(SO_$(PLAT))
21-
EXE := $(EXE_$(PLAT))
22-
MAIN_MK := $(MK_$(PLAT))
23-
ZIP := $(ZIP_$(PLAT))
24-
25-
main: dist-archive
26-
27-
show:
28-
@echo PLAT: $(PLAT)
29-
@echo TARGET_NAME: $(TARGET_NAME)
30-
@echo RELEASE_DATE: $(RELEASE_DATE)
31-
@echo RELEASE_NAME: $(RELEASE_NAME)
32-
@echo LUACLIBS: $(LUACLIBS)
33-
@echo LUAJLS: $(LUAJLS)
34-
35-
dist-bin-linux:
36-
cp -u $(LUACLIBS)/linux.$(SO) $(LHA_DIST)/bin/
37-
38-
dist-bin-windows:
39-
cp -u $(LUACLIBS)/lua*.$(SO) $(LHA_DIST)/bin/
40-
-cp -u $(LUACLIBS)/win32.$(SO) $(FCUT_DIST_CLUA)/
41-
42-
dist-bin: dist-bin-$(PLAT)
43-
cp -u $(LUACLIBS)/lua$(EXE) $(LHA_DIST)/bin/
44-
cp -u $(LUACLIBS)/cjson.$(SO) $(LHA_DIST)/bin/
45-
cp -u $(LUACLIBS)/luv.$(SO) $(LHA_DIST)/bin/
46-
cp -u $(LUACLIBS)/openssl.$(SO) $(LHA_DIST)/bin/
47-
cp -u $(LUACLIBS)/serial.$(SO) $(LHA_DIST)/bin/
48-
cp -u $(LUACLIBS)/zlib.$(SO) $(LHA_DIST)/bin/
49-
-cp -u $(LUACLIBS)/lpeg.$(SO) $(LHA_DIST)/bin/
50-
51-
dist-any:
52-
cp -ru $(LUACLIBS)/sha1/ $(LHA_DIST)/lua/
53-
cp -u $(LUACLIBS)/sha1.lua $(LHA_DIST)/lua/
54-
cp -u $(LUACLIBS)/XmlParser.lua $(LHA_DIST)/lua/
55-
cp -ru $(LUAJLS)/jls/ $(LHA_DIST)/lua/
56-
cp -ru lha/ $(LHA_DIST)/lua/
57-
cp -u lha.sh $(LHA_DIST)/
58-
cp -u lha.bat $(LHA_DIST)/
59-
cp -u *.lua $(LHA_DIST)/
60-
cp -ru extensions/ $(LHA_DIST)/
61-
cp -ru assets/ $(LHA_DIST)/
62-
63-
dist-clean:
64-
rm -rf $(LHA_DIST)
65-
66-
dist-bin-prepare:
67-
mkdir $(LHA_DIST)/bin
68-
69-
dist-prepare:
70-
@echo Prepare release $(RELEASE_NAME) for $(PLAT)
71-
-mkdir $(LHA_DIST)
72-
mkdir $(LHA_DIST)/lua
73-
mkdir $(LHA_DIST)/work
74-
75-
dist: dist-clean dist-prepare dist-any
76-
77-
dist-full: dist dist-bin-prepare dist-bin
78-
79-
dist.tar.gz:
80-
cd $(LHA_DIST) && tar --group=jls --owner=jls -zcvf lha$(RELEASE_NAME).tar.gz *
81-
82-
dist.zip:
83-
cd $(LHA_DIST) && zip -q -r lha$(RELEASE_NAME).zip *
84-
85-
dist-archive: dist dist$(ZIP)
86-
87-
dist-full-archive release: dist-full dist$(ZIP)
88-
89-
.PHONY: dist
1+
LUACLIBS := ../luaclibs/dist
2+
LUAJLS := $(LUACLIBS)
3+
LHA_DIST := dist
4+
5+
# make LUACLIBS=../luaclibs/dist-aarch64-pi LUAJLS=../luajls release
6+
7+
PLAT ?= $(shell grep ^platform $(LUACLIBS)/versions.txt | cut -f2)
8+
TARGET_NAME ?= $(shell grep ^target $(LUACLIBS)/versions.txt | cut -f2)
9+
RELEASE_DATE = $(shell date '+%Y%m%d')
10+
RELEASE_NAME ?= -$(TARGET_NAME).$(RELEASE_DATE)
11+
12+
SO_windows=dll
13+
EXE_windows=.exe
14+
ZIP_windows=.zip
15+
16+
SO_linux=so
17+
EXE_linux=
18+
ZIP_linux=.tar.gz
19+
20+
SO := $(SO_$(PLAT))
21+
EXE := $(EXE_$(PLAT))
22+
MAIN_MK := $(MK_$(PLAT))
23+
ZIP := $(ZIP_$(PLAT))
24+
25+
main: dist-archive
26+
27+
show:
28+
@echo PLAT: $(PLAT)
29+
@echo TARGET_NAME: $(TARGET_NAME)
30+
@echo RELEASE_DATE: $(RELEASE_DATE)
31+
@echo RELEASE_NAME: $(RELEASE_NAME)
32+
@echo LUACLIBS: $(LUACLIBS)
33+
@echo LUAJLS: $(LUAJLS)
34+
35+
dist-bin-linux:
36+
cp -u $(LUACLIBS)/linux.$(SO) $(LHA_DIST)/bin/
37+
38+
dist-bin-windows:
39+
cp -u $(LUACLIBS)/lua*.$(SO) $(LHA_DIST)/bin/
40+
-cp -u $(LUACLIBS)/win32.$(SO) $(FCUT_DIST_CLUA)/
41+
42+
dist-bin: dist-bin-$(PLAT)
43+
cp -u $(LUACLIBS)/lua$(EXE) $(LHA_DIST)/bin/
44+
cp -u $(LUACLIBS)/cjson.$(SO) $(LHA_DIST)/bin/
45+
cp -u $(LUACLIBS)/luv.$(SO) $(LHA_DIST)/bin/
46+
cp -u $(LUACLIBS)/openssl.$(SO) $(LHA_DIST)/bin/
47+
cp -u $(LUACLIBS)/serial.$(SO) $(LHA_DIST)/bin/
48+
cp -u $(LUACLIBS)/zlib.$(SO) $(LHA_DIST)/bin/
49+
-cp -u $(LUACLIBS)/lpeg.$(SO) $(LHA_DIST)/bin/
50+
51+
dist-any:
52+
cp -ru $(LUACLIBS)/sha1/ $(LHA_DIST)/lua/
53+
cp -u $(LUACLIBS)/sha1.lua $(LHA_DIST)/lua/
54+
cp -u $(LUACLIBS)/XmlParser.lua $(LHA_DIST)/lua/
55+
cp -ru $(LUAJLS)/jls/ $(LHA_DIST)/lua/
56+
cp -ru lha/ $(LHA_DIST)/lua/
57+
cp -u lha.sh $(LHA_DIST)/
58+
cp -u lha.bat $(LHA_DIST)/
59+
cp -u *.lua $(LHA_DIST)/
60+
cp -ru extensions/ $(LHA_DIST)/
61+
cp -ru assets/ $(LHA_DIST)/
62+
63+
dist-clean:
64+
rm -rf $(LHA_DIST)
65+
66+
dist-bin-prepare:
67+
mkdir $(LHA_DIST)/bin
68+
69+
dist-prepare:
70+
@echo Prepare release $(RELEASE_NAME) for $(PLAT)
71+
-mkdir $(LHA_DIST)
72+
mkdir $(LHA_DIST)/lua
73+
mkdir $(LHA_DIST)/work
74+
75+
dist: dist-clean dist-prepare dist-any
76+
77+
dist-full: dist dist-bin-prepare dist-bin
78+
79+
dist.tar.gz:
80+
cd $(LHA_DIST) && tar --group=jls --owner=jls -zcvf lha$(RELEASE_NAME).tar.gz *
81+
82+
dist.zip:
83+
cd $(LHA_DIST) && zip -q -r lha$(RELEASE_NAME).zip *
84+
85+
dist-archive: dist dist$(ZIP)
86+
87+
dist-full-archive release: dist-full dist$(ZIP)
88+
89+
.PHONY: dist

‎tools/generate_ids.lua

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
local IdGenerator = require('lha.IdGenerator')
2-
3-
local os_time = os.time
4-
local function sleep(millis)
5-
local t = os_time() + (millis / 1000)
6-
while os_time() < t do end
7-
end
8-
9-
local function waitNextSecond()
10-
print('Waiting the next second...')
11-
sleep(1000)
12-
end
13-
14-
15-
local firstIdGenerator = IdGenerator:new()
16-
waitNextSecond()
17-
local secondIdGenerator = IdGenerator:new()
18-
19-
local function printNewId(idGenerator, text)
20-
print(' ', idGenerator:generate(), text)
21-
end
22-
23-
for i = 1, 3 do
24-
waitNextSecond()
25-
printNewId(firstIdGenerator, 'first')
26-
printNewId(secondIdGenerator, 'second')
27-
end
28-
29-
print()
30-
31-
--[[
32-
for i = 1, 100 do
33-
printNewId(firstIdGenerator, 'first')
34-
end
35-
]]
36-
37-
--[[
38-
Example:
39-
Z9yc SuHiD HsMsR first
40-
Z9yc SuHiD C5FY8 second
41-
LHA- SuHiD 00001 prefixed
42-
43-
Z9yc SuHiE HsMsS first
44-
Z9yc SuHiE C5FY9 second
45-
LHA- SuHiE 00002 prefixed
46-
47-
Z9yc SuHiF HsMsT first
48-
Z9yc SuHiF C5FYA second
49-
LHA- SuHiF 00003 prefixed
50-
]]
1+
local IdGenerator = require('lha.IdGenerator')
2+
3+
local os_time = os.time
4+
local function sleep(millis)
5+
local t = os_time() + (millis / 1000)
6+
while os_time() < t do end
7+
end
8+
9+
local function waitNextSecond()
10+
print('Waiting the next second...')
11+
sleep(1000)
12+
end
13+
14+
15+
local firstIdGenerator = IdGenerator:new()
16+
waitNextSecond()
17+
local secondIdGenerator = IdGenerator:new()
18+
19+
local function printNewId(idGenerator, text)
20+
print(' ', idGenerator:generate(), text)
21+
end
22+
23+
for i = 1, 3 do
24+
waitNextSecond()
25+
printNewId(firstIdGenerator, 'first')
26+
printNewId(secondIdGenerator, 'second')
27+
end
28+
29+
print()
30+
31+
--[[
32+
for i = 1, 100 do
33+
printNewId(firstIdGenerator, 'first')
34+
end
35+
]]
36+
37+
--[[
38+
Example:
39+
Z9yc SuHiD HsMsR first
40+
Z9yc SuHiD C5FY8 second
41+
LHA- SuHiD 00001 prefixed
42+
43+
Z9yc SuHiE HsMsS first
44+
Z9yc SuHiE C5FY9 second
45+
LHA- SuHiE 00002 prefixed
46+
47+
Z9yc SuHiF HsMsT first
48+
Z9yc SuHiF C5FYA second
49+
LHA- SuHiF 00003 prefixed
50+
]]

0 commit comments

Comments
 (0)