← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/remove-stxdocs into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/remove-stxdocs into lp:launchpad.

Commit message:
Remove stxdocs and the top-level "make zcmldocs" target.

Requested reviews:
  Colin Watson (cjwatson)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/remove-stxdocs/+merge/268755

Remove stxdocs and the top-level "make zcmldocs" target.

It hasn't worked since at least 2009 (when sourcecode/zope went away), so evidently nobody cares; zope.configuration.stxdocs was removed in zope.configuration 4.0.1, so it'll stop working even more when we upgrade to that; and it's a bit of buildout-level configuration we can simplify away.
-- 
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.
=== modified file 'Makefile'
--- Makefile	2014-12-28 15:29:35 +0000
+++ Makefile	2015-08-21 14:05:33 +0000
@@ -54,7 +54,7 @@
     bin/i18ncompile bin/i18nextract bin/i18nmergeall bin/i18nstats \
     bin/harness bin/iharness bin/ipy bin/jsbuild bin/lpjsmin\
     bin/killservice bin/kill-test-services bin/lint.sh bin/retest \
-    bin/run bin/run-testapp bin/sprite-util bin/start_librarian bin/stxdocs \
+    bin/run bin/run-testapp bin/sprite-util bin/start_librarian \
     bin/tags bin/test bin/tracereport bin/twistd bin/update-download-cache \
     bin/watch_jsbuild
 
@@ -418,12 +418,6 @@
 realclean: clean
 	$(RM) TAGS tags
 
-zcmldocs:
-	mkdir -p doc/zcml/namespaces.zope.org
-	bin/stxdocs \
-	    -f sourcecode/zope/src/zope/app/zcmlfiles/meta.zcml \
-	    -o doc/zcml/namespaces.zope.org
-
 potemplates: launchpad.pot
 
 # Generate launchpad.pot by extracting message ids from the source
@@ -495,4 +489,4 @@
 	launchpad.pot pagetests pull_branches pydoctor realclean	\
 	reload-apache run run-testapp runner scan_branches schema	\
 	sprite_css sprite_image start stop sync_branches TAGS tags	\
-	test_build test_inplace zcmldocs $(LP_JS_BUILD)
+	test_build test_inplace $(LP_JS_BUILD)

=== modified file 'buildout.cfg'
--- buildout.cfg	2015-01-19 10:07:47 +0000
+++ buildout.cfg	2015-08-21 14:05:33 +0000
@@ -62,7 +62,7 @@
     # See buildout.cfg, [scripts] section, "initialization" key.
     from lp_sitecustomize import main
     main('${configuration:instance_name}') # Initializes LP environment.
-entry-points = stxdocs=zope.configuration.stxdocs:main
+entry-points =
     googletestservice=lp.services.googlesearch.googletestservice:main
     tracereport=zc.zservertracelog.tracereport:main
 


References