Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DDOX page layout and improve building dpl-docs on win32 #901

Merged
merged 4 commits into from
Feb 15, 2015

Conversation

s-ludwig
Copy link
Member

Updates layout.dt to the latest dlang.org layout and cleans the dpl-docs executable (and intermediate build files) on make -f win32 clean. It also currently forces a rebuild of dpl-docs to work around dlang/dub#331. The Posix makefile still needs to receive some fixes/improvements, which is subject to a separate pull request.

CyberShadow added a commit that referenced this pull request Feb 15, 2015
Fix DDOX page layout and improve building dpl-docs on win32
@CyberShadow CyberShadow merged commit 2868a87 into dlang:master Feb 15, 2015
@CyberShadow
Copy link
Member

Thanks a lot! I'm going to try to build & update the site right now.

@CyberShadow
Copy link
Member

OK, I got it to work after nuking ~/.dub. I don't know if that's a one-time thing after the fix, or if there's still something odd with dependecies.

Looks good: http://dlang.org/library/

@s-ludwig
Copy link
Member Author

Still those linker errors or failure to rebuild the updated layout? I noticed the linker issues now, too, but didn't have the time to dig deeper. It happened for me when the ${STABLE_DMD} in posix.mak was used instead of the locally installed DMD.

@CyberShadow
Copy link
Member

Failure to rebuild the updated layout. I think I cleaned/deleted everything except ~/.dub before pulling/building.

@CyberShadow
Copy link
Member

I think the linker errors I saw were related to issue 12572 and my workaround, which involves modifying /etc/dmd.conf. Could it sometimes be invoking dmd with a custom configuration, ignoring the system-wide one?

@s-ludwig
Copy link
Member Author

For the specific case of libcurl, I've added a different workaround to DUB's build.sh (appending -lphobos2 a second time, so that the curl symbols are dragged out eventually). But it still failed for the "stable" one and there have also been unresolved linker errors for libevent, although that should not be affected (it's passed in the right order to the linker command).

But in any case, there is nothing in the make file or in DUB (that I know of) that would explicitly switch to a different configuration. But configuration selection seems to be an issue anyway: https://issues.dlang.org/show_bug.cgi?id=14180

@MartinNowak
Copy link
Member

I wonder how hard it would be to integrate the symbol search into the old documentation search?

@s-ludwig
Copy link
Member Author

You mean using the symbol table for the DDOX search for searching/navigating in the Ddoc documentation? That should be relatively straight forward. But we should generally probably aim for an AJAX based solution, because the symbol table currently takes up almost 500 kB when transferred uncompressed (about 50 kB gzipped).

@CyberShadow
Copy link
Member

Oh. Um... What about d.tag?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants