From 3ef01b8b882bfd0e6e1664d8384e9658d582ac23 Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 7 Sep 2005 16:03:08 +0000 Subject: [PATCH] seperating the CGI install from the DB bootstrapping git-svn-id: svn://svn.open-ils.org/ILS/trunk@1811 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/src/Makefile | 12 +++++++++--- Open-ILS/src/cgi-bin/circ-rules.cgi | 2 +- Open-ILS/src/cgi-bin/copy_statuses.cgi | 2 +- Open-ILS/src/cgi-bin/lib-setup.cgi | 2 +- Open-ILS/src/cgi-bin/org_unit_types.cgi | 2 +- Open-ILS/src/cgi-bin/perms-setup.cgi | 2 +- Open-ILS/src/cgi-bin/usr_group-setup.cgi | 2 +- install.sh | 1 + 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile index 700a747691..0564e29743 100644 --- a/Open-ILS/src/Makefile +++ b/Open-ILS/src/Makefile @@ -7,7 +7,7 @@ export CFLAGS = -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \ all: mod_xmltools mod_ils_rest_gateway -install: perl-install web-install string-templates-install storage-bootstrap xsl-install +install: perl-install web-install string-templates-install storage-bootstrap cgi-bootstrap xsl-install web-install: webcore-install autojs-install mod_xmltools-install mod_ils_rest_gateway-install @@ -65,10 +65,16 @@ perl-install: # ----------------------------------------------------------------------------------- -storage-bootstrap: +cgi-bootstrap: @echo "Installing cgi's to $(CGIDIR)" + mkdir -p $(TMP)/cgi-bin mkdir -p $(CGIDIR) - cp -r cgi-bin/* $(CGIDIR) + for i in cgi-bin/*cgi; do perl -pe "s{##CONFIG##}{$(ETCDIR)}" < $i > $(TMP)/$i; done + cp $(TMP)/cgi-bin/*cgi $(CGIDIR) + cp -r cgi-bin/support $(CGIDIR) + cp cgi-bin/setup.pl $(ETCDIR) + +storage-bootstrap: ./extras/import/build-oils-db.sh $(DBDRVR) $(DBHOST) $(DBNAME) $(DBUSER) $(DBPW) # ----------------------------------------------------------------------------------- diff --git a/Open-ILS/src/cgi-bin/circ-rules.cgi b/Open-ILS/src/cgi-bin/circ-rules.cgi index 0528279acd..7372b9f772 100755 --- a/Open-ILS/src/cgi-bin/circ-rules.cgi +++ b/Open-ILS/src/cgi-bin/circ-rules.cgi @@ -10,7 +10,7 @@ use OpenILS::Application::Storage::Driver::Pg; use CGI qw/:standard start_*/; our %config; -do 'setup.pl'; +do '##CONFIG##/setup.pl'; OpenILS::Application::Storage::CDBI->connection($config{dsn},$config{usr},$config{pw}); OpenILS::Application::Storage::CDBI->db_Main->{ AutoCommit } = 1; diff --git a/Open-ILS/src/cgi-bin/copy_statuses.cgi b/Open-ILS/src/cgi-bin/copy_statuses.cgi index 7d6cac919d..5707744451 100755 --- a/Open-ILS/src/cgi-bin/copy_statuses.cgi +++ b/Open-ILS/src/cgi-bin/copy_statuses.cgi @@ -9,7 +9,7 @@ use OpenILS::Application::Storage::Driver::Pg; use CGI qw/:standard start_*/; our %config; -do 'setup.pl'; +do '##CONFIG##/setup.pl'; OpenILS::Application::Storage::CDBI->connection($config{dsn},$config{usr},$config{pw}); OpenILS::Application::Storage::CDBI->db_Main->{ AutoCommit } = 1; diff --git a/Open-ILS/src/cgi-bin/lib-setup.cgi b/Open-ILS/src/cgi-bin/lib-setup.cgi index 7c283bc215..6b90c76e75 100755 --- a/Open-ILS/src/cgi-bin/lib-setup.cgi +++ b/Open-ILS/src/cgi-bin/lib-setup.cgi @@ -9,7 +9,7 @@ use OpenILS::Application::Storage::Driver::Pg; use CGI qw/:standard start_*/; our %config; -do 'setup.pl'; +do '##CONFIG##/setup.pl'; OpenILS::Application::Storage::CDBI->connection($config{dsn},$config{usr},$config{pw}); OpenILS::Application::Storage::CDBI->db_Main->{ AutoCommit } = 1; diff --git a/Open-ILS/src/cgi-bin/org_unit_types.cgi b/Open-ILS/src/cgi-bin/org_unit_types.cgi index 03f1105018..c9ceef43b5 100755 --- a/Open-ILS/src/cgi-bin/org_unit_types.cgi +++ b/Open-ILS/src/cgi-bin/org_unit_types.cgi @@ -10,7 +10,7 @@ use OpenILS::Application::Storage::Driver::Pg; use CGI qw/:standard start_*/; our %config; -do 'setup.pl'; +do '##CONFIG##/setup.pl'; OpenILS::Application::Storage::CDBI->connection($config{dsn},$config{usr},$config{pw}); OpenILS::Application::Storage::CDBI->db_Main->{ AutoCommit } = 1; diff --git a/Open-ILS/src/cgi-bin/perms-setup.cgi b/Open-ILS/src/cgi-bin/perms-setup.cgi index 209f237a3f..cf624c69bc 100755 --- a/Open-ILS/src/cgi-bin/perms-setup.cgi +++ b/Open-ILS/src/cgi-bin/perms-setup.cgi @@ -10,7 +10,7 @@ use OpenILS::Application::Storage::Driver::Pg; use CGI qw/:standard start_*/; our %config; -do 'setup.pl'; +do '##CONFIG##/setup.pl'; OpenILS::Application::Storage::CDBI->connection($config{dsn},$config{usr},$config{pw}); OpenILS::Application::Storage::CDBI->db_Main->{ AutoCommit } = 1; diff --git a/Open-ILS/src/cgi-bin/usr_group-setup.cgi b/Open-ILS/src/cgi-bin/usr_group-setup.cgi index 799dc62b5f..f21f6d374c 100755 --- a/Open-ILS/src/cgi-bin/usr_group-setup.cgi +++ b/Open-ILS/src/cgi-bin/usr_group-setup.cgi @@ -10,7 +10,7 @@ use OpenILS::Application::Storage::Driver::Pg; use CGI qw/:standard start_*/; our %config; -do 'setup.pl'; +do '##CONFIG##/setup.pl'; OpenILS::Application::Storage::CDBI->connection($config{dsn},$config{usr},$config{pw}); OpenILS::Application::Storage::CDBI->db_Main->{ AutoCommit } = 1; diff --git a/install.sh b/install.sh index 4cbe98f8d8..e6d0d288c3 100755 --- a/install.sh +++ b/install.sh @@ -184,6 +184,7 @@ function runInstall { if building; then $MAKE -C "$OPENILSDIR" "mod_xmltools"; fi; if building; then $MAKE -C "$OPENILSDIR" "mod_ils_rest_gateway"; fi; if installing; then $MAKE -C "$OPENILSDIR" "web-install"; fi; + if installing; then $MAKE -C "$OPENILSDIR" "cgi-bootstrap"; fi; ;; "openils_marcdumper" ) -- 2.43.2