|
@@ -48,24 +48,22 @@
|
|
|
# To create a development installation on Linux:
|
|
|
# 1. Check out sources (for example, to directory ~/hpcc)
|
|
|
# 2. Create a build directory alongside your source
|
|
|
-# 3. export a DESTDIR which will act as the new root of your installation
|
|
|
-# This must be done before you attempt to build makefiles for the project
|
|
|
-# 4. To create makefiles and have the ability to run the applications as non-superuser, execute
|
|
|
-# cmake -DRUNTIME_USER=$USER ~/hpcc
|
|
|
-# 5. To build the makefiles just created above, run
|
|
|
+# 3. To create makefiles and have the ability to run the applications as non-superuser, execute
|
|
|
+# cmake -DRUNTIME_USER=$USER -DRUNTIME_GROUP=groupname -DDESTDIR=$HOME/myruntime ~/hpcc
|
|
|
+# 4. To build the makefiles just created above, run
|
|
|
# make
|
|
|
-# 6. To install the project under DESTDIR, run
|
|
|
+# 5. To install the project under DESTDIR, run
|
|
|
# make install
|
|
|
-# 7. To populate environment xml's and conf files necessary for running your development installation, run
|
|
|
+# 6. To populate environment xml's and conf files necessary for running your development installation, run
|
|
|
# make configure
|
|
|
-# 8a.To start up the platform, execute all binaries and scripts under DESTDIR as a regular user, example
|
|
|
-# $DESTDIR/etc/init.d/hpcc-init start
|
|
|
-# 8b.All runtime files will be under $DESTDIR/var/{log,lib,run,lock}
|
|
|
-# 9a.To patch your running installation, simply modify the source, and then from the build directory run
|
|
|
+# 7a.To start up the platform, execute all binaries and scripts under DESTDIR as a regular user, example
|
|
|
+# $HOME/myruntime/etc/init.d/hpcc-init start
|
|
|
+# 7b.All runtime files will be under $HOME/myruntime/var/{log,lib,run,lock}
|
|
|
+# 8a.To patch your running installation, simply modify the source, and then from the build directory run
|
|
|
# make install
|
|
|
# Which will recompile any changes and only install files into the platform that have been modified
|
|
|
-# 9b.Restart the platform (or specific component that had modifications), example
|
|
|
-# $DESTDIR/etc/init.d/hpcc-init restart
|
|
|
+# 8b.Restart the platform (or specific component that had modifications), example
|
|
|
+# $HOME/myruntime/etc/init.d/hpcc-init restart
|
|
|
#
|
|
|
#########################################################
|
|
|
|
|
@@ -118,6 +116,7 @@ option(RUNTIME_GROUP "Set the runtime group")
|
|
|
option(ENV_XML_FILE "Set the environment xml file name.")
|
|
|
option(ENV_CONF_FILE "Set the environment conf file name.")
|
|
|
option(LICENSE_FILE "Set the license file to use.")
|
|
|
+option(DESTDIR "Set the alternate root installation path.")
|
|
|
|
|
|
if(NOT LICENSE_FILE)
|
|
|
if(REMBED)
|
|
@@ -477,9 +476,4 @@ configure_file(
|
|
|
add_custom_target(uninstall
|
|
|
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
|
|
|
|
|
|
-if ( "$ENV{DESTDIR}" STRGREATER "" )
|
|
|
- message(WARNING "DESTDIR is set to $ENV{DESTDIR}.
|
|
|
-This should only be done for development builds.")
|
|
|
-endif()
|
|
|
-
|
|
|
include(CPack)
|