mirrors/tools
1
0
Fork 0
mirror of https://github.com/dlang/tools.git synced 2025-04-25 12:40:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

dman: Use d-tags.json instead of d.tag

Browse source 
Fixes issue 17731.
This commit is contained in:
Vladimir Panteleev 2017-08-08 15:43:28 +00:00
parent ee59ec9291
commit 72ab90cead
No known key found for this signature in database
GPG key ID: 5004F0FAD051576D
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dman.d
View file

@ -128,12 +128,13 @@ string DmcCommands(string topic)
string D(string topic)
{
static struct IndexEntry { string keyword; string[] urls; }
static IndexEntry[] entries = mixin (import("d.tag"));
static immutable tagJson = import("d-tags.json");
foreach (entry; entries)
if (entry.keyword == topic && entry.urls.length)
return entry.urls[0];
import std.json;
JSONValue tags = parseJSON(tagJson);
if (topic in tags && tags[topic].array.length)
return tags[topic][0].str;
return null;
}

6
posix.mak
View file

@ -77,10 +77,10 @@ $(TOOLS) $(DOC_TOOLS) $(CURL_TOOLS) $(TEST_TOOLS): $(ROOT)/%: %.d
ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG = # ???
$(DOC)/d.tag : $(ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG)
${MAKE} --directory=${DOC} -f posix.mak d.tag
$(DOC)/d-tags.json : $(ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG)
${MAKE} --directory=${DOC} -f posix.mak d-tags.json
$(ROOT)/dman: $(DOC)/d.tag
$(ROOT)/dman: $(DOC)/d-tags.json
$(ROOT)/dman: DFLAGS += -J$(DOC)
install: $(TOOLS) $(CURL_TOOLS) $(ROOT)/dustmite

6
win32.mak
View file

@ -54,10 +54,10 @@ dustmite: $(ROOT)\dustmite.exe
ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG = # ???
$(DOC)\d.tag : $(ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG)
cmd /C "cd $(DOC) && $(MAKE) -f win32.mak d.tag"
$(DOC)\d-tags.json : $(ALL_OF_PHOBOS_DRUNTIME_AND_DLANG_ORG)
cmd /C "cd $(DOC) && $(MAKE) -f win32.mak d-tags.json"
$(ROOT)\dman.exe : dman.d $(DOC)\d.tag
$(ROOT)\dman.exe : dman.d $(DOC)\d-tags.json
$(DMD) $(DFLAGS) -of$@ dman.d -J$(DOC)
$(ROOT)\rdmd.exe : rdmd.d