Revision: 2802 Author: piumarta Date: 2013-11-11 19:27:09 -0800 (Mon, 11 Nov 2013) Log Message: ----------- Look for generated sources in ${src}/plugins. Look for plugins.{int,ext,exc} in unix/cmake then in generated source dir. Plugins listed in plugins.exc (if present) are excluded from the build.
Modified Paths: -------------- trunk/platforms/unix/cmake/Plugins.cmake
Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2013-11-12 03:25:38 UTC (rev 2801) +++ trunk/platforms/unix/cmake/Plugins.cmake 2013-11-12 03:27:09 UTC (rev 2802) @@ -1,15 +1,45 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2011-01-27 12:16:13 by piumarta on emilia.ipe.media.kyoto-u.ac.jp +# Last edited: 2013-11-11 19:12:21 by piumarta on emilia
-FILE (STRINGS ${src}/plugins.int plugins_int) +IF (EXISTS ${config}/plugins.int) + FILE (STRINGS ${config}/plugins.int plugins_int) +ELSEIF (EXISTS ${src}/plugins.int) + FILE (STRINGS ${src}/plugins.int plugins_int) +ELSE (EXISTS ${src}/plugins.int) + MESSAGE (FATAL_ERROR "Cannot find plugins.int in ${src} or ${config}") +ENDIF (EXISTS ${config}/plugins.int) + STRING (REGEX REPLACE ".*= (.*)" "\1" plugins_int ${plugins_int}) STRING (REPLACE " " ";" plugins_int ${plugins_int})
-FILE (STRINGS ${src}/plugins.ext plugins_ext) +IF (EXISTS ${config}/plugins.ext) + FILE (STRINGS ${config}/plugins.ext plugins_ext) +ELSEIF (EXISTS ${src}/plugins.ext) + FILE (STRINGS ${src}/plugins.ext plugins_ext) +ELSE (EXISTS ${src}/plugins.ext) + MESSAGE (FATAL_ERROR "Cannot find plugins.ext in ${src} or ${config}") +ENDIF (EXISTS ${config}/plugins.ext) + STRING (REGEX REPLACE ".*= (.*)" "\1" plugins_ext ${plugins_ext}) STRING (REPLACE " " ";" plugins_ext ${plugins_ext})
+IF (EXISTS ${config}/plugins.exc) + FILE (STRINGS ${config}/plugins.exc plugins_exc) +ELSEIF (EXISTS ${src}/plugins.exc) + FILE (STRINGS ${src}/plugins.exc plugins_exc) +ENDIF (EXISTS ${config}/plugins.exc) + +IF (DEFINED plugins_exc) + STRING (REGEX REPLACE ".*= (.*)" "\1" plugins_exc ${plugins_exc}) + STRING (REPLACE " " ";" plugins_exc ${plugins_exc}) + FOREACH (plugin ${plugins_exc}) + MESSAGE ("!! excluding plugin ${plugin}") + LIST (REMOVE_ITEM plugins_int ${plugin}) + LIST (REMOVE_ITEM plugins_ext ${plugin}) + ENDFOREACH (plugin) +ENDIF (DEFINED plugins_exc) + FILE (GLOB plugins_vm RELATIVE ${unix} ${unix}/vm-*)
FILE_COPY (${bld}/disabledPlugins.c ${config}/disabledPlugins.c) @@ -23,7 +53,7 @@ IF (DEFINED ${plugin}_sources) SET (plugin_sources ${${plugin}_sources}) ELSE (DEFINED ${plugin}_sources) - FOREACH (dir ${src}/vm/intplugins ${cross}/plugins ${unix}/plugins) + FOREACH (dir ${src}/plugins ${cross}/plugins ${unix}/plugins) SET (tmp "") AUX_SOURCE_DIRECTORY (${dir}/${plugin} tmp) STRING_APPEND (plugin_sources "${tmp}") @@ -99,7 +129,7 @@ #MESSAGE ("-- plugin ${plugin}") IF (${plugins_list} STREQUAL "plugins_int") SET (plugin_target "vm") - SET (${plugin}_source_dir "${src}/vm/intplugins/${plugin}") + SET (${plugin}_source_dir "${src}/plugins/${plugin}") ELSE () SET (plugin_target "${plugin}") SET (${plugin}_source_dir "${src}/plugins/${plugin}")
vm-dev@lists.squeakfoundation.org