commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r9992 - in trunk: gnue-common/utils gnue-common/utils/helpers gnu


From: reinhard
Subject: [gnue] r9992 - in trunk: gnue-common/utils gnue-common/utils/helpers gnue-designer gnue-reports www/utils/sbin
Date: Thu, 22 Oct 2009 04:54:56 -0500 (CDT)

Author: reinhard
Date: 2009-10-22 04:54:56 -0500 (Thu, 22 Oct 2009)
New Revision: 9992

Modified:
   trunk/gnue-common/utils/helpers/rst.py
   trunk/gnue-common/utils/helpers/tools.py
   trunk/gnue-common/utils/make-packages
   trunk/gnue-designer/INSTALL
   trunk/gnue-reports/INSTALL
   trunk/www/utils/sbin/create-epydocs
   trunk/www/utils/sbin/update-tasks
Log:
Improvements for the web page build process.


Modified: trunk/gnue-common/utils/helpers/rst.py
===================================================================
--- trunk/gnue-common/utils/helpers/rst.py      2009-10-22 09:54:30 UTC (rev 
9991)
+++ trunk/gnue-common/utils/helpers/rst.py      2009-10-22 09:54:56 UTC (rev 
9992)
@@ -49,7 +49,8 @@
     def new_document(self):
         document = new_document(self.source.source_path, self.settings)
         document.reporter.attach_observer(self.report)
-        document.reporter.set_conditions('', 10000, 10000, None)
+        document.reporter.report_level = 10000
+        document.reporter.halt_level = 10000
         self._encoding = document.reporter.encoding
         self._error_handler = document.reporter.error_handler
         return document

Modified: trunk/gnue-common/utils/helpers/tools.py
===================================================================
--- trunk/gnue-common/utils/helpers/tools.py    2009-10-22 09:54:30 UTC (rev 
9991)
+++ trunk/gnue-common/utils/helpers/tools.py    2009-10-22 09:54:56 UTC (rev 
9992)
@@ -64,6 +64,9 @@
       if line.startswith("New features/changes"):
         version, date = line[32:].split(':',1)
         date = date.strip()[1:11]
+        if date == "????-??-??":
+            # Not yet released
+            continue
         buffer = []
         # Process the release time
         try:

Modified: trunk/gnue-common/utils/make-packages
===================================================================
--- trunk/gnue-common/utils/make-packages       2009-10-22 09:54:30 UTC (rev 
9991)
+++ trunk/gnue-common/utils/make-packages       2009-10-22 09:54:56 UTC (rev 
9992)
@@ -15,7 +15,7 @@
 echo "$(date --iso-8601=seconds) Creating source packages."
 rm --force MANIFEST
 rm --recursive --force build dist
-gcvs setup.py --quiet sdist --format="gztar,zip"
+LANG=C gcvs setup.py --quiet sdist --format="gztar,zip"
 
 # Create the debian package (.deb)
 if [ -z "$(type -p dh_pysupport)" ]; then

Modified: trunk/gnue-designer/INSTALL
===================================================================
--- trunk/gnue-designer/INSTALL 2009-10-22 09:54:30 UTC (rev 9991)
+++ trunk/gnue-designer/INSTALL 2009-10-22 09:54:56 UTC (rev 9992)
@@ -5,10 +5,16 @@
   a copy and save often.  You have been warned.
   ******************************************************
 
+Requirements
+------------
+
 This tool requires gnue-common and gnue-forms (with wxPython support)
 installations.  These can be downloaded from www.gnuenterprise.org.
 Designer requires python 2.4+ and wxPython 2.6.3+.
 
+Installation
+------------
+
 To install, type:
    ./setup.py install
 

Modified: trunk/gnue-reports/INSTALL
===================================================================
--- trunk/gnue-reports/INSTALL  2009-10-22 09:54:30 UTC (rev 9991)
+++ trunk/gnue-reports/INSTALL  2009-10-22 09:54:56 UTC (rev 9992)
@@ -1,9 +1,8 @@
 Installation instructions for GNUe Reports
+==========================================
 
-Note: Instructions for Debian are at the end of this document.
-
 Short Version
-=============
+-------------
 
 For the impatient...
 
@@ -23,7 +22,7 @@
 
 
 Introduction
-============
+------------
 
 GNUe Reports is the primary reporting engine for GNU Enterprise.
 It requires a few prerequisite packages to be installed prior to
@@ -35,8 +34,8 @@
 centralized (2-tier) sites.
 
 
-Prerequisites
-==============
+Requirements
+------------
 
 GNUe Reports needs some prerequisites to work. You need a database
 managment system and the scripting language Python (version 2.0 or
@@ -51,7 +50,7 @@
 
 
 Installation
-============
+------------
 
 Run the following command:
 
@@ -64,7 +63,7 @@
 
 
 Configuration
-=============
+-------------
 
 Make sure that you have a valid /usr/local/gnue/etc/gnue.conf and
 a valid /usr/local/gnue/etc/report-filters.conf.  Sample versions of
@@ -77,7 +76,8 @@
 
 
 Support for the "printer" destination
-=====================================
+-------------------------------------
+
 Currently, the only "printer" adapter available is the "bsd" adapter. This
 adapter uses the command-line "lpr".  Most Unix distro's include some form
 of the "lpr" command.
@@ -104,7 +104,8 @@
 
 
 Support for the "file" destination
-==================================
+----------------------------------
+
 Currently, the only "file" adapter available is the "text" adapter. This
 adapter simply creates a text file with the provided name.
 
@@ -130,7 +131,8 @@
 
 
 Support for the "email" destination
-===================================
+-----------------------------------
+
 Currently, the only "email" adapter available is the "sendmail" adapter.
 Work is underway for a native SMTP adapter that will communicate directly
 with an SMTP server.
@@ -156,7 +158,8 @@
 
 
 Support for the "fax" destination
-=================================
+---------------------------------
+
 Currently, the only "fax" adapter available is the "hylafax" adapter.
 Support for HylaFax is provided by the "sendfax" command.  The hylafax
 adapter does not communicate directly with the hylafax server, but,
@@ -193,7 +196,7 @@
 
 
 Debian Installation
-===================
+-------------------
 
 To install on a Debian system, you need to apt-get the following packages
 (these exist in Woody; I'm not sure about Potato):

Modified: trunk/www/utils/sbin/create-epydocs
===================================================================
--- trunk/www/utils/sbin/create-epydocs 2009-10-22 09:54:30 UTC (rev 9991)
+++ trunk/www/utils/sbin/create-epydocs 2009-10-22 09:54:56 UTC (rev 9992)
@@ -25,14 +25,12 @@
 
 ##  epydoc --pdf -q -o /usr/local/www/gnue/htdocs/tools/docs/$tool/api.pdf 
${SRC}
 
-echo
-
 rm $TMPDIR/*/index.html
 
 for t in public private
 do
 (
-echo "Converting to PHP ($t)"
+# echo "Converting to PHP ($t)"
 
 cd $TMPDIR/$t
 curstuff=`echo $t|tr p P`

Modified: trunk/www/utils/sbin/update-tasks
===================================================================
--- trunk/www/utils/sbin/update-tasks   2009-10-22 09:54:30 UTC (rev 9991)
+++ trunk/www/utils/sbin/update-tasks   2009-10-22 09:54:56 UTC (rev 9992)
@@ -17,7 +17,6 @@
 export NIGHTLIESLOG=/usr/local/www/gnue/htdocs/downloads/snapshots/build.txt
 
 export OUTFILE="/dev/tty"
-export LOCKFILE=/var/spool/update-website/DO-NOT-REMOVE.update-tasks
 export LOGLIST=/tmp/update-website.logs.$$
 echo -n > $LOGLIST
 
@@ -52,13 +51,11 @@
 
 (
 
-echo "$(date +"%F %T")  Checking for a lockfile."
-lockfile-create $LOCKFILE
-(while :; do lockfile-touch $LOCKFILE; sleep 60; done) 2>/dev/null &
-# Save the PID of the lockfile-touch process
-BADGER=$!
+if ps -C build.sh -o pid= | grep -q -v "$$"; then
+  echo "$(date +"%F %T")  update-tasks already running. Aborting."
+  exit 0
+fi
 
-
 #
 # Get our svn copy up-to-date
 #
@@ -147,9 +144,6 @@
   echo "."
 done
 
-kill ${BADGER} 2>/dev/null
-lockfile-remove $LOCKFILE
-
 echo "$(date +"%F %T")  Website update finished."
 
 ) > $OUTFILE  2>&1





reply via email to

[Prev in Thread] Current Thread [Next in Thread]