[Rt-commit] rt branch, 3.4-trunk, updated. e33a6f1aaa0e50525e637ff025e4e1833123781b
Alex M Vandiver
alexmv at bestpractical.com
Tue Feb 23 00:41:35 EST 2010
The branch, 3.4-trunk has been updated
via e33a6f1aaa0e50525e637ff025e4e1833123781b (commit)
via 58dab79a48bf0a632adda6918bc29c460ff211f6 (commit)
via 816bd471daab92a52832999b9ced649a41a70b6d (commit)
via 777188e6852d9e66dd381cdadb598e03fe5ddb50 (commit)
via 480271ff24d8744613b1f6c1be453af59e8be653 (commit)
from 7ecd95e699abbf3fb3e14e23ca89f773e01e0ac0 (commit)
Summary of changes:
.gitignore | 47 ++++++++++++++++++++++++++++++++++++++++++
Makefile.in | 22 +++++++++---------
configure.ac | 9 ++++++-
releng.cnf | 7 ------
sbin/extract-message-catalog | 2 +-
5 files changed, 66 insertions(+), 21 deletions(-)
create mode 100644 .gitignore
delete mode 100644 releng.cnf
- Log -----------------------------------------------------------------
commit 480271ff24d8744613b1f6c1be453af59e8be653
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Fri Mar 13 21:50:08 2009 +0000
Set default DBA based on database type
(cherry-picked from 821c6d5a)
diff --git a/configure.ac b/configure.ac
index a8df7ee..66adce3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -145,11 +145,16 @@ AC_ARG_WITH(db-rt-host,
AC_SUBST(DB_RT_HOST)
dnl DB_DATABASE_ADMIN
+if test "$DB_TYPE" = "Pg" ; then
+ DB_DBA="postgres"
+else
+ DB_DBA="root"
+fi
AC_ARG_WITH(db-dba,
AC_HELP_STRING([--with-db-dba=DBA],
- [name of database administrator (default: root)]),
+ [name of database administrator (default: root or postgres)]),
DB_DBA=$withval,
- DB_DBA=root)
+ DB_DBA="$DB_DBA")
AC_SUBST(DB_DBA)
dnl DB_DATABASE
commit 777188e6852d9e66dd381cdadb598e03fe5ddb50
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Wed Sep 30 17:07:24 2009 -0400
Remove references to .svn
diff --git a/Makefile.in b/Makefile.in
index 43dcee1..2424475 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -459,10 +459,10 @@ POD2TEST_EXE = sbin/extract_pod_tests
testify-pods:
[ -d lib/t/autogen ] || mkdir lib/t/autogen
- find lib -name \*pm |grep -v .svn | grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
- find bin -type f |grep -v .svn | grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
- find lib -name \*pm |grep -v .svn | grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
- find bin -type f |grep -v .svn | grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
+ find lib -name \*pm | grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
+ find bin -type f | grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
+ find lib -name \*pm | grep -v \*.in |xargs -n 1 $(PERL) $(POD2TEST_EXE)
+ find bin -type f | grep -v \~ | grep -v "\.in" | xargs -n 1 $(PERL) $(POD2TEST_EXE)
diff --git a/sbin/extract-message-catalog b/sbin/extract-message-catalog
index 3552afb..db2a5dc 100755
--- a/sbin/extract-message-catalog
+++ b/sbin/extract-message-catalog
@@ -98,7 +98,7 @@ sub extract_strings_from_code {
local $/;
return if ( -d $_ );
- return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local|\.svn' );
+ return if ( $File::Find::dir =~ 'lib/blib|lib/t/autogen|var|m4|local' );
return if ( /\.po$|\.bak$|~|,D|,B$|extract-message-catalog$/ );
return if ( /^[\.#]/ );
return if ( -f "$_.in" );
commit 816bd471daab92a52832999b9ced649a41a70b6d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Wed Sep 30 17:08:29 2009 -0400
Remove old and incorrect releng.cnf
diff --git a/releng.cnf b/releng.cnf
deleted file mode 100644
index a5ef49f..0000000
--- a/releng.cnf
+++ /dev/null
@@ -1,7 +0,0 @@
-PRODUCT = rt
-TAG = 3.4.7rc1
-CANONICAL_REPO = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
-TAGS = tags/
-TRUNK = branches/3.4-RELEASE
-TMP_DIR = /tmp
-RELEASE_DIR = /home/ftp/pub/rt/devel
commit 58dab79a48bf0a632adda6918bc29c460ff211f6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Oct 6 14:18:44 2009 -0400
Use spaces instead of tabs in commands, otherwise copy-and-paste in the terminal can fail
diff --git a/Makefile.in b/Makefile.in
index 2424475..355a842 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -242,9 +242,9 @@ upgrade-instruct:
@echo ""
@echo "For each item in that directory whose name is greater than"
@echo "your previously installed RT version, run:"
- @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action schema --datadir etc/upgrade/<version>"
- @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action acl --datadir etc/upgrade/<version>"
- @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action insert --datadir etc/upgrade/<version>"
+ @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action schema --datadir etc/upgrade/<version>"
+ @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action acl --datadir etc/upgrade/<version>"
+ @echo " $(RT_SBIN_PATH)/rt-setup-database --dba $(DB_DBA) --prompt-for-dba-password --action insert --datadir etc/upgrade/<version>"
upgrade: config-install dirs files-install fixperms upgrade-instruct
@@ -269,7 +269,7 @@ fixperms:
chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_PATH)
chown -R $(LIBS_OWNER) $(DESTDIR)/$(RT_LIB_PATH)
chgrp -R $(LIBS_GROUP) $(DESTDIR)/$(RT_LIB_PATH)
- chmod -R u+rwX,go-w,go+rX $(DESTDIR)/$(RT_LIB_PATH)
+ chmod -R u+rwX,go-w,go+rX $(DESTDIR)/$(RT_LIB_PATH)
chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)
@@ -329,7 +329,7 @@ install: config-install dirs files-install fixperms instruct
files-install: libs-install etc-install bin-install sbin-install html-install local-install doc-install
config-install:
- mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)
+ mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)
-cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE)
@@ -365,7 +365,7 @@ regression-instruct:
# {{{ database-installation
regression-reset-db:
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
+ $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --dba-password '' --force
$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --dba-password ''
initdb :: initialize-database
@@ -374,7 +374,7 @@ initialize-database:
$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action init --dba $(DB_DBA) --prompt-for-dba-password
dropdb:
- $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
+ $(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/rt-setup-database --action drop --dba $(DB_DBA) --prompt-for-dba-password
insert-approval-data:
$(PERL) $(DESTDIR)/$(RT_SBIN_PATH)/insert_approval_scrips
commit e33a6f1aaa0e50525e637ff025e4e1833123781b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Tue Oct 6 14:27:26 2009 -0400
Add .gitignore from 3.8-trunk
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d866c83
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,47 @@
+bin/fastcgi_server
+bin/mason_handler.fcgi
+bin/mason_handler.scgi
+bin/mason_handler.svc
+bin/rt-crontool
+bin/rt-mailgate
+bin/rt
+bin/standalone_httpd
+bin/webmux.pl
+etc/RT_Config.pm
+etc/upgrade/3.8-branded-queues-extension
+etc/upgrade/3.8-ical-extension
+etc/upgrade/split-out-cf-categories
+lib/RT.pm
+Makefile
+t/data/gnupg/keyrings/random_seed
+t/data/configs/apache2.2+fastcgi.conf
+t/data/configs/apache2.2+mod_perl.conf
+t/tmp/
+sbin/rt-attributes-viewer
+sbin/rt-clean-sessions
+sbin/rt-dump-database
+sbin/rt-email-dashboards
+sbin/rt-email-digest
+sbin/rt-email-group-admin
+sbin/rt-server
+sbin/rt-setup-database
+sbin/rt-shredder
+sbin/rt-test-dependencies
+sbin/rt-validator
+var/mason_data/
+autom4te.cache
+configure
+config.status
+config.log
+config.pld
+*~
+*.swp
+*.swo
+.prove
+
+# RT4 junk
+META.yml
+inc/
+rt4
+var/
+etc/site_config.yml
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list