2:29 p.m.
Author: justi9
Date: 2010-05-05 15:29:01 -0400 (Wed, 05 May 2010)
New Revision: 3947
Modified:
mgmt/newdata/Makefile
mgmt/newdata/cumin/Makefile
mgmt/newdata/cumin/bin/cumin-web
mgmt/newdata/etc/Makefile.common
mgmt/newdata/mint/Makefile
mgmt/newdata/mint/python/mint/tools.py
mgmt/newdata/parsley/Makefile
mgmt/newdata/rosemary/Makefile
Log:
Install fixes
Modified: mgmt/newdata/Makefile
===================================================================
--- mgmt/newdata/Makefile 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/Makefile 2010-05-05 19:29:01 UTC (rev 3947)
@@ -8,10 +8,10 @@
@echo " tags Rebuild the tag index"
tags: check-devel-env
- find "${DEVEL_HOME}/" -name \*.py -print \
- | etags --output="${DEVEL_HOME}/etc/devel.tags" -
- find "${DEVEL_HOME}/" -name \*.strings -print \
- | etags --append --output="${DEVEL_HOME}/etc/devel.tags" \
+ find -name \*.py -print \
+ | etags --output="etc/devel.tags" -
+ find -name \*.strings -print \
+ | etags --append --output="etc/devel.tags" \
--regex='/^\[.*\][ \t]*$$/\1/' -
check-devel-env:
@@ -21,5 +21,7 @@
fi
clean:
+ $(MAKE) clean -C parsley
+ $(MAKE) clean -C rosemary
$(MAKE) clean -C mint
$(MAKE) clean -C cumin
Modified: mgmt/newdata/cumin/Makefile
===================================================================
--- mgmt/newdata/cumin/Makefile 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/cumin/Makefile 2010-05-05 19:29:01 UTC (rev 3947)
@@ -29,11 +29,11 @@
install -pm 0755 bin/* ${BIN_DIR}
install -d ${doc}
install -pm 0644 LICENSE COPYING ${doc}
+ install -d ${share}/model
+ install -pm 0644 model/*.xml ${share}/model
install -d ${share}/resources
install -pm 0644 resources/* ${share}/resources
ln -sf ../wooly/resources ${share}/resources-wooly
- ln -sf ../mint/sql ${share}/sql
- ln -sf ../mint/xml ${share}/xml
install -d ${etc}
install -pm 0644 etc/cumin.* ${etc}
install -pm 0755 etc/sysvinit-cumin ${etc}
Modified: mgmt/newdata/cumin/bin/cumin-web
===================================================================
--- mgmt/newdata/cumin/bin/cumin-web 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/cumin/bin/cumin-web 2010-05-05 19:29:01 UTC (rev 3947)
@@ -1,7 +1,5 @@
#!/usr/bin/python
-from parsley.threadingex import print_threads
-
from cumin import *
from cumin.config import *
from cumin.util import *
Modified: mgmt/newdata/etc/Makefile.common
===================================================================
--- mgmt/newdata/etc/Makefile.common 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/etc/Makefile.common 2010-05-05 19:29:01 UTC (rev 3947)
@@ -4,8 +4,8 @@
PYTHON_LIB_DIR := ${PREFIX}/lib/python
BIN_DIR := ${PREFIX}/bin
ETC_DIR := ${PREFIX}/etc
-DOC_DIR := ${PREFIX}/share/doc
SHARE_DIR := ${PREFIX}/share
+DOC_DIR := ${SHARE_DIR}/doc
ifeq (${PREFIX}, /usr/local)
VAR_DIR := /var/local
Modified: mgmt/newdata/mint/Makefile
===================================================================
--- mgmt/newdata/mint/Makefile 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/mint/Makefile 2010-05-05 19:29:01 UTC (rev 3947)
@@ -19,11 +19,5 @@
install bin/* ${BIN_DIR}
install -d ${doc}
install LICENSE COPYING ${doc}
- install -d ${share}/sql
- install sql/* ${share}/sql
- install -d ${share}/xml
- install xml/* ${share}/xml
- install -d ${etc}
- install -pm 0644 etc/mint-vacuumdb.cron ${etc}
clean: clean-python-files
Modified: mgmt/newdata/mint/python/mint/tools.py
===================================================================
--- mgmt/newdata/mint/python/mint/tools.py 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/mint/python/mint/tools.py 2010-05-05 19:29:01 UTC (rev 3947)
@@ -242,7 +242,7 @@
def run(self, opts, args):
self.parent.app.database.check_schema()
-x class ListRoles(Command):
+ class ListRoles(Command):
def run(self, opts, args):
roles = Role.select(orderBy='name')
Modified: mgmt/newdata/parsley/Makefile
===================================================================
--- mgmt/newdata/parsley/Makefile 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/parsley/Makefile 2010-05-05 19:29:01 UTC (rev 3947)
@@ -1,4 +1,4 @@
-.PHONY: build install
+.PHONY: build install clean
include ../etc/Makefile.common
@@ -11,3 +11,5 @@
install: build
install -d ${lib}
install python/parsley/*.py python/parsley/*.pyc ${lib}
+
+clean: clean-python-files
Modified: mgmt/newdata/rosemary/Makefile
===================================================================
--- mgmt/newdata/rosemary/Makefile 2010-05-05 15:58:15 UTC (rev 3946)
+++ mgmt/newdata/rosemary/Makefile 2010-05-05 19:29:01 UTC (rev 3947)
@@ -1,11 +1,10 @@
-.PHONY: build install clean schema schema-clean
+.PHONY: build install clean
include ../etc/Makefile.common
name := rosemary
lib := ${PYTHON_LIB_DIR}/${name}
-etc := ${ETC_DIR}/${name}
doc := ${DOC_DIR}/${name}
share := ${SHARE_DIR}/${name}
@@ -19,15 +18,5 @@
install bin/* ${BIN_DIR}
install -d ${doc}
install LICENSE COPYING ${doc}
- install -d ${share}/sql
- install sql/* ${share}/sql
- install -d ${etc}
- install -pm 0644 etc/* ${etc}
-schema: schema-clean
- $(MAKE) schema -C xml
-
-schema-clean:
- $(MAKE) clean -C xml
-
clean: clean-python-files