Author: challngr
Date: Thu Jan 24 19:31:16 2013
New Revision: 1438135
URL: http://svn.apache.org/viewvc?rev=1438135&view=rev
Log:
UIMA-2584
Some cleanup -
fix bad dirname for duccbook in web dir
Inhibit error doing make clean of ducc_ling
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install
uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/src/Makefile
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install?rev=1438135&r1=1438134&r2=1438135&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_post_install Thu Jan 24
19:31:16 2013
@@ -240,7 +240,7 @@ class PostInstall(DuccUtil):
ws_duccbook = self.DUCC_HOME + "/webserver/root/system.duccbook.html"
if ( not os.path.lexists(ws_duccbook) ):
duccbook = self.DUCC_HOME + "/docs/book.html"
- os.symlink(duccbook, wsroot + "/system.duccbook.html")
+ os.symlink(duccbook, ws_duccbook)
print '\nDUCC book installed into webserver root\n'
# Make duccling
@@ -250,7 +250,7 @@ class PostInstall(DuccUtil):
os.chdir(here)
shutil.copyfile("../duccling/src/ducc_ling", self.DUCC_HOME +
"/admin/ducc_ling")
os.chmod(self.DUCC_HOME + '/admin/ducc_ling', 0755)
- print '\nInitial ducc_ling is installed. See the installation guide
for multi-user setup.'
+ print 'Initial ducc_ling is installed. See the installation guide for
multi-user setup.'
amqhome = self.ducc_properties.get('ducc.broker.home')
os.chdir(amqhome + '/bin')
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/src/Makefile
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/src/Makefile?rev=1438135&r1=1438134&r2=1438135&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/src/Makefile (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/src/Makefile Thu Jan 24
19:31:16 2013
@@ -4,4 +4,4 @@ CFLAGS = -g
all: ducc_ling
clean:
- @-rm ducc_ling
+ @- if [ -f ducc_ling ] ; then rm ducc_ling ; fi
