[mapguide-commits] r9319 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Jan 30 04:48:41 PST 2018
Author: jng
Date: 2018-01-30 04:48:40 -0800 (Tue, 30 Jan 2018)
New Revision: 9319
Modified:
trunk/MgDev/CMake_README.txt
trunk/MgDev/cmake_bootstrap.sh
trunk/MgDev/cmake_build.sh
Log:
Consistency: Use hyphens instead of underscores for all cmake build script parameters
Modified: trunk/MgDev/CMake_README.txt
===================================================================
--- trunk/MgDev/CMake_README.txt 2018-01-24 12:38:11 UTC (rev 9318)
+++ trunk/MgDev/CMake_README.txt 2018-01-30 12:48:40 UTC (rev 9319)
@@ -36,7 +36,7 @@
2. Build the internal thirdparty components specifying the directory where thirdparty components will be built in
- sudo ./cmake_bootstrap.sh --oem_working_dir ~/mapguide_oem_build
+ sudo ./cmake_bootstrap.sh --oem-working_dir ~/mapguide_oem_build
This will copy the DBXML, httpd, PHP and the Tomcat connector sources to your specified directory and build it from there.
Once completed, an env_vars.sh script will be written to this directory that the following step will use.
@@ -46,10 +46,10 @@
3. Start the main CMake build
- ./cmake_build.sh --oem_working_dir ~/mapguide_oem_build --cmake_build_dir ~/mapguide_build_area
+ ./cmake_build.sh --oem-working-dir ~/mapguide_oem_build --cmake-build-dir ~/mapguide_build_area
This will set up the CMake build using the generated env_vars.sh script and set up a CMake build tree in the directory specified
- by --cmake_build_dir
+ by --cmake-build-dir
4. Install the MapGuide binaries. This will generally require elevation (with sudo) as well.
Modified: trunk/MgDev/cmake_bootstrap.sh
===================================================================
--- trunk/MgDev/cmake_bootstrap.sh 2018-01-24 12:38:11 UTC (rev 9318)
+++ trunk/MgDev/cmake_bootstrap.sh 2018-01-30 12:48:40 UTC (rev 9319)
@@ -14,7 +14,7 @@
MG_INST_PREFIX="$2"
shift
;;
- --oem_working_dir)
+ --oem-working-dir)
OEM_WORK_DIR="$2"
shift
;;
@@ -33,7 +33,7 @@
echo "Usage: $0 (options)"
echo "Options:"
echo " --prefix [install prefix]"
- echo " --oem_working_dir [installation directory]"
+ echo " --oem-working-dir [installation directory]"
echo " --build [32(default)|64]"
echo " --config [Release(default)|Debug]"
echo " --have-system-xerces [Use system-installed xerces]"
Modified: trunk/MgDev/cmake_build.sh
===================================================================
--- trunk/MgDev/cmake_build.sh 2018-01-24 12:38:11 UTC (rev 9318)
+++ trunk/MgDev/cmake_build.sh 2018-01-30 12:48:40 UTC (rev 9319)
@@ -11,11 +11,11 @@
USE_ASAN=OFF
while [ $# -gt 0 ]; do # Until you run out of parameters...
case "$1" in
- --cmake_build_dir)
+ --cmake-build-dir)
CMAKE_BUILD_DIR="$2"
shift
;;
- --oem_working_dir)
+ --oem-working-dir)
OEM_WORK_DIR="$2"
shift
;;
@@ -28,8 +28,8 @@
--help)
echo "Usage: $0 (options)"
echo "Options:"
- echo " --cmake_build_dir [CMake build directory]"
- echo " --oem_working_dir [installation directory]"
+ echo " --cmake-build-dir [CMake build directory]"
+ echo " --oem-working-dir [installation directory]"
echo " --with-asan [build with ASAN]"
echo " --ninja [Use ninja build system]"
echo " --help [Display usage]"
More information about the mapguide-commits
mailing list