added opensrf, openils, and evergreen targets to build the entire sub-project

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1080 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/config.sh b/config.sh
index 7949d31..f9cbbbd 100755 (executable)
--- a/config.sh
+++ b/config.sh
@@ -72,6 +72,10 @@ function buildConfig {
        read X;
        if [ ! -z "$X" ]; then INCLUDEDIR="$X"; fi;
 
+       prompt "Config files directory [$ETCDIR] "
+       read X;
+       if [ ! -z "$X" ]; then ETCDIR="$X"; fi;
+
        prompt "Temporary files directory [$TMP] "
        read X;
        if [ ! -z "$X" ]; then TMP="$X"; fi;

diff --git a/install.conf.default b/install.conf.default
index 83c34d1..89c2939 100644 (file)
--- a/install.conf.default
+++ b/install.conf.default
@@ -25,7 +25,12 @@
 # gateway    - mod_ils_gateway, Apache module for proxying API calls
 # srfsh      - diagnostic shell interface to OpenSRF
 # marcdumper - utility code for converting MARC to MARCXML
+# opensrf_perl - install the OpenSRF perl modules
+# openils_perl - install the Open-ILS perl modules
 # xul        - client XUL application
+# opensrf      - builds all OpenSRF compenents
+# openils      - builds all OpenILS compenents
+# evergreen    - builds all Evergreen components
 #
 # When running the server components of OpenSRF/OpenILS, the simplest
 # thing is to build jserver, router, gateway, and srfsh, even if you 
@@ -33,22 +38,28 @@
 # MARC files to MARCXML.  If you only want to build the client app,
 # then just build xul.
 # --------------------------------------------------------------------
+
 #TARGETS=("jserver" "router" "gateway" "srfsh" "marcdumper" "xul");
-TARGETS=("router" "gateway" "jserver" "srfsh");
+#TARGETS=("router" "gateway" "jserver" "srfsh" "opensrf_perl" "openils_perl");
+TARGETS=("opensrf");
 
 
 # --------------------------------------------------------------------
 # Global install prefix.  Binaries will be installed into PREFIX/bin,
 # libraries will be installed into PERFIX/lib, etc.  The user 
-# running install.sh must have write permissions to PREFIX
+# running 'install.sh install' must have write permissions to PREFIX
 # --------------------------------------------------------------------
-#PREFIX="/tmp/testinstall/";
 PREFIX="/tmp/ilsinstall/";
+BINDIR="$PREFIX/bin/";
+LIBDIR="$PREFIX/lib/";
+PERLDIR="$LIBDIR/perl5/";
+INCLUDEDIR="$PREFIX/include/";
+ETCDIR="$PREFIX/etc/";
 
 
 # --------------------------------------------------------------------
-# Temporary build files go here.  The User running install.sh must
-# have write permissions to TMP
+# Temporary build files go here.  The User running 'install.sh build'
+# must have write permissions to TMP
 # --------------------------------------------------------------------
 TMP="/tmp/ilstmp/";
 

diff --git a/install.sh b/install.sh
index b13ae70..c020098 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -171,6 +171,22 @@ function runInstall {
                                if installing; then $MAKE -C "$OPENILS_DIR" "perl-install"; fi;
                                ;;
 
+                       "opensrf")
+                               if building; then $MAKE -C "$OPENSRF_DIR" all; fi;
+                               if installing; then $MAKE -C "$OPENSRF_DIR" install; fi;
+                               ;;
+
+                       "openils")
+                               if building; then $MAKE -C "$OPENILS_DIR" all; fi;
+                               if installing; then $MAKE -C "$OPENILS_DIR" install; fi;
+                               ;;
+
+                       "evergreen")
+                               if building; then $MAKE -C "$EVERGREEN_DIR" all; fi;
+                               if installing; then $MAKE -C "$EVERGREEN_DIR" install; fi;
+                               ;;
+
+
                        *) fail "Unknown target: $target";;
 
                esac