ajack 2004/01/20 13:55:23
Modified: python/gump/model module.py repository.py
python/gump/syndication rss.py atom.py
python/gump/utils commandLine.py
. gumpy.sh
Added: . gumpy.bat
Log:
Running the (bat) gumpy.bat on M$. Finally I can (sorta) test locally!
Worked out some minor nits through above.
Revision Changes Path
1.28 +15 -16 jakarta-gump/python/gump/model/module.py
Index: module.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/module.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- module.py 19 Jan 2004 23:53:24 -0000 1.27
+++ module.py 20 Jan 2004 21:55:23 -0000 1.28
@@ -213,19 +213,18 @@
if self.isComplete(): return
- if self.getName() == 'broken1':
- print
"------------------------------------------------------------------------"
- print "COMPLETE MODULE"
- self.xml.dump()
- print
"------------------------------------------------------------------------"
- print "COMPLETE MODULE"
- dump(self.xml)
- print
"------------------------------------------------------------------------"
- from gump.utils.xmlutils import xmlize
- print xmlize('module',self.xml)
- print "COMPLETED MODULE"
- print
"------------------------------------------------------------------------"
-
+ #if self.getName() == 'broken1':
+ # print
"------------------------------------------------------------------------"
+ # print "COMPLETE MODULE"
+ # self.xml.dump()
+ # print
"------------------------------------------------------------------------"
+ # print "COMPLETE MODULE"
+ # dump(self.xml)
+ # print
"------------------------------------------------------------------------"
+ # from gump.utils.xmlutils import xmlize
+ # print xmlize('module',self.xml)
+ # print "COMPLETED MODULE"
+ # print
"------------------------------------------------------------------------"
packaged=0
1.8 +5 -1 jakarta-gump/python/gump/model/repository.py
Index: repository.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/model/repository.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- repository.py 9 Jan 2004 19:57:18 -0000 1.7
+++ repository.py 20 Jan 2004 21:55:23 -0000 1.8
@@ -94,7 +94,11 @@
else:
raise RuntimeError, 'No URL on SVN repository: ' + self.getName()
elif 'jars'==xml.type:
- self.type='Java Arcvhives'
+ self.type='Java Archives'
+ if xml.url:
+ self.url=str(xml.url)
+ else:
+ raise RuntimeError, 'No URL on Jars repository: ' + self.getName()
else:
raise RuntimeError, 'Invalid Repository Type'
1.16 +9 -9 jakarta-gump/python/gump/syndication/rss.py
Index: rss.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/rss.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rss.py 16 Jan 2004 17:37:16 -0000 1.15
+++ rss.py 20 Jan 2004 21:55:23 -0000 1.16
@@ -234,10 +234,10 @@
def endRSS(self):
# complete the rss feed
self.rssStream.write('</rss>\n')
- log.info("RSS Newsfeed written to : " + self.rssFile);
+ log.debug("RSS Newsfeed written to : " + self.rssFile);
def serialize(self):
- log.info("RSS Newsfeed to : " + self.rssFile);
+ log.debug("RSS Newsfeed to : " + self.rssFile);
self.rssStream = open(self.rssFile,'w')
self.startRSS()
@@ -318,12 +318,12 @@
# Generate changes, only if the module had changed
if module.isUpdated() and not module.getStatePair().isUnset():
- log.info("Add module to RSS Newsfeed for : " + module.getName())
+ log.debug("Add module to RSS Newsfeed for : " + module.getName())
moduleRSS.addItem(item)
# State changes that are newsworthy...
if self.moduleOughtBeWidelySyndicated(module):
- log.info("Add module to widely distributed RSS Newsfeed for : " +
module.getName())
+ log.debug("Add module to widely distributed RSS Newsfeed for : " +
module.getName())
mainRSS.addItem(item)
for project in module.getProjects():
@@ -361,13 +361,13 @@
# Generate changes, only if the module changed
if project.getModule().isUpdated() and not
project.getStatePair().isUnset():
- log.info("Add project to RSS Newsfeed for : " + project.getName())
+ log.debug("Add project to RSS Newsfeed for : " + project.getName())
projectRSS.addItem(item)
moduleRSS.addItem(item)
# State changes that are newsworthy...
if self.projectOughtBeWidelySyndicated(project) :
- log.info("Add project to widely distributed RSS Newsfeed for : " +
project.getName())
+ log.debug("Add project to widely distributed RSS Newsfeed for : " +
project.getName())
mainRSS.addItem(item)
projectRSS.serialize()
1.11 +8 -8 jakarta-gump/python/gump/syndication/atom.py
Index: atom.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/syndication/atom.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- atom.py 16 Jan 2004 21:39:57 -0000 1.10
+++ atom.py 20 Jan 2004 21:55:23 -0000 1.11
@@ -154,7 +154,7 @@
""")
def serialize(self):
- log.info("Atom Feed to : " + self.file);
+ log.debug("Atom Feed to : " + self.file);
stream = open(self.file,'w')
@@ -219,12 +219,12 @@
# Generate changes, only if the module had changed
if module.isUpdated() and not module.getStatePair().isUnset():
- log.info("Add module to Atom Newsfeed for : " + module.getName())
+ log.debug("Add module to Atom Newsfeed for : " + module.getName())
moduleFeed.addEntry(entry)
# State changes that are newsworthy...
if self.moduleOughtBeWidelySyndicated(module):
- log.info("Add module to widely distributed Atom Newsfeed for : " +
module.getName())
+ log.debug("Add module to widely distributed Atom Newsfeed for : " +
module.getName())
mainFeed.addEntry(entry)
# Syndicate each project
@@ -259,13 +259,13 @@
# Generate changes, only if the project changed
if project.getModule().isUpdated() and not
project.getStatePair().isUnset():
- log.info("Add project to Atom Newsfeed for : " + project.getName())
+ log.debug("Add project to Atom Newsfeed for : " + project.getName())
projectFeed.addEntry(entry)
moduleFeed.addEntry(entry)
# State changes that are newsworthy...
if self.projectOughtBeWidelySyndicated(project) :
- log.info("Add project to widely distributed Atom Newsfeed for : " +
project.getName())
+ log.debug("Add project to widely distributed Atom Newsfeed for : " +
project.getName())
mainFeed.addEntry(entry)
projectFeed.serialize()
1.6 +1 -1 jakarta-gump/python/gump/utils/commandLine.py
Index: commandLine.py
===================================================================
RCS file: /home/cvs/jakarta-gump/python/gump/utils/commandLine.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- commandLine.py 9 Jan 2004 19:57:19 -0000 1.5
+++ commandLine.py 20 Jan 2004 21:55:23 -0000 1.6
@@ -146,7 +146,7 @@
else:
banner()
print
- print " No project specified, please supply a project expressions
or 'all'."
+ print " No project specified, please supply a comma separated list
of project expressions or 'all'."
print " Project wildcards are accepted, e.g. \"jakarta-*\"."
sys.exit(1)
1.27 +3 -3 jakarta-gump/gumpy.sh
Index: gumpy.sh
===================================================================
RCS file: /home/cvs/jakarta-gump/gumpy.sh,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gumpy.sh 8 Dec 2003 16:34:14 -0000 1.26
+++ gumpy.sh 20 Jan 2004 21:55:23 -0000 1.27
@@ -12,17 +12,17 @@
. $HOST_LOCAL_ENV
fi
if [ ! $GUMP ] ; then
- echo "Set the \$GUMP variable to your gump install"
+ echo "Set the \$GUMP variable to your gump install (e.g. /opt/jakarta-gump)"
exit 1
fi
if [ ! $GUMP_WS ] ; then
- echo "Set the \$GUMP_WS variable to your gump install"
+ echo "Set the \$GUMP_WS variable to your gump working area (e.g. /var/gump)"
exit 1
fi
if [ ! $GUMP_LOG_DIR ] ; then
- echo "Set the \$GUMP_LOG_DIR variable to your gump install"
+ echo "Set the \$GUMP_LOG_DIR variable to your gump WWW diredtory (e.g.
/var/www/html/gump)"
exit 1
fi
@@ -211,9 +211,7 @@
pkill -KILL -P $$
# $Log$
-# Revision 1.26 2003/12/08 16:34:14 ajack
-# 1) Gump Documentation updates
-# 2) Added 'apache.png' for RSS (an image to use)
-# 3) Made 'cvs update failure' be a warning, not an error.
-# 4) Various Output Documentation Tweaks.
+# Revision 1.27 2004/01/20 21:55:23 ajack
+# Running the (bat) gumpy.bat on M$. Finally I can (sorta) test locally!
+# Worked out some minor nits through above.
#
1.1 jakarta-gump/gumpy.bat
Index: gumpy.bat
===================================================================
REM @ECHO OFFF
REM
REM _ J A K A R T A G U M P _ J A K A R T A G U M P _ J A K A R T A G U M P _
REM
REM
REM $Header: $
REM
REM
if "%OS%"=="Windows_NT" @SETLOCAL
SET GUMP_HOST=%COMPUTERNAME%
SET LOCAL_ENV=local-env-py.sh
IF EXIST %LOCAL_ENV% CALL %LOCAL_ENV%
SET HOST_LOCAL_ENV="local-env-py-%GUMP_HOST%.sh"
IF EXIST %HOST_LOCAL_ENV% CALL %HOST_LOCAL_ENV%
IF NOT "%GUMP%" == "" GOTO hasGumpEnv
ECHO Set the GUMP variable to your gump install.
goto end
:hasGumpEnv
IF NOT "%GUMP_WS%" == "" GOTO hasGumpWSEnv
ECHO Set the GUMP_WS variable to your gump working area.
goto end
:hasGumpWSEnv
IF NOT "%GUMP_LOG_DIR%" == "" GOTO hasGumpLogDirEnv
ECHO Set the GUMP_LOG_DIR variable to your gump WWW directory.
goto end
:hasGumpLogDirEnv
SET GUMP_TARGET=all
IF NOT "" == "%1" SET GUMP_TARGET=%1
REM
REM Calculated
REM
SET GUMPY_VERSION="1.0.6"
SET GUMP_PYTHON=%GUMP%\python
SET GUMP_TMP=%GUMP%\tmp
SET GUMP_WS_TMP=%GUMP_WS%\tmp
SET GUMP_LOG=%GUMP_LOG_DIR%\gumpy.html
SET GUMP_PROFILE_LOG_DIR=%GUMP_LOG_DIR%\myprofile
IF "" == "%GUMP_WORKSPACE%" SET GUMP_WORKSPACE=%GUMP_HOST%
SET SEPARATOR=------------------------------------------------------- G U M P Y
REM
REM Ensure directory structure to write into
REM
cd %GUMP%
IF NOT EXIST %GUMP_LOG_DIR% MKDIR %GUMP_LOG_DIR%;
IF EXIST %GUMP_LOG_DIR% goto hasLogDir:
ECHO "Failed to find/create the directory GUMP_LOG_DIR=%GUMP_LOG_DIR%, can't
continue."
goto end
:hasLogDir
REM
REM Generate gumpy.html from this (into the WWW site)
REM
ECHO "<XMP>" > %GUMP_LOG%
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO "Gump run on %GUMP_HOST% >> %GUMP_LOG%
ECHO "" >> %GUMP_LOG%
ECHO "GUMP TARGET : %GUMP_TARGET%" >> %GUMP_LOG%
ECHO "" >> %GUMP_LOG%
ECHO "GUMP : %GUMP%" >> %GUMP_LOG%
ECHO "GUMP W/S : %GUMP_WS%" >> %GUMP_LOG%
ECHO "GUMP LOG : %GUMP_LOG_DIR%" >> %GUMP_LOG%
ECHO "" >> %GUMP_LOG%
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO "GUMPY.sh version %GUMPY_VERSION%" >> %GUMP_LOG%
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO "" >> %GUMP_LOG%
REM
REM Store the profile (into a myprofile dir)
REM
IF NOT EXIST %GUMP_PROFILE_LOG_DIR% MKDIR %GUMP_PROFILE_LOG_DIR%
IF EXIST %GUMP_PROFILE_LOG_DIR% GOTO hasProfileLogDir
ECHO "Profile log directory doesn't exists [%GUMP_PROFILE_LOG_DIR%"
goto end
:hasProfileLogDir
COPY %GUMP%\gumpy.sh %GUMP_PROFILE_LOG_DIR%
COPY %GUMP_HOST%.xml %GUMP_PROFILE_LOG_DIR%
IF EXIST %LOCAL_ENV% COPY %LOCAL_ENV% %GUMP_PROFILE_LOG_DIR%
IF EXIST %HOST_LOCAL_ENV% COPY %HOST_LOCAL_ENV% %GUMP_PROFILE_LOG_DIR%
REM :TODO: cp -R `grep profile %GUMP_HOST%.xml | cut -d\" -f2`
%GUMP_PROFILE_LOG_DIR%
REM
REM
REM Preliminary cleanup
REM
REM Gump-level tmp
IF EXIST %GUMP_TMP% REMOVE %GUMP_TMP%\*.txt
REM Gump work tmp
IF EXIST %GUMP_WS_TMP% REMOVE %GUMP_WS_TMP%\*.txt
REM Clear the forrest build area...
IF EXIST %GUMP_WS%\forrest\build\ REMOVE %GUMP_WS%\forrest\build\
REM
REM Do a CVS update
REM
IF NOT "" == "%GUMP_WITHOUT_CVS_UPDATE" GOTO skipCVSUpdate
ECHO %SEPARATOR% >> %GUMP_LOG%
CD %GUMP%
ECHO "Update Jakarta Gump from CVS" >> %GUMP_LOG%
cvs -q update -dP >> %GUMP_LOG% 2>&1
REMOVE -f .timestamp
:skipCVSUpdate
REM
REM Set the PYTHONPATH
REM
SET PYTHONPATH=%GUMP_PYTHON%
REM
REM Capture environment
REM
ECHO %SEPARATOR% >> %GUMP_LOG%
SET >> %GUMP_LOG%
REM Capture Python Version
python -V >> %GUMP_LOG% 2>&1
REM
REM
REM
cd %GUMP_PYTHON%
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO "Clean *.pyc files." >> %GUMP_LOG%
REM find %GUMP_PYTHON% -name '*.pyc' -exec rm {} \;
REM
REM Do the integration run
REM
cd %GUMP_PYTHON%
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO "Integrate using -w ..\%GUMP_WORKSPACE%.xml %GUMP_TARGET% %2 %3 %4 %5 %6" >>
%GUMP_LOG%
python gump\integrate.py -w ..\%GUMP_WORKSPACE%.xml %GUMP_TARGET% %2 %3 %4 %5 %6 >>
%GUMP_LOG%
IF ERRORLEVEL == 0 GOTO integratedOk
ECHO "Failed to integrate, exited with error, exiting..." >> %GUMP_LOG%
ECHO "Failed to integrate, exited with error, exiting..."
goto end
:integratedOk
ECHO %SEPARATOR% >> %GUMP_LOG%
ECHO >> %GUMP_LOG%
REM
CD %GUMP_TMP%
ECHO %SEPARATOR% >> %GUMP_LOG%
IF NOT EXIST check_forrest.txt GOTO noCheckForrest
TYPE check_forrest.txt >> %GUMP_LOG%
COPY check_forrest.txt %GUMP_LOG_DIR%
GOTO checkedForrest
:noCheckForrest:
ECHO "No Forrest Output file @ %GUMP_TMP%\check_forrest.txt" >> %GUMP_LOG%
:checkedForrest
ECHO %SEPARATOR% >> %GUMP_LOG%
IF NOT EXIST forrest.txt GOTO noForrestOutput
TYPE forrest.txt >> %GUMP_LOG%
COPY forrest.txt %GUMP_LOG_DIR%
GOTO forrested
:noForrestOutput
ECHO "No Forrest Output file @ %GUMP_TMP%\forrest.txt" >> %GUMP_LOG%
:forrested
ECHO %SEPARATOR% >> %GUMP_LOG%
IF NOT EXIST %GUMP_WS%\forrest\build\tmp\brokenlinks.txt GOTO noBrokenLinks
ECHO %SEPARATOR% >> %GUMP_LOG%
TYPE %GUMP_WS%\forrest\build\tmp\brokenlinks.txt >> %GUMP_LOG%
ECHO %SEPARATOR% >> %GUMP_LOG%
COPY %GUMP_WS%\forrest\build\tmp\brokenlinks.txt %GUMP_LOG_DIR%
:noBrokenLinks
:end
REM Just in case...
IF "" == "%GUMP%" GOTO endedWithoutGump
CD %GUMP%
:endedWithoutGump
IF "" == "%GUMP_LOG%" GOTO endedWithoutLog
ECHO "</XMP>" >> %GUMP_LOG%
:endedWithoutLog
if "%OS%"=="Windows_NT" @ENDLOCAL
:mainEnd
REM _ J A K A R T A G U M P _ J A K A R T A G U M P _ J A K A R T A G U M P _
REM
REM $Log: gumpy.sh,v $
REM
REM _ J A K A R T A G U M P _ J A K A R T A G U M P _ J A K A R T A G U M P _
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
