all: stop using src/ dir, update licenses.json
This commit is contained in:
		
							
								
								
									
										11
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								Makefile
									
									
									
									
									
								
							@@ -1,12 +1,11 @@
 | 
				
			|||||||
SRC_DIR = src
 | 
					 | 
				
			||||||
DOC_DIR = doc
 | 
					DOC_DIR = doc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SPDX_LICENSE_LIST_FILE = src/licenselist.json
 | 
					SPDX_LICENSE_LIST_FILE = licenses.json
 | 
				
			||||||
SPDX_LICENSE_LIST_FILE_MIN = src/licenselist.min.json
 | 
					SPDX_LICENSE_LIST_FILE_MIN = licenses.min.json
 | 
				
			||||||
SPDX_LICENSE_LIST_FILE_TMP = /tmp/licenselist.json.new
 | 
					SPDX_LICENSE_LIST_FILE_TMP = /tmp/licenses.json.new
 | 
				
			||||||
SPDX_LICENSE_LIST_JSON_URL = https://spdx.org/licenses/licenses.json
 | 
					SPDX_LICENSE_LIST_JSON_URL = https://spdx.org/licenses/licenses.json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
licenselist:
 | 
					licenses:
 | 
				
			||||||
	wget -q -O $(SPDX_LICENSE_LIST_FILE_TMP) $(SPDX_LICENSE_LIST_JSON_URL)
 | 
						wget -q -O $(SPDX_LICENSE_LIST_FILE_TMP) $(SPDX_LICENSE_LIST_JSON_URL)
 | 
				
			||||||
	if ! diff $(SPDX_LICENSE_LIST_FILE) $(SPDX_LICENSE_LIST_FILE_TMP) >/dev/null 2>&1; \
 | 
						if ! diff $(SPDX_LICENSE_LIST_FILE) $(SPDX_LICENSE_LIST_FILE_TMP) >/dev/null 2>&1; \
 | 
				
			||||||
		then mv -v $(SPDX_LICENSE_LIST_FILE_TMP) $(SPDX_LICENSE_LIST_FILE); \
 | 
							then mv -v $(SPDX_LICENSE_LIST_FILE_TMP) $(SPDX_LICENSE_LIST_FILE); \
 | 
				
			||||||
@@ -14,7 +13,7 @@ licenselist:
 | 
				
			|||||||
	jq -c . < $(SPDX_LICENSE_LIST_FILE) > $(SPDX_LICENSE_LIST_FILE_MIN)
 | 
						jq -c . < $(SPDX_LICENSE_LIST_FILE) > $(SPDX_LICENSE_LIST_FILE_MIN)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
doc:
 | 
					doc:
 | 
				
			||||||
	v doc -f html -m ./$(SRC_DIR) -o $(DOC_DIR)
 | 
						v doc -f html -m . -o $(DOC_DIR)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
serve: clean doc
 | 
					serve: clean doc
 | 
				
			||||||
	v -e "import net.http.file; file.serve(folder: '$(DOC_DIR)')"
 | 
						v -e "import net.http.file; file.serve(folder: '$(DOC_DIR)')"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -3,7 +3,7 @@ module licenseid
 | 
				
			|||||||
import json
 | 
					import json
 | 
				
			||||||
import net.http
 | 
					import net.http
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const licenses_file = $embed_file('licenselist.min.json')
 | 
					const licenses_file = $embed_file('licenses.min.json')
 | 
				
			||||||
const licenses = json.decode(LicenseList, licenses_file.to_string()) or { LicenseList{} }
 | 
					const licenses = json.decode(LicenseList, licenses_file.to_string()) or { LicenseList{} }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct LicenseList {
 | 
					struct LicenseList {
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user