[lmi-commits] [5457] Use mirrored user manual, eliminating cvs dependency in makefiles

[Greg Chicares]

Revision: 5457
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5457
Author:   chicares
Date:     2012-05-15 12:49:16 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Use mirrored user manual, eliminating cvs dependency in makefiles

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/install_msw.sh
    lmi/trunk/workhorse.make

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-05-15 12:48:21 UTC (rev 5456)
+++ lmi/trunk/ChangeLog 2012-05-15 12:49:16 UTC (rev 5457)
@@ -30042,3 +30042,21 @@
   GNUmakefile
 Make 'happy_new_year' target usable in webpages directory.
 
+20120515T1248Z <address@hidden> [578]
+
+  COPYING.html
+  faq.html
+  group_tutorial.html
+  individual_tutorial.html
+  menu_commands.html
+  pasting_to_a_census.html
+  sequence_input.html
+  user_manual.html
+Mirror cvs user-manual webpages.
+
+20120515T1249Z <address@hidden> [578]
+
+  install_msw.sh
+  workhorse.make
+Use mirrored user manual, eliminating cvs dependency in makefiles.
+

Modified: lmi/trunk/install_msw.sh
===================================================================
--- lmi/trunk/install_msw.sh    2012-05-15 12:48:21 UTC (rev 5456)
+++ lmi/trunk/install_msw.sh    2012-05-15 12:49:16 UTC (rev 5457)
@@ -81,7 +81,6 @@
 mkdir /opt
 mount --force "C:/opt" "/opt"
 mkdir --parents /opt/lmi/src/lmi
-mkdir --parents /opt/lmi/share/doc/lmi
 umount "/opt"
 mount --force "C:/opt/lmi" "/opt/lmi"
 
@@ -91,45 +90,12 @@
 
 java -version
 
-# Avoid bogus "failed to open /home/wherever/.cvspass for reading".
-
-touch ~/.cvspass
-
-# Use 'pserver' unless 'ssh-agent' is active. This helps developers
-# who are behind a firewall that blocks port 2401 but allows 'ssh'
-# access. It is assumed that they have pointed $CVSROOT to
-#   cvs.sv.gnu.org:/sources/lmi
-# as is usual, and that they will switch back there manually after
-# running this script.
-#
-# As a last resort, a screen scraper could be used, e.g.
-#   http://downloads.sourceforge.net/cvsgrab/cvsgrab-2.3.tar.gz
-# with a command line such as this:
-#   /cvsgrab-2.3/cvsgrab.sh \
-#     -url http://cvs.sv.gnu.org/viewvc/lmi/lmi/ \
-#     -destDir cvsgrab \
-#     -webInterface ViewVC1_0
-# Unfortunately, that 'cvsgrab' command adds '-kb' to every file, so
-# developers should take care not to use it.
-
-export CVS_RSH="ssh"
-echo $CVSROOT
-ps -ef | grep --quiet ssh-agent \
-  || export CVSROOT=":pserver:address@hidden:/sources/lmi"
-
-echo $CVSROOT
 cd /opt/lmi/src
 # Prefer http to svn's own protocol because it works better from
 # behind corporate firewalls.
 #svn checkout svn://svn.sv.nongnu.org/lmi/lmi/trunk lmi
 svn checkout http://svn.sv.nongnu.org/svn/lmi/lmi/trunk lmi
 
-export CVSROOT=${CVSROOT%%/sources/lmi}/web/lmi
-echo $CVSROOT
-cd /opt/lmi/share/doc
-# Not yet available via svn...
-cvs -z3 checkout -P lmi
-
 cd /opt/lmi/src/lmi
 
 # A "Replacing former [...] mount:" message probably means that this

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2012-05-15 12:48:21 UTC (rev 5456)
+++ lmi/trunk/workhorse.make    2012-05-15 12:49:16 UTC (rev 5457)
@@ -843,11 +843,8 @@
 # component can produce a mismatched set.
 
 # SOMEDAY !! Follow the GNU Coding Standards more closely, writing
-#   bindir datadir docdir srcdir
-# all with no '_', and changing the value of $(data_dir). These are
-# intended by the GCS to represent destinations, but here $(htmldir)
-# is actually a source at present: it's the directory to which the
-# savannah 'web' cvs has been downloaded.
+#   bindir datadir srcdir
+# all with no '_', and changing the value of $(data_dir).
 
 prefix         := /opt/lmi
 exec_prefix    := $(prefix)
@@ -863,7 +860,7 @@
   $(wildcard $(addprefix $(src_dir)/,*.ico *.png *.xml *.xrc *.xsd *.xsl)) \
 
 help_files := \
-  $(wildcard $(addprefix $(htmldir)/,*.html)) \
+  $(wildcard $(addprefix $(src_dir)/,*.html)) \
 
 .PHONY: install
 install: $(default_targets)