Changeset 14727

Timestamp:

04/14/04 11:06:24 (5 years ago)

Author:

patrickh

Message:

New feature: External C/C++ dependencies can be bundled up for easy

redistribution.

In this first stage of implementing this feature for the UNIX build,
the dependencies are not installed by default when making an
installation or a release. Instead, there is a separate target named
'install-deps' that must be run to install dependencies. By default,
dependencies install into the same directory tree as VR Juggler, but
this can be changed by setting the variable deps_prefx on the command
line when running GNU make.

For the developer installation (the instlinks stuff), the dependecies
are installed into the instlinks tree. Since the *-config scripts have
not yet been updated, the only real effect of this is that developers
can set $LD_LIBRARY_PATH to point only to $VJ_BASE_DIR/lib and get all
the shared libraries resolved. The updates to the *-config scripts are
the next stage.

Files:

• trunk/juggler/Makefile.in (modified) (1 diff)
• trunk/juggler/external/Makefile.in (modified) (6 diffs)
• trunk/juggler/external/configure.in (modified) (5 diffs)

trunk/juggler/Makefile.in

@@ -65 +65 @@
-        $(MAKE) GLOBAL_BUILD=1 RECTARGET="installworld" recursive
-
+install-deps:
+        $(MAKE) -C external $@
+
-clobber:
-        $(MAKE) GLOBAL_BUILD=1 RECTARGET="$@" recursive

trunk/juggler/external/Makefile.in

@@ -33 +33 @@
-bindir=                 @bindir@
-datadir=                @datadir@
+deps_prefix=            $(prefix)
-exec_prefix=            @exec_prefix@
-includedir=             @includedir@
@@ -45 +46 @@
-scriptdir=              $(releasedir)/scripts
-top_srcdir=             @top_srcdir@
+DPP_SCRIPTDIR=          @JUGGLERROOT_ABS@/Doozer++/scripts
-
-DIR_PERMS=              @DIR_PERMS@
@@ -57 +59 @@
-
-EXTROOT_ABS=            @EXTROOT_ABS@
+INSTALL=                @INSTALL@
-JUGGLERROOT_ABS=        @JUGGLERROOT_ABS@
-LN_S=                   @LN_S@
@@ -64 +67 @@
-RM_LN=                  @RM_LN@
-
-
+
+
+
-EXTS?=                  .h
+
+BOOST_ROOT=             @BOOST_ROOT@
+BOOST_INCLUDES=         @BOOST_INCLUDES@
+CPPDOM_ROOT=            @CPPDOM_ROOT@
+GMTL_ROOT=              @GMTL_ROOT@
+
+# NOTE: There are no spaces between the commas in the $(subst) function call
+# because that introduces whitespace into the resulting string.
+BOOST_INCLUDE_DIR=      $(subst $(BOOST_ROOT),,$(BOOST_INCLUDES))
+
+AUDIERE_ROOT=           @AUDIERE_ROOT@
+CPPUNIT_ROOT=           @CPPUNIT_ROOT@
+CXX_ORB_NAME=           @CXX_ORB_NAME@
+CXX_ORB_ROOT=           @CXX_ORB_ROOT@
+CXX_ORB_BIN_DIR=        @CXX_ORB_BIN_DIR@
+CXX_ORB_LIB_DIR=        @CXX_ORB_LIB_DIR@
+OPENAL_ROOT=            @OPENAL_ROOT@
+
+OMNIORB_CMDS=           @OMNIORB_CMDS@
+PYTHON_DIR=             @PYTHON_DIR@
+PYTHON_PKG_DIR=         $(PYTHON_DIR)/site-packages
+
+CXX_ORB_BIN_PATH=       $(subst $(CXX_ORB_ROOT),,$(CXX_ORB_BIN_DIR))
+CXX_ORB_LIB_PATH=       $(subst $(CXX_ORB_ROOT),,$(CXX_ORB_LIB_DIR))
-
-world release:
@@ -74 +103 @@
-prof-dso links:
-        $(MKINSTALLDIRS) $(instlinks)/include
-
-
+
-            $(MAKE) links-$$target || exit 1;                           \
-          done
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-links-doozer:
@@ -88 +188 @@
-install-opt install-opt-dso install-profiled install-prof               \
-install-prof-dso installworld:
-
+
+
+
+
+
-        @for target in $(TARGETS) ; do                                  \
-            $(MAKE) install-$$target || exit 1;                         \
-          done
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-install-doozer:

trunk/juggler/external/configure.in

@@ -38 +38 @@
-# -----------------------------------------------------------------------------
-
-
-
+
+
+
+
+
+
-AC_CONFIG_AUX_DIR(../share/config)
-DPP_PREREQ([1.5.1])
-DPP_INIT
+
+# -----------------------------------------------------------------------------
+# Duplicates of the options for the external C++ dependencies.  We use these
+# here so that we can absorb the options that are passed to the configure
+# scripts that actually need the information.
+# -----------------------------------------------------------------------------
+AC_ARG_WITH(audiere,
+            [  --with-audiere=<PATH>   Audiere installation directory  [default=/usr/local]],
+            [AUDIERE_ROOT="$withval"], [AUDIERE_ROOT='/usr/local'])
+
+AC_ARG_WITH([boost],
+            [  --with-boost=<PATH>     Boost installation directory    [default=/usr/local]],
+            [BOOST_ROOT="$withval"], [BOOST_ROOT='/usr/local'])
+
+AC_ARG_WITH(boost-includes,
+            [  --with-boost-includes=<DIR>
+                       Boost header file directory     [default=/usr/local/include]],
+            [BOOST_INCLUDES="$withval"], [BOOST_INCLUDES=no])
+
+AC_ARG_WITH(cppdom,
+            [  --with-cppdom=<PATH>    CppDOM installation directory   [default=/usr/local]],
+            [CPPDOM_ROOT="$withval"], [CPPDOM_ROOT="/usr/local"])
+
+AC_ARG_WITH(cppunit,
+            [  --with-cppunit=<PATH>   CppUnit installation directory  [default=]],
+            [CPPUNIT_ROOT="$withval"], [CPPUNIT_ROOT=''])
+
+AC_ARG_WITH(cxx-orb,
+            [  --with-cxx-orb=<NAME>   Name of C++ ORB to use          [default=omniORB4]
+                          Allowed values are:
+                            omniORB3, omniORB4],
+            [CXX_ORB_NAME="$withval"], [CXX_ORB_NAME='omniORB4'])
+
+AC_ARG_WITH(cxx-orb-root,
+            [  --with-cxx-orb-root=<PATH>                              [default=/usr]
+                          Root directory of C++ ORB
+                          installation],
+            [CXX_ORB_ROOT="$withval"], [CXX_ORB_ROOT='/usr'])
+
+AC_ARG_WITH(cxx-orb-bin,
+            [  --with-cxx-orb-bin=<PATH>                               [default=/usr/bin]
+                          Path to C++ ORB executables],
+            [CXX_ORB_BIN_DIR="$withval"], [CXX_ORB_BIN_DIR='none'])
+
+AC_ARG_WITH(cxx-orb-lib,
+            [  --with-cxx-orb-lib=<PATH>                               [default=/usr/lib]
+                          Path to C++ ORB libraries],
+            [CXX_ORB_LIB_DIR="$withval"], [CXX_ORB_LIB_DIR='none'])
+
+AC_ARG_WITH(gmtl-prefix,
+            [  --with-gmtl-prefix=<PATH>
+                       Prefix where GMTL is installed  [default=/usr/local]],
+            [GMTL_ROOT="$withval"], [GMTL_ROOT=/usr/local])
+
+AC_ARG_WITH(openal,
+            [  --with-openal=<PATH>    OpenAL installation directory   [default=/usr/local]],
+            [OPENAL_ROOT="$withval"], [OPENAL_ROOT='/usr/local'])
-
-# -----------------------------------------------------------------------------
@@ -58 +119 @@
-cd "$topdir"
-
-# Enable/disable installation of Doozer from juggler/external.
-AC_ARG_ENABLE([doozer-install],
-              [  --disable-doozer-install
-                          Disable installation of
-                          juggler/external/Doozer],
-              [install_doozer="$enableval"], [install_doozer='yes'])
-
-# Name the path to a Doozer installation.  This defaults to
-# juggler/external/Doozer (using an absolute path).
-AC_ARG_WITH([doozer-prefix],
-            [  --with-doozer-prefix=<PATH>
-                          Doozer installation directory],
-            [DOOZER_ROOT="$withval"],
-            [DOOZER_ROOT="$JUGGLERROOT_ABS/external/Doozer"])
-
-# -----------------------------------------------------------------------------
-# System-dependent stuff.
@@ -85 +131 @@
-DPP_HAVE_GNU_MAKE([3.78], ,
-    [AC_MSG_ERROR([*** The build system requires GNU make 3.78 or newer ***])])
+DPP_PROG_INSTALL
-AC_PROG_LN_S
-
-DPP_INSTALLER(vrjuggler, 0644, 0755, 0755)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-TARGETS=''
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-fi
-
@@ -105 +200 @@
-# Do Makefile substitutions.
-# -----------------------------------------------------------------------------
-
-#UNIX_EXTROOT_ABS="$EXTROOT_ABS"
-#UNIX_JUGGLERROOT_ABS="$JUGGLERROOT_ABS"
-
-if test "x$OS_TYPE" = "xWin32" ; then
@@ -124 +216 @@
-AC_SUBST(TARGETS)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+