Vm-dev August 2009

vm-dev@lists.squeakfoundation.org

27 participants
87 discussions

[commit] r2098 - remove redunant messages
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 13:30:07 -0700 (Wed, 26 Aug 2009) New Revision: 2098 Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake Log: remove redunant messages Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-26 20:13:12 UTC (rev 2097) +++ trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-26 20:30:07 UTC (rev 2098) @@ -6,11 +6,8 @@ CHECK_FUNCTION_EXISTS (openpty OPENPTY) -MESSAGE ("OPENPTY ${OPENPTY} HAVE_LIBUTIL ${HAVE_LIBUTIL}") - IF (NOT OPENPTY AND HAVE_LIBUTIL) CHECK_LIBRARY_EXISTS (util openpty "" UTIL_OPENPTY) - MESSAGE ("UTIL_OPENPTY ${UTIL_OPENPTY}") IF (UTIL_OPENPTY) PLUGIN_LINK_LIBRARIES (util) SET (HAVE_OPENPTY 1)

1 0

[commit] r2097 - disambiguate openpty() found in libc or in libutil
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 13:13:12 -0700 (Wed, 26 Aug 2009) New Revision: 2097 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake Log: disambiguate openpty() found in libc or in libutil Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 19:21:15 UTC (rev 2096) +++ trunk/platforms/unix/ChangeLog 2009-08-26 20:13:12 UTC (rev 2097) @@ -1,3 +1,8 @@ +2009-08-26 Ian Piumarta <piumarta(a)freebsd.piumarta.com> + + * plugins/PseudoTTYPlugin/config.cmake: Disambiguate whether openpty found + in libc and in libutil. + 2009-08-26 <piumarta(a)ubuntu.piumarta.com> * plugins/SqueakFFIPrims/any-libffi.c: Include ffi.h unless Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-26 19:21:15 UTC (rev 2096) +++ trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-26 20:13:12 UTC (rev 2097) @@ -1,18 +1,19 @@ -CHECK_INCLUDE_FILE (util.h HAVE_UTIL_H) -CHECK_INCLUDE_FILE (libutil.h HAVE_LIBUTIL_H) -CHECK_INCLUDE_FILE (pty.h HAVE_PTY_H) -CHECK_INCLUDE_FILE (stropts.h HAVE_STROPTS_H) +PLUGIN_FIND_INCLUDE (UTIL util.h) +PLUGIN_FIND_INCLUDE (LIBUTIL libutil.h) +PLUGIN_FIND_LIBRARY (UTIL util) +PLUGIN_FIND_INCLUDE (PTY pty.h) +PLUGIN_FIND_INCLUDE (STROPTS stropts.h) -# can't include libutil.h by itself on FreeBSD because of missing defns -IF (NOT HAVE_LIBUTIL_H AND EXISTS /usr/include/libutil.h) - SET (HAVE_LIBUTIL_H 1) -ENDIF () +CHECK_FUNCTION_EXISTS (openpty OPENPTY) -CHECK_FUNCTION_EXISTS (openpty HAVE_OPENPTY) -IF (NOT HAVE_OPENPTY) - CHECK_LIBRARY_EXISTS (util openpty "" HAVE_OPENPTY) - IF (HAVE_OPENPTY) +MESSAGE ("OPENPTY ${OPENPTY} HAVE_LIBUTIL ${HAVE_LIBUTIL}") + +IF (NOT OPENPTY AND HAVE_LIBUTIL) + CHECK_LIBRARY_EXISTS (util openpty "" UTIL_OPENPTY) + MESSAGE ("UTIL_OPENPTY ${UTIL_OPENPTY}") + IF (UTIL_OPENPTY) PLUGIN_LINK_LIBRARIES (util) + SET (HAVE_OPENPTY 1) ELSE () IF (EXISTS /dev/ptmx) CHECK_FUNCTION_EXISTS (grantpt HAVE_UNIX98_PTYS) @@ -20,8 +21,8 @@ PLUGIN_DISABLE () ENDIF (NOT HAVE_UNIX98_PTYS) ENDIF (EXISTS /dev/ptmx) - ENDIF (HAVE_OPENPTY) -ENDIF (NOT HAVE_OPENPTY) + ENDIF (UTIL_OPENPTY) +ENDIF (NOT OPENPTY AND HAVE_LIBUTIL) PLUGIN_INCLUDE_DIRECTORIES (${unix}/plugins/AsynchFilePlugin)

1 0

[commit] r2096 - include ffi.h unless HAVE_FFI_FFI_H is defined
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 12:21:15 -0700 (Wed, 26 Aug 2009) New Revision: 2096 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c Log: include ffi.h unless HAVE_FFI_FFI_H is defined Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 19:17:25 UTC (rev 2095) +++ trunk/platforms/unix/ChangeLog 2009-08-26 19:21:15 UTC (rev 2096) @@ -1,5 +1,8 @@ 2009-08-26 <piumarta(a)ubuntu.piumarta.com> + * plugins/SqueakFFIPrims/any-libffi.c: Include ffi.h unless + HAVE_FFI_FFI_H is defined. + * plugins/RomePlugin/config.cmake, plugins/UUIDPlugin/config.cmake, plugins/SqueakFFIPrims/config.cmake, plugins/OggPlugin/config.cmake, plugins/UnixOSProcessPlugin/config.cmake, Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c 2009-08-26 19:17:25 UTC (rev 2095) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c 2009-08-26 19:21:15 UTC (rev 2096) @@ -17,10 +17,10 @@ #ifndef NO_FFI_SUPPORT -#if defined(HAVE_FFI_H) +#if defined(HAVE_FFI_FFI_H) +# include <ffi/ffi.h> +#else # include <ffi.h> -#elif defined(HAVE_FFI_FFI_H) -# include <ffi/ffi.h> #endif #ifndef FFI_TYPE_STRUCT /* this is private in libffi-2 */

1 0

[commit] r2095 - use PLUGIN_FIND and PLUGIN_REQUIRE macros wherever possible; prefer PLUGIN_REQUIRE_PACKAGE when supported
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 12:17:25 -0700 (Wed, 26 Aug 2009) New Revision: 2095 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/DBusPlugin/config.cmake trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake trunk/platforms/unix/plugins/OggPlugin/config.cmake trunk/platforms/unix/plugins/RomePlugin/config.cmake trunk/platforms/unix/plugins/SocketPlugin/config.cmake trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake trunk/platforms/unix/plugins/UUIDPlugin/config.cmake trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake trunk/platforms/unix/vm-display-fbdev/config.cmake trunk/platforms/unix/vm-sound-ALSA/config.cmake trunk/platforms/unix/vm-sound-NAS/config.cmake trunk/platforms/unix/vm-sound-OSS/config.cmake Log: use PLUGIN_FIND and PLUGIN_REQUIRE macros wherever possible; prefer PLUGIN_REQUIRE_PACKAGE when supported Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/ChangeLog 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,5 +1,18 @@ 2009-08-26 <piumarta(a)ubuntu.piumarta.com> + * plugins/RomePlugin/config.cmake, plugins/UUIDPlugin/config.cmake, + plugins/SqueakFFIPrims/config.cmake, plugins/OggPlugin/config.cmake, + plugins/UnixOSProcessPlugin/config.cmake, + plugins/GStreamerPlugin/config.cmake, plugins/DBusPlugin/config.cmake, + plugins/SocketPlugin/config.cmake, vm-sound-ALSA/config.cmake, + vm-sound-NAS/config.cmake, vm-display-fbdev/config.cmake, + vm-sound-OSS/config.cmake: Use PLUGIN_FIND and PLUGIN_REQUIRE macros + wheverver possible. Remove explicit manipulation of include and library + lists. + + * plugins/UUIDPlugin/sqUnixUUID.c: Assume include path set in + config.cmake as required. + * vm/config.cmake: Remove explicit test for /usr/pkg. * vm/build.cmake: Search vm_include_directories and vm_link_directories. Link against vm_link_libraries. Modified: trunk/platforms/unix/plugins/DBusPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/DBusPlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/DBusPlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,5 +1 @@ -CHECK_INCLUDE_FILE (dbus/dbus.h HAVE_DBUS_DBUS_H) - -IF (NOT HAVE_DBUS_DBUS_H) - PLUGIN_DISABLE () -ENDIF (NOT HAVE_DBUS_DBUS_H) +PLUGIN_REQUIRE_PACKAGE (DBUS1 dbus-1) Modified: trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,5 +1,3 @@ -CHECK_INCLUDE_FILE (gst/gst.h HAVE_GST_GST_H) - -IF (NOT HAVE_GST_GST_H) - PLUGIN_DISABLE () -ENDIF (NOT HAVE_GST_GST_H) +PLUGIN_REQUIRE_PACKAGE (GLIB2 glib-2.0) +PLUGIN_REQUIRE_PACKAGE (XML2 libxml-2.0) +PLUGIN_REQUIRE_INCLUDE (GST_GST gst/gst.h /usr/include/gstreamer-0.10) Modified: trunk/platforms/unix/plugins/OggPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/OggPlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/OggPlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,11 +1,7 @@ -CHECK_INCLUDE_FILE (vorbis/codec.h HAVE_VORBIS_CODEC_H) -CHECK_INCLUDE_FILE (vorbis/vorbisenc.h HAVE_VORBIS_VORBISENC_H) -CHECK_INCLUDE_FILE (speex/speex.h HAVE_SPEEX_SPEEX_H) +PLUGIN_REQUIRE_INCLUDE (VORBIS_CODEC vorbis/codec.h) +PLUGIN_REQUIRE_INCLUDE (VORBIS_VORBISENC vorbis/vorbisenc.h) +PLUGIN_REQUIRE_INCLUDE (SPEEX_SPEEX speex/speex.h) -CHECK_LIBRARY_EXISTS (ogg ogg_sync_buffer "" HAVE_LIB_OGG) -CHECK_LIBRARY_EXISTS (vorbis vorbis_synthesis_headerin "" HAVE_LIB_VORBIS) -CHECK_LIBRARY_EXISTS (speex speex_packet_to_header "" HAVE_LIB_SPEEX) - -IF (NOT HAVE_VORBIS_CODEC_H OR NOT HAVE_VORBIS_VORBISENC_H OR NOT HAVE_SPEEX_SPEEX_H OR NOT HAVE_LIB_OGG OR NOT HAVE_LIB_VORBIS OR NOT HAVE_LIB_SPEEX) - PLUGIN_DISABLE () -ENDIF () +PLUGIN_REQUIRE_LIBRARY (OGG ogg) +PLUGIN_REQUIRE_LIBRARY (VORBIS vorbis) +PLUGIN_REQUIRE_LIBRARY (SPEEX speex) Modified: trunk/platforms/unix/plugins/RomePlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/RomePlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/RomePlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,16 +1,4 @@ -IF (PKG_CONFIG_FOUND) - PKG_CHECK_MODULES (PANGOCAIRO pangocairo) - PKG_CHECK_MODULES (FREETYPE freetype2) - IF (PANGOCAIRO_FOUND AND FREETYPE_FOUND) - SET (CMAKE_REQUIRED_INCLUDES ${PANGOCAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}) - CHECK_INCLUDE_FILE (cairo-ft.h HAVE_CAIRO_FT_H) - ENDIF () -ENDIF () - -IF (HAVE_CAIRO_FT_H) - PLUGIN_INCLUDE_DIRECTORIES (${PANGOCAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ${cross}/plugins/SurfacePlugin) - PLUGIN_LINK_DIRECTORIES (${PANGOCAIRO_LIBRARY_DIRS} ${FREETYPE_LIBRARY_DIRS}) - PLUGIN_LINK_LIBRARIES (${PANGOCAIRO_LIBRARIES} ${FREETYPE_LIBRARIES}) -ELSE () - PLUGIN_DISABLE () -ENDIF () +PLUGIN_REQUIRE_PACKAGE (PANGOCAIRO pangocairo) +PLUGIN_REQUIRE_PACKAGE (FREETYPE freetype2) +PLUGIN_REQUIRE_INCLUDE (CAIRO_FT cairo-ft.h) +PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/SurfacePlugin) Modified: trunk/platforms/unix/plugins/SocketPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/SocketPlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/SocketPlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,11 +1,2 @@ -CHECK_LIBRARY_EXISTS (socket bind "" HAVE_LIBSOCKET) - -IF (HAVE_LIBSOCKET) - USE_LIBRARY (socket) -ENDIF (HAVE_LIBSOCKET) - -CHECK_LIBRARY_EXISTS (nsl gethostbyaddr "" HAVE_LIBNSL) - -IF (HAVE_LIBNSL) - USE_LIBRARY (nsl) -ENDIF (HAVE_LIBNSL) +PLUGIN_FIND_LIBRARY(SOCKET socket) +PLUGIN_FIND_LIBRARY(NSL nsl) Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -25,22 +25,14 @@ SET (cpu any) SET (abi libffi) PLUGIN_MESSAGE ("${cpu}-${abi}") - IF (PKG_CONFIG_FOUND) - PKG_CHECK_MODULES (LIBFFI libffi) - IF (LIBFFI_FOUND) - PLUGIN_INCLUDE_DIRECTORIES (${LIBFFI_INCLUDE_DIRS}) - PLUGIN_LINK_DIRECTORIES (${LIBFFI_LIBRARY_DIRS}) - PLUGIN_LINK_LIBRARIES (${LIBFFI_LIBRARIES}) - SET (HAVE_FFI_H 1) - ENDIF () - ENDIF () - IF (NOT LIBFFI_FOUND) + PLUGIN_FIND_PACKAGE (LIBFFI libffi) + IF (NOT LIBFFI_FOUND) CHECK_INCLUDE_FILE (ffi.h HAVE_FFI_H) CHECK_INCLUDE_FILE (ffi/ffi.h HAVE_FFI_FFI_H) IF (NOT HAVE_FFI_H AND NOT HAVE_FFI_FFI_H) PLUGIN_DISABLE () - ELSE () - PLUGIN_LINK_LIBRARIES (ffi) + ELSE () + PLUGIN_REQUIRE_LIBRARY (ffi) ENDIF () ENDIF () ENDIF () Modified: trunk/platforms/unix/plugins/UUIDPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,14 +1,2 @@ -CHECK_INCLUDE_FILE (uuid.h HAVE_UUID_H) -CHECK_INCLUDE_FILE (uuid/uuid.h HAVE_UUID_UUID_H) - -IF (NOT HAVE_UUID_H AND NOT HAVE_UUID_UUID_H) - PLUGIN_DISABLE () -ELSE () - CHECK_LIBRARY_EXISTS (uuid uuid_generate "" HAVE_LIBUUID) - IF (HAVE_LIBUUID) - PLUGIN_LINK_LIBRARIES (uuid) - ENDIF () -ENDIF () - -CONFIG_DEFINE (HAVE_UUID_H) -CONFIG_DEFINE (HAVE_UUID_UUID_H) +PLUGIN_REQUIRE_INCLUDE(UUID uuid.h /usr/include/uuid) +PLUGIN_REQUIRE_LIBRARY(UUID uuid) Modified: trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c =================================================================== --- trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,9 +1,5 @@ #include "config.h" -#if defined(HAVE_UUID_H) -# include <uuid.h> -#elif defined(HAVE_UUID_UUID_H) -# include <uuid/uuid.h> -#endif +#include <uuid.h> #include "sq.h" int sqUUIDInit(void) Modified: trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,11 +1,7 @@ +PLUGIN_REQUIRE_LIBRARY (PTHREAD pthread) +PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) +PLUGIN_DEFINITIONS (-DSQAIO_H=\"sqaio.h\") + CHECK_FUNCTION_EXISTS (unsetenv HAVE_UNSETENV) -CHECK_LIBRARY_EXISTS (pthread pthread_kill "" HAVE_LIB_PTHREAD) -IF (NOT HAVE_LIB_PTHREAD) - PLUGIN_DISABLE () -ELSE () - PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) - PLUGIN_DEFINITIONS (-DSQAIO_H=\"sqaio.h\") -ENDIF () - CONFIG_DEFINE (HAVE_UNSETENV) Modified: trunk/platforms/unix/vm-display-fbdev/config.cmake =================================================================== --- trunk/platforms/unix/vm-display-fbdev/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/vm-display-fbdev/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,7 +1,2 @@ -CHECK_INCLUDE_FILE (linux/fb.h HAVE_LINUX_FB_H) - -IF (NOT HAVE_LINUX_FB_H) - PLUGIN_DISABLE () -ELSE () - PLUGIN_SOURCES (${unix}/${plugin}/sqUnixFBDev.c) -ENDIF () +PLUGIN_REQUIRE_INCLUDE (LINUX_FB linux/fb.h) +PLUGIN_SOURCES (${unix}/${plugin}/sqUnixFBDev.c) Modified: trunk/platforms/unix/vm-sound-ALSA/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-ALSA/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/vm-sound-ALSA/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,4 +1,2 @@ -CHECK_INCLUDE_FILE (alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H) -IF (NOT HAVE_ALSA_ASOUNDLIB_H) - PLUGIN_DISABLE() -ENDIF () +PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h) +PLUGIN_REQUIRE_LIBRARY (ASOUND asound) Modified: trunk/platforms/unix/vm-sound-NAS/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-NAS/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/vm-sound-NAS/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,4 +1,2 @@ -CHECK_INCLUDE_FILE (audio/audio.h HAVE_AUDIO_AUDIO_H) -IF (NOT HAVE_AUDIO_AUDIO_H) - PLUGIN_DISABLE () -ENDIF () +PLUGIN_REQUIRE_INCLUDE (AUDIO_AUDIO_H audio/audio.h) +PLUGIN_REQUIRE_LIBRARY (AUDIO audio) Modified: trunk/platforms/unix/vm-sound-OSS/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-OSS/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) +++ trunk/platforms/unix/vm-sound-OSS/config.cmake 2009-08-26 19:17:25 UTC (rev 2095) @@ -1,5 +1,2 @@ -CHECK_INCLUDE_FILE (alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H) -CHECK_LIBRARY_EXISTS (asound snd_pcm_open "" HAVE_SND_PCM_OPEN) -IF (NOT HAVE_ALSA_ASOUNDLIB_H OR NOT HAVE_SND_PCM_OPEN) - PLUGIN_DISABLE () -ENDIF () +PLUGIN_REQUIRE_INCLUDE (ALSA_SOUNDLIB alsa/asoundlib.h) +PLUGIN_REQUIRE_LIBRARY (ASOUND asound)

1 0

[commit] r2094 - remove /usr/pkg tests; treat vm as plugin target
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 12:07:50 -0700 (Wed, 26 Aug 2009) New Revision: 2094 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/vm/build.cmake trunk/platforms/unix/vm/config.cmake Log: remove /usr/pkg tests; treat vm as plugin target Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 19:03:50 UTC (rev 2093) +++ trunk/platforms/unix/ChangeLog 2009-08-26 19:07:50 UTC (rev 2094) @@ -1,5 +1,9 @@ 2009-08-26 <piumarta(a)ubuntu.piumarta.com> + * vm/config.cmake: Remove explicit test for /usr/pkg. + * vm/build.cmake: Search vm_include_directories and + vm_link_directories. Link against vm_link_libraries. + * cmake/PluginInternal.cmake, cmake/PluginExternal.cmake: Remove CMAKE_REQUIRE_INCLUDES from include paths. Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2009-08-26 19:03:50 UTC (rev 2093) +++ trunk/platforms/unix/vm/build.cmake 2009-08-26 19:07:50 UTC (rev 2094) @@ -1,3 +1,5 @@ +LINK_DIRECTORIES (${vm_link_directories}) + ADD_EXECUTABLE (squeakvm ${src}/vm/interp.c ${unix}/vm/aio.c @@ -26,11 +28,12 @@ ${unix}/plugins/B3DAcceleratorPlugin # for sqUnixOpenGL.h ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} + ${vm_include_directories} ) SET_TARGET_PROPERTIES (squeakvm PROPERTIES LINK_FLAGS "${CMAKE_EXE_EXPORTS_C_FLAG}") -TARGET_LINK_LIBRARIES (squeakvm m ${squeak_libs}) +TARGET_LINK_LIBRARIES (squeakvm m ${squeak_libs} ${vm_link_libraries}) INSTALL (PROGRAMS ${bld}/squeakvm DESTINATION ${plgdir}) Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-08-26 19:03:50 UTC (rev 2093) +++ trunk/platforms/unix/vm/config.cmake 2009-08-26 19:07:50 UTC (rev 2094) @@ -15,14 +15,6 @@ CONFIG_DEFINE (DARWIN) -IF (EXISTS /usr/pkg/include) - LIST (APPEND CMAKE_REQUIRED_INCLUDES /usr/pkg/include) -ENDIF (EXISTS /usr/pkg/include) - -IF (EXISTS /usr/pkg/lib) - LIST (APPEND CMAKE_REQUIRED_LIBRARIES -L/usr/pkg/lib) -ENDIF (EXISTS /usr/pkg/lib) - SET (interp interp) INCLUDE (TestBigEndian)

1 0

[commit] r2093 - remove CMAKE_REQUIRED_INCLUDES from target search path
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 12:03:50 -0700 (Wed, 26 Aug 2009) New Revision: 2093 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/PluginExternal.cmake trunk/platforms/unix/cmake/PluginInternal.cmake Log: remove CMAKE_REQUIRED_INCLUDES from target search path Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 19:01:08 UTC (rev 2092) +++ trunk/platforms/unix/ChangeLog 2009-08-26 19:03:50 UTC (rev 2093) @@ -1,5 +1,8 @@ 2009-08-26 <piumarta(a)ubuntu.piumarta.com> + * cmake/PluginInternal.cmake, cmake/PluginExternal.cmake: Remove + CMAKE_REQUIRE_INCLUDES from include paths. + * cmake/Plugins.cmake: Add PLUGIN_FIND and PLUGIN_REQUIRE macros. * cmake/Utils.cmake: Add macro LIST_APPEND. Modified: trunk/platforms/unix/cmake/PluginExternal.cmake =================================================================== --- trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-26 19:01:08 UTC (rev 2092) +++ trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-26 19:03:50 UTC (rev 2093) @@ -10,7 +10,6 @@ ${unix}/plugins/@plugin@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ - ${CMAKE_REQUIRED_INCLUDES} ) ADD_LIBRARY (@plugin@ MODULE @plugin_sources@) Modified: trunk/platforms/unix/cmake/PluginInternal.cmake =================================================================== --- trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-26 19:01:08 UTC (rev 2092) +++ trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-26 19:03:50 UTC (rev 2093) @@ -10,7 +10,6 @@ ${unix}/plugins/@plugin@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ - ${CMAKE_REQUIRED_INCLUDES} ) ADD_LIBRARY (@plugin@ STATIC @plugin_sources@)

1 0

[commit] r2092 - add PLUGIN_FIND and PLUGIN_REQUIRE macros
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-26 12:01:08 -0700 (Wed, 26 Aug 2009) New Revision: 2092 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/Plugins.cmake trunk/platforms/unix/cmake/Utils.cmake Log: add PLUGIN_FIND and PLUGIN_REQUIRE macros Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 05:24:14 UTC (rev 2091) +++ trunk/platforms/unix/ChangeLog 2009-08-26 19:01:08 UTC (rev 2092) @@ -1,3 +1,8 @@ +2009-08-26 <piumarta(a)ubuntu.piumarta.com> + + * cmake/Plugins.cmake: Add PLUGIN_FIND and PLUGIN_REQUIRE macros. + * cmake/Utils.cmake: Add macro LIST_APPEND. + 2009-08-25 <piumarta(a)netbsd.piumarta.com> * plugins/SqueakFFIPrims/config.cmake: Check for libffi via Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2009-08-26 05:24:14 UTC (rev 2091) +++ trunk/platforms/unix/cmake/Plugins.cmake 2009-08-26 19:01:08 UTC (rev 2092) @@ -1,6 +1,6 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2009-08-25 13:46:02 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-08-26 11:58:56 by piumarta on ubuntu.piumarta.com FILE (STRINGS ${src}/plugins.int plugins_int) STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int}) @@ -67,19 +67,19 @@ ENDMACRO (PLUGIN_SOURCES) MACRO (PLUGIN_DEFINITIONS) - SET (${plugin}_definitions ${${plugin}_definitions} ${ARGV}) + LIST_APPEND (${plugin}_definitions ${ARGV}) ENDMACRO (PLUGIN_DEFINITIONS) MACRO (PLUGIN_INCLUDE_DIRECTORIES) - SET (${plugin}_include_directories ${${plugin}_include_directories} ${ARGV}) + LIST_APPEND (${plugin}_include_directories ${ARGV}) ENDMACRO (PLUGIN_INCLUDE_DIRECTORIES) MACRO (PLUGIN_LINK_DIRECTORIES) - SET (${plugin}_link_directories ${${plugin}_link_directories} ${ARGV}) + LIST_APPEND (${plugin_target}_link_directories ${ARGV}) ENDMACRO (PLUGIN_LINK_DIRECTORIES) MACRO (PLUGIN_LINK_LIBRARIES) - SET (${plugin}_link_libraries ${${plugin}_link_libraries} ${ARGV}) + LIST_APPEND (${plugin_target}_link_libraries ${ARGV}) ENDMACRO (PLUGIN_LINK_LIBRARIES) MACRO (CONFIGURE_PLUGIN_LIST plugins_list) @@ -91,6 +91,11 @@ FILE_APPEND (${bld}/${plugin}/config.cmake ${dir}/${plugin}/config.cmake) ENDFOREACH (dir) #MESSAGE ("-- plugin ${plugin}") + IF (${plugins_list} STREQUAL "plugins_int") + SET (plugin_target "vm") + ELSE () + SET (plugin_target "${plugin}") + ENDIF (${plugins_list} STREQUAL "plugins_int") SET (plugin_disabled) INCLUDE (${bld}/${plugin}/config.cmake) IF (OPT_without-${plugin}) @@ -132,9 +137,65 @@ ENDMACRO (BUILD_PLUGINS) MACRO (PLUGIN_MESSAGE msg) - MESSAGE ("-- ${plugin}: ${msg}") + MESSAGE (STATUS "${plugin}: ${msg}") ENDMACRO (PLUGIN_MESSAGE) +MACRO (PLUGIN_FIND_INCLUDE VAR NAME) + FIND_PATH (${VAR}_H ${NAME} ${${plugin_target}_include_directories} ${ARGN}) + IF (${VAR}_H) + PLUGIN_MESSAGE ("${${VAR}_H}/${NAME}") + SET (HAVE_${VAR}_H 1) + PLUGIN_INCLUDE_DIRECTORIES (${${VAR}_H}) + ELSE () + PLUGIN_MESSAGE ("${NAME} not found") + ENDIF () +ENDMACRO () + +MACRO (PLUGIN_REQUIRE_INCLUDE VAR NAME) + PLUGIN_FIND_INCLUDE(${VAR} ${NAME} ${ARGN}) + IF (NOT ${VAR}_H) + PLUGIN_DISABLE () + ENDIF () +ENDMACRO () + +MACRO (PLUGIN_FIND_LIBRARY VAR NAME) + FIND_LIBRARY (LIB${VAR} ${NAME}) + IF (LIB${VAR}) + PLUGIN_MESSAGE ("${LIB${VAR}}") + SET (HAVE_LIB${VAR} 1) + PLUGIN_LINK_LIBRARIES (${LIB${VAR}}) + ELSE () + PLUGIN_MESSAGE ("lib${NAME} not found") + ENDIF () +ENDMACRO () + +MACRO (PLUGIN_REQUIRE_LIBRARY VAR NAME) + PLUGIN_FIND_LIBRARY(${VAR} ${NAME}) + if (NOT LIB${VAR}) + PLUGIN_DISABLE () + ENDIF () +ENDMACRO () + +MACRO (PLUGIN_FIND_PACKAGE VAR NAME) + IF (PKG_CONFIG_FOUND) + PKG_CHECK_MODULES (${VAR} ${NAME}) + IF (${VAR}_FOUND) + PLUGIN_MESSAGE ("${NAME} found") + SET (HAVE_${VAR} 1) + PLUGIN_INCLUDE_DIRECTORIES (${${VAR}_INCLUDE_DIRS}) + PLUGIN_LINK_DIRECTORIES (${${VAR}_LIBRARY_DIRS}) + PLUGIN_LINK_LIBRARIES (${${VAR}_LIBRARIES}) + ENDIF () + ENDIF () +ENDMACRO () + +MACRO (PLUGIN_REQUIRE_PACKAGE VAR NAME) + PLUGIN_FIND_PACKAGE(${VAR} ${NAME}) + IF (NOT ${VAR}_FOUND) + PLUGIN_DISABLE () + ENDIF () +ENDMACRO () + MACRO (EXPECT_UNDEFINED_SYMBOLS) IF (APPLE) SET (CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined suppress") Modified: trunk/platforms/unix/cmake/Utils.cmake =================================================================== --- trunk/platforms/unix/cmake/Utils.cmake 2009-08-26 05:24:14 UTC (rev 2091) +++ trunk/platforms/unix/cmake/Utils.cmake 2009-08-26 19:01:08 UTC (rev 2092) @@ -1,25 +1,30 @@ # Some random useful things to avoid repetition # -# Last edited: 2009-08-13 20:28:39 by piumarta on emilia-2.local +# Last edited: 2009-08-26 10:41:32 by piumarta on ubuntu.piumarta.com MACRO (STRING_APPEND var str) - IF (DEFINED ${var}) - SET (${var} "${${var}} ${str}") - ELSE (DEFINED ${var}) - SET (${var} "${str}") - ENDIF (DEFINED ${var}) + IF (DEFINED ${var}) + SET (${var} "${${var}} ${str}") + ELSE (DEFINED ${var}) + SET (${var} "${str}") + ENDIF (DEFINED ${var}) ENDMACRO (STRING_APPEND) +MACRO (LIST_APPEND list) + LIST (APPEND ${list} "${ARGN}") + LIST (REMOVE_DUPLICATES ${list}) +ENDMACRO (LIST_APPEND) + MACRO (FILE_APPEND to from) - IF (EXISTS ${from}) - FILE (READ ${from} tmp) - FILE (APPEND ${to} "${tmp}") - ENDIF (EXISTS ${from}) + IF (EXISTS ${from}) + FILE (READ ${from} tmp) + FILE (APPEND ${to} "${tmp}") + ENDIF (EXISTS ${from}) ENDMACRO (FILE_APPEND) MACRO (FILE_COPY to from) - IF (EXISTS ${from}) - FILE (READ ${from} tmp) - FILE (WRITE ${to} "${tmp}") - ENDIF (EXISTS ${from}) + IF (EXISTS ${from}) + FILE (READ ${from} tmp) + FILE (WRITE ${to} "${tmp}") + ENDIF (EXISTS ${from}) ENDMACRO (FILE_COPY)

1 0

VM on Debian/Tests
by Alexander Lazarević 26 Aug '09

26 Aug '09

Hi! Just to give some feedback: Over the weekend I used my old debian build environment to build a debian package for 3.10-6. I ran into the same problem someone else reported, that the deactivation of the RomePlugin did not work. Once I made Pango and Cairo a build requirement I could build the package from front to end. Running all SUnit tests resulted in messages from the vm like: ALSA lib confmisc.c:768:(parse_card) cannot find card '0' ALSA lib conf.c:3513:(_snd_config_evaluate) function snd_func_card_driver returned error: No such file or directory ALSA lib confmisc.c:392:(snd_func_concat) error evaluating strings ALSA lib conf.c:3513:(_snd_config_evaluate) function snd_func_concat returned error: No such file or directory ALSA lib confmisc.c:1251:(snd_func_refer) error evaluating name ALSA lib conf.c:3513:(_snd_config_evaluate) function snd_func_refer returned error: No such file or directory ALSA lib conf.c:3985:(snd_config_expand) Evaluate error: No such file or directory ALSA lib pcm.c:2211:(snd_pcm_open_noupdate) Unknown PCM default startSound: snd_pcm_open: No such file or directory Another thing is that I think that the testcase TimeTest>>#testGeneralInquiries is not deterministic at least on the linux platform. Sometimes it fails sometimes it passes. I guess this is because of comparing two different clocks and rounding towards seconds. Haven't looked further into it, it just made me wonder. The test runs fine on Windows every time (I've tried). BTW, I did not run into the same UUID problem I had on my ubuntu machine. On Debian the libuuid1 version is 1.41.3 and on Ubuntu it is 1.41.4, but somehow I doubt the problem is related to the version of libuuid. I will see what happens, when I try to install the debian package on my ubuntu machine. All in all I'm very pleased with the outcome. I now run a nightly update of the trunk image and run all unit tests after that, creating a log of un-/expected passes, failures and errors. This could be used to see when new (= between updates) unexpected results occur. I dare not to ask if it would be a good idea to send an email to squeak-dev in that case? Alex

1 1

VM 4.2.1Beta Window version ?
by jean baptiste arnaud 26 Aug '09

26 Aug '09

Hi, Do you have any idea if a Window version for the VM 4.2.1 exist and where i can find it ? Thank -- Arnaud Jean Baptiste

7 16

Resource Directory support for Windows (VM 4.2.1Beta Window version ?)
by Torsten Bergmann 26 Aug '09

26 Aug '09

>> Oh, and I finally remembered to add the version info to the VM. >You mean "Smalltalk vmVersion" does return something sensible? Can I >see? I think Andreas points to the "version information" that I suggested to add to the *.rc file. This gets compiled into the ressource section of the PE File (executable or dll) on windows and you will see it when right clicking on the file and selecting Properties -> Version. There are windows API's to query for a files version and it is typically used by setup programs to check if a newer version is already installed. Beside the version there is also information about the vendor which is for instance displayed by the windows firewall when the exe/image tries to open a connection. Bye Torsten -- Jetzt kostenlos herunterladen: Internet Explorer 8 und Mozilla Firefox 3 - sicherer, schneller und einfacher! http://portal.gmx.net/de/go/atbrowser

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2009