rt 4.0.23

[freeside.git] / rt / Makefile.in

diff --git a/rt/Makefile.in b/rt/Makefile.in
index 98c2c30..8d109f3 100644 (file)
--- a/rt/Makefile.in
+++ b/rt/Makefile.in
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -157,6 +157,7 @@ SYSTEM_BINARIES             =       rt-attributes-viewer \
                                rt-shredder \
                                rt-test-dependencies \
                                rt-validator \
+                               rt-validate-aliases \
                                standalone_httpd
 
 
@@ -225,6 +226,8 @@ DB_RT_PASS          =       @DB_RT_PASS@
 TEST_FILES = t/*.t t/*/*.t
 TEST_VERBOSE = 0
 
+RT_TEST_PARALLEL_NUM ?= 5
+
 
 ####################################################################
 
@@ -300,6 +303,13 @@ fixperms:
        # Make the system binaries executable also
        cd $(DESTDIR)$(RT_SBIN_PATH) && ( chmod 0755 $(SYSTEM_BINARIES) ; chown $(BIN_OWNER) $(SYSTEM_BINARIES);  chgrp $(RTGROUP) $(SYSTEM_BINARIES))
 
+       # Make upgrade scripts executable if they are in the source.
+       #
+       # Note that we use the deprecated (by GNU/POSIX find) -perm +0NNN syntax
+       # instead of -perm /0NNN since BSD find doesn't support the latter.
+       ( cd etc/upgrade && find . -type f -not -name '*.in' -perm +0111 -print ) | while read file ; do \
+               chmod a+x "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
+       done
 
        # Make the web ui readable by all. 
        chmod -R  u+rwX,go-w,go+rX      $(DESTDIR)$(MASON_HTML_PATH) \
@@ -341,7 +351,7 @@ dirs:
 
 install: testdeps config-install dirs files-install fixperms instruct
 
-files-install: libs-install etc-install config-install bin-install sbin-install html-install local-install doc-install font-install po-install
+files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install po-install
 
 config-install:
 @COMMENT_INPLACE_LAYOUT@       $(INSTALL) -m 0755 -o $(BIN_OWNER) -g $(RTGROUP) -d $(DESTDIR)$(CONFIG_FILE_PATH)
@@ -355,7 +365,7 @@ test:
 parallel-test: test-parallel
 
 test-parallel: 
-       RT_TEST_PARALLEL=1 $(PERL) "-MApp::Prove" -e 'my $$p = App::Prove->new(); $$p->process_args("-wlrj5","--state=slow,save", "t"); $$p->run()'
+       RT_TEST_PARALLEL=1 $(PERL) "-MApp::Prove" -e 'my $$p = App::Prove->new(); $$p->process_args("-wlrj$(RT_TEST_PARALLEL_NUM)","--state=slow,save", "t"); exit( $$p->run() ? 0 : 1 )'
 
 regression-reset-db: force-dropdb
        $(PERL) -I$(LOCAL_LIB_PATH) -I$(RT_LIB_PATH) sbin/rt-setup-database --action init --dba-password ''
@@ -428,6 +438,13 @@ etc-install:
 @COMMENT_INPLACE_LAYOUT@       for file in $(ETC_FILES) ; do \
 @COMMENT_INPLACE_LAYOUT@           $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(RT_ETC_PATH)/" ; \
 @COMMENT_INPLACE_LAYOUT@       done
+@COMMENT_INPLACE_LAYOUT@       [ -d $(DESTDIR)$(RT_ETC_PATH)/upgrade ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_ETC_PATH)/upgrade
+@COMMENT_INPLACE_LAYOUT@       -( cd etc/upgrade && find . -type d -print ) | while read dir ; do \
+@COMMENT_INPLACE_LAYOUT@           $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$dir" ; \
+@COMMENT_INPLACE_LAYOUT@       done
+@COMMENT_INPLACE_LAYOUT@       -( cd etc/upgrade && find . -type f -not -name '*.in' -print ) | while read file ; do \
+@COMMENT_INPLACE_LAYOUT@           $(INSTALL) -m 0644 "etc/upgrade/$$file" "$(DESTDIR)$(RT_ETC_PATH)/upgrade/$$file" ; \
+@COMMENT_INPLACE_LAYOUT@       done
 
 
 sbin-install:
@@ -444,25 +461,6 @@ bin-install:
 @COMMENT_INPLACE_LAYOUT@           $(INSTALL) -o $(BIN_OWNER) -g $(RTGROUP) -m 0755 "bin/$$file" "$(DESTDIR)$(RT_BIN_PATH)/" ; \
 @COMMENT_INPLACE_LAYOUT@       done
 
-local-install:
-       -( cd local/html && find . -type d -print ) | while read dir ; do \
-           $(INSTALL) -m 0755 -d "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$dir" ; \
-       done
-       -( cd local/html && find . -type f -print ) | while read file ; do \
-           $(INSTALL) -m 0644 "local/html/$$file" "$(DESTDIR)$(MASON_LOCAL_HTML_PATH)/$$file" ; \
-       done
-       -( cd local/po && find . -type d -print ) | while read dir ; do \
-           $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$dir" ; \
-       done
-       -( cd local/po && find . -type f -print ) | while read file ; do \
-           $(INSTALL) -m 0644 "local/po/$$file" "$(DESTDIR)$(LOCAL_LEXICON_PATH)/$$file" ; \
-       done
-       -( cd local/etc && find . -type d -print ) | while read dir ; do \
-           $(INSTALL) -m 0755 -d "$(DESTDIR)$(LOCAL_ETC_PATH)/$$dir" ; \
-       done
-       -( cd local/etc && find . -type f -print ) | while read file ; do \
-           $(INSTALL) -m 0644 "etc/$$file" "$(DESTDIR)$(LOCAL_ETC_PATH)/$$file" ; \
-       done
 
 
 regenerate-catalogs: