[sword-svn] r2749 - trunk/cmake

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2012-12-17 18:03:42 -0700 (Mon, 17 Dec 2012)
New Revision: 2749

Modified:
   trunk/cmake/build-debug.sh
   trunk/cmake/build-release.sh
Log:
Updating sample build scripts to reflect building changes.

When I updated and changed the CMake method for building the library
and bindings, I didn't update the sample scripts. This remedies that
oversight.

Modified: trunk/cmake/build-debug.sh
===================================================================
--- trunk/cmake/build-debug.sh	2012-12-17 05:41:34 UTC (rev 2748)
+++ trunk/cmake/build-debug.sh	2012-12-18 01:03:42 UTC (rev 2749)
@@ -12,16 +12,13 @@
 	-DSWORD_BUILD_EXAMPLES="Yes" \
 	-DSWORD_BUILD_TESTS="Yes" \
 	-DLIBSWORD_LIBRARY_TYPE="Shared" \
-	-DCMAKE_BUILD_TYPE="Debug" ..
-make -j5
-cd bindings/swig/perl
-make
-cd ../python
-python setup.py build
+	-DCMAKE_BUILD_TYPE="Debug" .. \
+	-DCMAKE_INSTALL_PREFIX="~/"
+make -j10
+cd ..
 
 echo "Now the library has been built, along with the Perl and Python bindings. \
-	If you would like to install, you may now do so by changing into the build \
-	directory and typing \"sudo make install\".  Python bindings may be installed \
-	by then changing into tye build/bindings/swig/python diretory and typing \"sudo python \
-	setup.py install\" and Perl bindings may be installed by changing into the \
-	build/bindings/swig/perl directory and issuing the command \"sudo make install\"."
+Both will be installed to the the user's home directory if you are building \
+under Linux or a similar Unix-like environment if you execute the command \
+'make install' from the build directory with privileges to write into the \
+~/ directory."

Modified: trunk/cmake/build-release.sh
===================================================================
--- trunk/cmake/build-release.sh	2012-12-17 05:41:34 UTC (rev 2748)
+++ trunk/cmake/build-release.sh	2012-12-18 01:03:42 UTC (rev 2749)
@@ -15,15 +15,10 @@
 	-DLIBSWORD_LIBRARY_TYPE="Shared Static" \
 	-DCMAKE_BUILD_TYPE="Release" \
 	-DCMAKE_INSTALL_PREFIX="/opt/sword" ..
-make -j5
-cd bindings/swig/perl
-make
-cd ../python
-python setup.py build
+make -j10
+cd ..
 
 echo "Now the library has been built, along with the Perl and Python bindings. \
-	If you would like to install, you may now do so by changing into the build \
-	directory and typing \"sudo make install\".  Python bindings may be installed \
-	by then changing into tye build/bindings/swig/python diretory and typing \"sudo python \
-	setup.py install\" and Perl bindings may be installed by changing into the \
-	build/bindings/swig/perl directory and issuing the command \"sudo make install\"."
+If you now execute 'make install' from the build directory you will \
+install the library to /opt/sword if you have privileges to write there \
+with the account you execute the install from."