move dpl_rewrite rule to dpl specific .htaccess

dlang · Apr 2, 2015 · 05f2456 · 05f2456
1 parent eab3a6f
commit 05f2456
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/.htaccess b/.htaccess
@@ -17,6 +17,3 @@ RewriteBase /
 # previous stable releases (namely, std.container).
 
 RewriteRule ^(phobos(-prerelease)?/std_container)_package\.html $1.html [R=301,L]
-# rewrite any URL in dpl_rewrite_map
-RewriteCond ${dpl_rewrite_map:%{REQUEST_URI}|NOT_FOUND} !NOT_FOUND
-RewriteRule ^ ${dpl_rewrite_map:%{REQUEST_URI}} [R=301,L]
diff --git a/dpl_prerelease_htaccess b/dpl_prerelease_htaccess
@@ -0,0 +1,7 @@
+# Enable mod_rewrite
+RewriteEngine On
+RewriteBase /library-prerelease/
+
+# rewrite any URL in dpl_rewrite_map
+RewriteCond ${dpl_rewrite_map:%{REQUEST_URI}|NOT_FOUND} !NOT_FOUND
+RewriteRule ^ ${dpl_rewrite_map:%{REQUEST_URI}} [R=301,L]
diff --git a/dpl_release_htaccess b/dpl_release_htaccess
@@ -0,0 +1,7 @@
+# Enable mod_rewrite
+RewriteEngine On
+RewriteBase /library/
+
+# rewrite any URL in dpl_rewrite_map
+RewriteCond ${dpl_rewrite_map:%{REQUEST_URI}|NOT_FOUND} !NOT_FOUND
+RewriteRule ^ ${dpl_rewrite_map:%{REQUEST_URI}} [R=301,L]
diff --git a/posix.mak b/posix.mak
@@ -395,8 +395,8 @@ ${DOC_OUTPUT_DIR}/phobos-prerelease/index.verbatim : verbatim.ddoc \
 # phobos and druntime, latest released build and current build (DDOX version)
 ################################################################################
 
-apidocs-prerelease : ${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml
-apidocs-release : ${DOC_OUTPUT_DIR}/library/sitemap.xml
+apidocs-prerelease : ${DOC_OUTPUT_DIR}/library-prerelease/sitemap.xml ${DOC_OUTPUT_DIR}/library-prerelease/.htaccess
+apidocs-release : ${DOC_OUTPUT_DIR}/library/sitemap.xml ${DOC_OUTPUT_DIR}/library/.htaccess
 apidocs-serve : docs-prerelease.json
 	${DPL_DOCS} serve-html --std-macros=html.ddoc --std-macros=dlang.org.ddoc --std-macros=std.ddoc --std-macros=macros.ddoc --std-macros=std-ddox.ddoc \
 	  --override-macros=std-ddox-override.ddoc --package-order=std \
@@ -414,6 +414,12 @@ ${DOC_OUTPUT_DIR}/library/sitemap.xml : docs.json
 	  --override-macros=std-ddox-override.ddoc --package-order=std \
 	  --git-target=v${LATEST} docs.json ${DOC_OUTPUT_DIR}/library
 
+${DOC_OUTPUT_DIR}/library/.htaccess : dpl_release_htaccess
+	cp $< $@
+
+${DOC_OUTPUT_DIR}/library-prerelease/.htaccess : dpl_prerelease_htaccess
+	cp $< $@
+
 docs.json : ${DMD_REL} ${DRUNTIME_DIR}-${LATEST}/.cloned \
 		${PHOBOS_DIR}-${LATEST}/.cloned | dpl-docs
 	find ${DRUNTIME_DIR}-${LATEST}/src -name '*.d' | \