Revision: 3235 Author: lewis Date: 2015-01-25 14:39:42 -0800 (Sun, 25 Jan 2015) Log Message: ----------- Support installation of both squeakvm and squeakvm64 in a single package, typically created with checkinstall. If option "--vm-only" is passed to the cmake/configure script from a given build subdirectory, then only the VM executables are built in that subdirectory. This allows the VM for 32-bit images to be built and installed with normal man pages and support utilities, and the companion VM for 64-bit images to be built without duplicating the man pages and utilities. Both may then be installed using a single install package, and run from a single squeak start script appropriate VM executable selected based for the given image format.

Modified Paths: -------------- trunk/platforms/unix/cmake/configure trunk/platforms/unix/vm/build.cmake

Modified: trunk/platforms/unix/cmake/configure =================================================================== --- trunk/platforms/unix/cmake/configure 2015-01-23 01:06:16 UTC (rev 3234) +++ trunk/platforms/unix/cmake/configure 2015-01-25 22:39:42 UTC (rev 3235) @@ -16,6 +16,7 @@ --without-gl disable everything that depends on OpenGL --without-SUGAR disable support for SUGAR environment --image64 build a VM for running 64-bit images + --vm-only build executables only, no scripts or man pages --enableFastBlt use optimised BitBlt (not supported on most platforms) Notes: 1. By default the CFLAGS will be set to create optimised binaries. If you are

Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2015-01-23 01:06:16 UTC (rev 3234) +++ trunk/platforms/unix/vm/build.cmake 2015-01-25 22:39:42 UTC (rev 3235) @@ -56,6 +56,11 @@

CONFIGURE_FILE (${config}/config.in ${bld}/config @ONLY)

+IF (NOT DEFINED OPT--vm-only) +# Build the common components that apply to both the 32-bit and 64-bit +# object memory VM. Typically these will be built with the 32-bit object +# memory VM only and shared for both. + # launcher scripts

ADD_CUSTOM_TARGET (squeak @@ -90,3 +95,5 @@ ) ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak.1) INSTALL (FILES ${bld}/squeak.1 DESTINATION share/man/man1) + +ENDIF (NOT DEFINED OPT--vm-only)