Vm-dev August 2009

vm-dev@lists.squeakfoundation.org

27 participants
87 discussions

[commit] r2118 - fix building of ffi without libffi when supported
by commits＠squeakvm.org 31 Aug '09

31 Aug '09

Author: piumarta Date: 2009-08-31 12:52:56 -0700 (Mon, 31 Aug 2009) New Revision: 2118 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake Log: fix building of ffi without libffi when supported Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-31 18:21:47 UTC (rev 2117) +++ trunk/platforms/unix/ChangeLog 2009-08-31 19:52:56 UTC (rev 2118) @@ -1,3 +1,8 @@ +2009-08-31 <piumarta(a)ubuntu.piumarta.com> + + * plugins/SqueakFFIPrims/config.cmake: Correctly detect arch and + abi. Enable ASM language. + 2009-08-31 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> * src/plugins/UnixOSProcessPlugin: Updated to version 20. Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-31 18:21:47 UTC (rev 2117) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-31 19:52:56 UTC (rev 2118) @@ -3,25 +3,25 @@ IF (OPT_without-ffi) PLUGIN_DISABLE () ELSE () - IF (${VM_HOST_CPU} STREQUAL "powerpc" OR ${VM_HOST_CPU} STREQUAL "ppc") + IF (vm-host-cpu STREQUAL "powerpc" OR vm-host-cpu STREQUAL "ppc") SET (cpu ppc) - ELSEIF (${VM_HOST_CPU} MATCHES "i[3456789]86") + ELSEIF (vm-host-cpu MATCHES "i[3456789]86") SET (cpu x86) ELSE () SET (USE_LIBFFI 1) ENDIF () - IF (${VM_HOST_OS} STREQUAL "linux") + IF (vm-host-os STREQUAL "linux") SET (abi sysv) - ELSEIF (${VM_HOST_OS} MATCHES "darwin.*") + ELSEIF (vm-host-os MATCHES "darwin.*") SET (abi darwin) ELSE () SET (USE_LIBFFI 1) ENDIF () - # PLUGIN_MESSAGE ("detected ${cpu}-${abi}") - - IF (USE_LIBFFI OR NOT EXISTS ${plugin}/${cpu}-${abi}.c OR NOT EXISTS ${plugin}/${cpu}-${abi}-asm.S) + IF (USE_LIBFFI + OR NOT EXISTS "${unix}/plugins/${plugin}/${cpu}-${abi}.c" + OR NOT EXISTS "${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") SET (cpu any) SET (abi libffi) PLUGIN_MESSAGE ("${cpu}-${abi}") @@ -43,7 +43,8 @@ ELSE () PLUGIN_DISABLE () ENDIF () - PLUGIN_SOURCES ("${SQFFIC} ${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") + ENABLE_LANGUAGE (ASM) + PLUGIN_SOURCES ("${SQFFIC} ${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") ENDIF () CONFIG_DEFINE (HAVE_FFI_H)

1 0

[commit] r2117 - update ospp to 4.3.3
by commits＠squeakvm.org 31 Aug '09

31 Aug '09

Author: piumarta Date: 2009-08-31 11:21:47 -0700 (Mon, 31 Aug 2009) New Revision: 2117 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c Log: update ospp to 4.3.3 Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-31 07:05:33 UTC (rev 2116) +++ trunk/platforms/unix/ChangeLog 2009-08-31 18:21:47 UTC (rev 2117) @@ -1,3 +1,7 @@ +2009-08-31 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * src/plugins/UnixOSProcessPlugin: Updated to version 20. + 2009-08-30 <piumarta(a)ubuntu.piumarta.com> * vm/sqUnixMain.c (main): squeakPlugin path defaults to VM Modified: trunk/platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- trunk/platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2009-08-31 07:05:33 UTC (rev 2116) +++ trunk/platforms/unix/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2009-08-31 18:21:47 UTC (rev 2117) @@ -1,4 +1,4 @@ -/* Automatically generated from Squeak on an Array(26 August 2009 10:02:31 pm) +/* Automatically generated from Squeak on an Array(31 August 2009 11:16:19 am) by VMMaker 3.11.3 */ @@ -29,7 +29,7 @@ #endif #include <sys/types.h> /* D T Lewis - UnixOSProcessPlugin.c translated from class - UnixOSProcessPlugin of OSProcessPlugin version 4.3.1 */ + UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 */ #include <sys/time.h> #include <sys/wait.h> #include <signal.h> @@ -115,6 +115,7 @@ EXPORT(sqInt) primitiveChdir(void); EXPORT(sqInt) primitiveCreatePipe(void); EXPORT(sqInt) primitiveCreatePipeWithSessionIdentifier(void); +EXPORT(sqInt) primitiveDupTo(sqInt oldFileDescriptor, sqInt newFileDescriptor); EXPORT(sqInt) primitiveEnvironmentAt(void); EXPORT(sqInt) primitiveEnvironmentAtSymbol(void); EXPORT(sqInt) primitiveErrorMessageAt(void); @@ -258,9 +259,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin 26 August 2009 (i)" + "UnixOSProcessPlugin 31 August 2009 (i)" #else - "UnixOSProcessPlugin 26 August 2009 (e)" + "UnixOSProcessPlugin 31 August 2009 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -1330,6 +1331,22 @@ } +/* Call dup2() to duplicate a file descriptor. Answer the duplicated file descriptor + or -1 on failure. */ + +EXPORT(sqInt) primitiveDupTo(sqInt oldFileDescriptor, sqInt newFileDescriptor) { + int oldfd; + int newfd; + int result; + + newfd = interpreterProxy->stackIntegerValue(0); + oldfd = interpreterProxy->stackIntegerValue(1); + result = dup2(oldfd, newfd); + interpreterProxy->pop(3); + interpreterProxy->pushInteger(result); +} + + /* Answer a string containing the OS process environment string at index (an Integer) in the environment list. */ @@ -2356,7 +2373,7 @@ EXPORT(sqInt) primitiveSQFileSetNonBlocking(void) { sqInt sqFileOop; sqInt descriptor; - sqInt flags; + int flags; sqInt retVal; sqFileOop = interpreterProxy->stackValue(0); @@ -2480,7 +2497,7 @@ sigNum = interpreterProxy->stackIntegerValue(0); index = semaIndices[sigNum]; - interpreterProxy->pop(1); + interpreterProxy->pop(2); interpreterProxy->pushInteger(index); } @@ -3100,8 +3117,13 @@ #primitiveUnixFileNumber. */ EXPORT(sqInt) primitiveUnixFileClose(sqInt anIntegerFileNumber) { + int result; + int handle; + + handle = interpreterProxy->stackIntegerValue(0); + result = close(handle); interpreterProxy->pop(2); - interpreterProxy->pushInteger(close(interpreterProxy->stackIntegerValue(0))); + interpreterProxy->pushInteger(result); } @@ -3675,7 +3697,7 @@ /* 4.0 supports 64bit code base */ static char * versionString(void) { - static char version[]= "4.3.1"; + static char version[]= "4.3.3"; return version; } @@ -3733,6 +3755,7 @@ {"UnixOSProcessPlugin", "primitiveForkExec", (void*)primitiveForkExec}, {"UnixOSProcessPlugin", "primitiveErrorMessageAt", (void*)primitiveErrorMessageAt}, {"UnixOSProcessPlugin", "primitiveGetPid", (void*)primitiveGetPid}, + {"UnixOSProcessPlugin", "primitiveDupTo", (void*)primitiveDupTo}, {"UnixOSProcessPlugin", "primitiveRealpath", (void*)primitiveRealpath}, {"UnixOSProcessPlugin", "primitiveSendSigusr2To", (void*)primitiveSendSigusr2To}, {"UnixOSProcessPlugin", "primitiveReapChildProcess", (void*)primitiveReapChildProcess},

1 0

[commit] r2116 - fix build instructions
by commits＠squeakvm.org 31 Aug '09

31 Aug '09

Author: piumarta Date: 2009-08-31 00:05:33 -0700 (Mon, 31 Aug 2009) New Revision: 2116 Modified: trunk/platforms/unix/README.CMake Log: fix build instructions Modified: trunk/platforms/unix/README.CMake =================================================================== --- trunk/platforms/unix/README.CMake 2009-08-31 02:44:43 UTC (rev 2115) +++ trunk/platforms/unix/README.CMake 2009-08-31 07:05:33 UTC (rev 2116) @@ -44,8 +44,8 @@ (assuming your terminal supports them). This should leave you with an executable called 'squeak' in your build directory. -7 You can test the binary in-place by running 'squeakvm' with a path - to an image file as argument; e.g: ./squeakvm ../../squeak.image +7 You can test the binary in-place by running 'squeak' with a path to + an image file as argument; e.g: ./squeak ../../squeak.image 8 If it works, install it by typing 'make install' in your build directory. @@ -59,4 +59,4 @@ step 3. ---- -Last edited: 2009-08-19 04:47:22 by piumarta on emilia-2.local +Last edited: 2009-08-30 23:56:00 by piumarta on ubuntu.piumarta.com

1 0

[commit] r2115 - ensure execute permission on shell scripts
by commits＠squeakvm.org 31 Aug '09

31 Aug '09

Author: piumarta Date: 2009-08-30 19:44:43 -0700 (Sun, 30 Aug 2009) New Revision: 2115 Modified: trunk/platforms/unix/vm/build.cmake Log: ensure execute permission on shell scripts Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2009-08-30 23:46:00 UTC (rev 2114) +++ trunk/platforms/unix/vm/build.cmake 2009-08-31 02:44:43 UTC (rev 2115) @@ -44,11 +44,13 @@ ADD_CUSTOM_TARGET (squeak DEPENDS ${config}/squeak.in COMMAND sh ${bld}/config ${config}/squeak.in ${bld}/squeak + COMMAND chmod +x ${bld}/squeak ) ADD_CUSTOM_TARGET (squeak.sh DEPENDS ${config}/squeak.sh.in COMMAND sh ${bld}/config ${config}/squeak.sh.in ${bld}/squeak.sh + COMMAND chmod +x ${bld}/squeak.sh ) ADD_DEPENDENCIES (squeakvm squeak squeak.sh)

1 0

[commit] r2114 - simplify plugin & FFI library search
by commits＠squeakvm.org 30 Aug '09

30 Aug '09

Author: piumarta Date: 2009-08-30 16:46:00 -0700 (Sun, 30 Aug 2009) New Revision: 2114 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake trunk/platforms/unix/vm/config.cmake trunk/platforms/unix/vm/sqUnixExternalPrims.c trunk/platforms/unix/vm/sqUnixMain.c Log: simplify plugin & FFI library search Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-28 05:25:58 UTC (rev 2113) +++ trunk/platforms/unix/ChangeLog 2009-08-30 23:46:00 UTC (rev 2114) @@ -1,3 +1,22 @@ +2009-08-30 <piumarta(a)ubuntu.piumarta.com> + + * vm/sqUnixMain.c (main): squeakPlugin path defaults to VM + executable directory. + + * plugins/SqueakFFIPrims/config.cmake: Explicitly include + generated source in plugin_sources. + + * vm/sqUnixExternalPrims.c (ioLoadModule): squeakPlugins can + contain ':'-separated paths. Distinguish module and library + prefix and suffix. Try to load a module from each squeakPlugins + path with module prefix/suffix, then try dlopen() with no explicit + path and platoform's library prefix/suffix. + + * vm/config.cmake: Configure {MODULE,LIBRARY}_{PREFIX,SUFFIX}. + Change default module prefix to "so.", suffix to "". + + * vm/sqUnixMain.c (main): Default plugin location is VM directory. + 2009-08-27 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> * cmake/squeak.in: Path and text encodings are UTF-8 unless Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-28 05:25:58 UTC (rev 2113) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-30 23:46:00 UTC (rev 2114) @@ -36,7 +36,14 @@ ENDIF () ENDIF () ENDIF () - PLUGIN_SOURCES ("${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") + IF (EXISTS "${src}/plugins/${plugin}/${plugin}.c") + SET (SQFFIC "${src}/plugins/${plugin}/${plugin}.c") + ELSEIF (EXISTS "${src}/vm/intplugins/${plugin}/${plugin}.c") + SET (SQFFIC "${src}/vm/intplugins/${plugin}/${plugin}.c") + ELSE () + PLUGIN_DISABLE () + ENDIF () + PLUGIN_SOURCES ("${SQFFIC} ${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") ENDIF () CONFIG_DEFINE (HAVE_FFI_H) Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-08-28 05:25:58 UTC (rev 2113) +++ trunk/platforms/unix/vm/config.cmake 2009-08-30 23:46:00 UTC (rev 2114) @@ -168,6 +168,19 @@ CONFIG_DEFINE (VM_MODULE_PREFIX) +SET (CMAKE_SHARED_MODULE_PREFIX "so.") +SET (CMAKE_SHARED_MODULE_SUFFIX "") + +SET (MODULE_PREFIX \"${CMAKE_SHARED_MODULE_PREFIX}\") +SET (MODULE_SUFFIX \"${CMAKE_SHARED_MODULE_SUFFIX}\") +SET (LIBRARY_PREFIX \"${CMAKE_SHARED_LIBRARY_PREFIX}\") +SET (LIBRARY_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\") + +CONFIG_DEFINE (MODULE_PREFIX) +CONFIG_DEFINE (MODULE_SUFFIX) +CONFIG_DEFINE (LIBRARY_PREFIX) +CONFIG_DEFINE (LIBRARY_SUFFIX) + # sqUnixMain.c SET (VM_BUILD_STRING "\"Unix built on \"__DATE__ \" \"__TIME__\" Compiler: \"__VERSION__") Modified: trunk/platforms/unix/vm/sqUnixExternalPrims.c =================================================================== --- trunk/platforms/unix/vm/sqUnixExternalPrims.c 2009-08-28 05:25:58 UTC (rev 2113) +++ trunk/platforms/unix/vm/sqUnixExternalPrims.c 2009-08-30 23:46:00 UTC (rev 2114) @@ -1,7 +1,6 @@ /* sqUnixExternalPrims.c -- Unix named primitives and loadable modules * - * Copyright (C) 1996-2007 by Ian Piumarta and other authors/contributors - * listed elsewhere in this file. + * Copyright (C) 1996-2009 by Ian Piumarta * All rights reserved. * * This file is part of Unix Squeak. @@ -25,9 +24,7 @@ * SOFTWARE. */ -/* Author: Ian.Piumarta(a)INRIA.Fr - * - * Last edited: 2009-08-19 04:16:18 by piumarta on emilia-2.local +/* Last edited: 2009-08-30 16:40:06 by piumarta on ubuntu.piumarta.com */ #define DEBUG 0 @@ -114,7 +111,89 @@ /*** local functions ***/ +#if 1 /* simplified plugin logic */ + +static void *tryLoadModule(char *in, char *name) +{ + char path[PATH_MAX], *out= path; + void *handle= 0; + int c; + while ((c= *in++) && ':' != c) { /* copy next plugin path to path[] */ + switch (c) { + case '%': + if ('n' == *in || 'N' == *in) { /* replace %n with name of plugin */ + ++in; + strcpy(out, name); + out += strlen(name); + continue; + } + if ('%' == *in) { + ++in; + *out++= '%'; + continue; + } + /* fall through... */ + default: + *out++= c; + continue; + } + } + sprintf(out, "/" MODULE_PREFIX "%s" MODULE_SUFFIX, name); + handle= dlopen(path, RTLD_NOW | RTLD_GLOBAL); + fdebugf((stderr, "tryLoading(%s) = %p\n", path, handle)); + if (!handle) { + struct stat buf; + if ((0 == stat(path, &buf)) && ! S_ISDIR(buf.st_mode)) + fprintf(stderr, "%s\n", dlerror()); + } + return handle; +} + + +void *ioLoadModule(char *pluginName) +{ + char path[PATH_MAX]; + char *dir= squeakPlugins; + void *handle= 0; + + if ((0 == pluginName) || ('\0' == pluginName[0])) { /* find module in main program */ + handle= dlopen(0, RTLD_NOW | RTLD_GLOBAL); + if (handle == 0) { + fprintf(stderr, "ioLoadModule(<intrinsic>): %s\n", dlerror()); + } + else { + fdebugf((stderr, "loaded: <intrinsic>\n")); + } + return handle; + } + + /* try loading {pluginPaths}/MODULE_PREFIX<name>MODULE_SUFFIX */ + + while (*dir) { + if ((handle= tryLoadModule(dir, pluginName))) + return handle; + while (*dir && ':' != *dir++) + ; + } + + /* try dlopen()ing LIBRARY_PREFIX<name>LIBRARY_SUFFIX searching only the default locations modulo LD_LIBRARY_PATH et al */ + +# if defined(HAVE_SNPRINTF) + snprintf(path, sizeof(path), "%s%s%s", LIBRARY_PREFIX, pluginName, LIBRARY_SUFFIX); +# else + sprintf(path, "%s%s%s", LIBRARY_PREFIX, pluginName, LIBRARY_SUFFIX); +# endif + + handle= dlopen(path, RTLD_NOW | RTLD_GLOBAL); + fdebugf((stderr, "ioLoadModule(%s) = %p\n", path, handle)); + + return handle; +} + + +#else /* obsolete plugin logic */ + /* Attempt to load the shared library named by the concatenation of prefix, * moduleName and suffix. Answer the new module entry, or 0 if the shared * library could not be loaded. @@ -278,7 +357,7 @@ return handle; } } -#endif +#endif /* DARWIN */ /* finally (for VM hackers) try the pre-install build location */ { @@ -305,39 +384,26 @@ return 0; } +#endif /* obsolete plugin logic */ /* Find a function in a loaded module. Answer 0 if not found (do NOT * fail the primitive!). */ void *ioFindExternalFunctionIn(char *lookupName, void *moduleHandle) { - char buf[256]; - void *fn; + void *fn= dlsym(moduleHandle, lookupName); + fdebugf((stderr, "ioFindExternalFunctionIn(%s, %p) = %p\n", lookupName, moduleHandle, fn)); -#ifdef HAVE_SNPRINTF - snprintf(buf, sizeof(buf), "%s", lookupName); -#else - sprintf(buf, "%s", lookupName); -#endif - - fn= dlsym(moduleHandle, buf); - - fdebugf((stderr, "ioFindExternalFunctionIn(%s, %d)\n", - lookupName, moduleHandle)); - if ((fn == 0) && (!sqIgnorePluginErrors) && strcmp(lookupName, "initialiseModule") && strcmp(lookupName, "shutdownModule") && strcmp(lookupName, "setInterpreter") && strcmp(lookupName, "getModuleName")) - fprintf(stderr, "ioFindExternalFunctionIn(%s, %p):\n %s\n", - lookupName, moduleHandle, dlerror()); + fprintf(stderr, "ioFindExternalFunctionIn(%s, %p):\n %s\n", lookupName, moduleHandle, dlerror()); return fn; } - - /* Free the module with the associated handle. Answer 0 on error (do * NOT fail the primitive!). */ Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2009-08-28 05:25:58 UTC (rev 2113) +++ trunk/platforms/unix/vm/sqUnixMain.c 2009-08-30 23:46:00 UTC (rev 2114) @@ -27,7 +27,7 @@ /* Author: Ian Piumarta <ian.piumarta(a)squeakland.org> * - * Last edited: 2009-08-16 09:22:27 by piumarta on emilia-2.local + * Last edited: 2009-08-30 15:24:00 by piumarta on ubuntu.piumarta.com */ #include "sq.h" @@ -1148,13 +1148,15 @@ sprintf(info+strlen(info), " XShm"); #endif sprintf(info+strlen(info), " %s %s\n", vm_date, cc_version); +#if 0 if (verbose) sprintf(info+strlen(info), "Built from: "); sprintf(info+strlen(info), "%s\n", interpreterVersion); +#endif if (verbose) sprintf(info+strlen(info), "Build host: "); sprintf(info+strlen(info), "%s\n", ux_version); - sprintf(info+strlen(info), "default plugin location: %s/*.so\n", vmLibDir); + sprintf(info+strlen(info), "plugin path: %s [default: %s]\n", squeakPlugins, vmPath); return info; } @@ -1344,7 +1346,8 @@ tzset(); /* should _not_ be necessary! */ #endif - recordFullPathForVmName(argv[0]); /* full vm path */ + recordFullPathForVmName(argv[0]); /* full vm path */ + squeakPlugins= vmPath; /* default plugin location is VM directory */ sqIgnorePluginErrors= 1; if (!modules)

1 0

Unix default encoding UTF-8?
by Andreas Raab 29 Aug '09

29 Aug '09

Hi Ian - Is there any chance you might consider changing the default encoding of the Unix VM to be UTF-8? Both Mac and Windows come as UTF-8 nowadays and it would be terrific if we didn't have to tell people that they need to start their VM with -encoding: UTF-8 in order to deal with their local variants in file system, clipboard and input. Cheers, - Andreas

4 3

VMMaker, question.
by jean baptiste arnaud 28 Aug '09

28 Aug '09

Hi, Why VMMaker depending from *Speech* package? -- Arnaud Jean Baptiste PhD Student - Rmod Team - INRIA http://rmod.lille.inria.fr

2 3

[commit] r2113 - encoding and pathenc are UTF-8 unless overridden by command-line args
by commits＠squeakvm.org 28 Aug '09

28 Aug '09

Author: piumarta Date: 2009-08-27 22:25:58 -0700 (Thu, 27 Aug 2009) New Revision: 2113 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/squeak.in Log: encoding and pathenc are UTF-8 unless overridden by command-line args Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-28 03:01:54 UTC (rev 2112) +++ trunk/platforms/unix/ChangeLog 2009-08-28 05:25:58 UTC (rev 2113) @@ -1,5 +1,8 @@ 2009-08-27 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + * cmake/squeak.in: Path and text encodings are UTF-8 unless + overridden by command-line options. + * cmake/configure (VM_VERSION): Generate automatically from VMMaker version and SVN revision. Remove SQ_VERSION. Modified: trunk/platforms/unix/cmake/squeak.in =================================================================== --- trunk/platforms/unix/cmake/squeak.in 2009-08-28 03:01:54 UTC (rev 2112) +++ trunk/platforms/unix/cmake/squeak.in 2009-08-28 05:25:58 UTC (rev 2113) @@ -1,9 +1,9 @@ #!/bin/sh # # Launch squeakvm from the command line or a menu script, with a good -# plugin path and pulseaudio kludge +# plugin path, text encodings and pulseaudio kludge # -# Last edited: 2009-08-27 02:00:45 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-08-27 22:25:34 by piumarta on emilia-2.local PATH=/usr/bin:/bin @@ -17,6 +17,8 @@ vm="squeakvm" plugins="" sound="" +pathenc="-pathenc UTF-8" +encoding="-encoding UTF-8" # find the vm and set the plugin path @@ -43,11 +45,13 @@ fi fi -# we should not interfere with the user's -plugins or -vm-sound options +# we should not interfere with the user's command-line options for opt in $*; do case ${opt} in -plugins) plugins="";; + -pathenc) pathenc="";; + -encoding) encoding="";; -vm-sound*) sound=""; wrapper="";; -vm) case "$2" in sound*) sound=""; wrapper=""; esac;; esac @@ -59,10 +63,18 @@ plugins="" fi +if test -n "${SQUEAK_PATHENC}"; then + pathenc="" +fi + +if test -n "${SQUEAK_ENCODING}"; then + encoding="" +fi + if test -z "${plugins}"; then set -x - exec ${wrapper} "${vm}" ${sound} "$@" + exec ${wrapper} "${vm}" ${pathenc} ${encoding} ${sound} "$@" else set -x - exec ${wrapper} "${vm}" -plugins "${plugins}" ${sound} "$@" + exec ${wrapper} "${vm}" ${pathenc} ${encoding} -plugins "${plugins}" ${sound} "$@" fi

1 0

[commit] r2112 - generate VM_VERSION from VMM version and SVN revision; remove refs to SQ_VERSION
by commits＠squeakvm.org 28 Aug '09

28 Aug '09

Author: piumarta Date: 2009-08-27 20:01:54 -0700 (Thu, 27 Aug 2009) New Revision: 2112 Modified: trunk/platforms/unix/CMakeLists.txt trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/configure trunk/platforms/unix/vm/config.cmake Log: generate VM_VERSION from VMM version and SVN revision; remove refs to SQ_VERSION Modified: trunk/platforms/unix/CMakeLists.txt =================================================================== --- trunk/platforms/unix/CMakeLists.txt 2009-08-28 02:49:56 UTC (rev 2111) +++ trunk/platforms/unix/CMakeLists.txt 2009-08-28 03:01:54 UTC (rev 2112) @@ -1,17 +1,17 @@ # Yes, it's true: you can write makefiles in COBOL. # -# Last edited: 2009-08-26 22:47:15 by piumarta on emilia-2.local +# Last edited: 2009-08-27 19:30:47 by piumarta on emilia-2.local PROJECT (squeak) CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2) -IF (NOT DEFINED VM_HOST OR NOT DEFINED VM_VERSION OR NOT DEFINED SQ_VERSION) +IF (NOT DEFINED VM_HOST OR NOT DEFINED VM_VERSION) MESSAGE (FATAL_ERROR " You MUST NOT run CMake directly the first time you configure a build. Run 'platforms/unix/cmake/configure' from within your build directory." ) -ENDIF (NOT DEFINED VM_HOST OR NOT DEFINED VM_VERSION OR NOT DEFINED SQ_VERSION) +ENDIF (NOT DEFINED VM_HOST OR NOT DEFINED VM_VERSION) SET (prefix ${CMAKE_INSTALL_PREFIX}) Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-28 02:49:56 UTC (rev 2111) +++ trunk/platforms/unix/ChangeLog 2009-08-28 03:01:54 UTC (rev 2112) @@ -1,3 +1,13 @@ +2009-08-27 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * cmake/configure (VM_VERSION): Generate automatically from + VMMaker version and SVN revision. Remove SQ_VERSION. + + * vm/config.cmake: Extract major.minor.patch-release from + version. + + * CMakeLists.txt: Remove references to SQ_VERSION. + 2009-08-27 <piumarta(a)ubuntu.piumarta.com> * vm/build.cmake: Install squeak.sh. Modified: trunk/platforms/unix/cmake/configure =================================================================== --- trunk/platforms/unix/cmake/configure 2009-08-28 02:49:56 UTC (rev 2111) +++ trunk/platforms/unix/cmake/configure 2009-08-28 03:01:54 UTC (rev 2112) @@ -1,10 +1,7 @@ #!/bin/sh -# Last edited: 2009-08-17 03:28:34 by piumarta on emilia-2.local +# Last edited: 2009-08-27 19:57:45 by piumarta on emilia-2.local -VM_VERSION=3.10-7 -SQ_VERSION=3.10-7159 - help() { cat <<EOF Usage: $0 [options...] @@ -33,11 +30,16 @@ stop=true } -config=`dirname $0` -unix=`dirname ${config}` -guess=`${config}/config.guess` -host=`${config}/config.sub ${guess}` +config="`dirname \"$0\"`" +unix="`dirname \"${config}\"`" +guess=`"${config}"/config.guess` +host=`"${config}"/config.sub ${guess}` +vmmversion="`tr '\015 ' '\012\012' < \"${unix}/src/vm/interp.h\" | sed '1,/VMMaker/d;q'`" +svnversion=`svn info "${unix}/ChangeLog" | fgrep Revision: | awk '{print $2}'` + +VM_VERSION="${vmmversion}-${svnversion}"alpha + stop=false debug_configure=false @@ -47,7 +49,6 @@ dump () { echo "VM_VERSION = ${VM_VERSION}" - echo "SQ_VERSION = ${SQ_VERSION}" echo "unix = ${unix}" echo "config = ${config}" echo "host = ${host}" @@ -71,10 +72,9 @@ exit 1 fi -echo "-- Configuring squeak $VM_VERSION ($SQ_VERSION) for $host" +echo "-- Configuring squeak ${VM_VERSION} for ${host}" cmake ${unix} \ - -DVM_HOST="$host" \ + -DVM_HOST="${host}" \ -DVM_VERSION="${VM_VERSION}" \ - -DSQ_VERSION="${SQ_VERSION}" \ $args "$@" Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-08-28 02:49:56 UTC (rev 2111) +++ trunk/platforms/unix/vm/config.cmake 2009-08-28 03:01:54 UTC (rev 2112) @@ -2,9 +2,10 @@ CONFIG_DEFINE (OS_TYPE) -STRING (REGEX REPLACE "(.*)\\.(.*)-(.*)" "\\1" major ${version}) -STRING (REGEX REPLACE "(.*)\\.(.*)-(.*)" "\\2" minor ${version}) -STRING (REGEX REPLACE "(.*)\\.(.*)-(.*)" "\\3" patch ${version}) +STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\1" major ${version}) +STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\2" minor ${version}) +STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\3" patch ${version}) +STRING (REGEX REPLACE "(.*)\\.(.*)\\.(.*)-(.*)" "\\4" release ${version}) IF (APPLE) SET (DARWIN 1) @@ -188,7 +189,6 @@ CONFIG_DEFINE (VM_HOST_OS) SET (VM_VERSION \"${VM_VERSION}\") -SET (SQ_VERSION \"${SQ_VERSION}\") CONFIG_DEFINE (VM_VERSION) CONFIG_DEFINE (SQ_VERSION)

2 1

[commit] r2111 - repair broken plugin translation
by commits＠squeakvm.org 28 Aug '09

28 Aug '09

Author: piumarta Date: 2009-08-27 19:49:56 -0700 (Thu, 27 Aug 2009) New Revision: 2111 Modified: trunk/platforms/unix/src/vm/intplugins/DropPlugin/DropPlugin.c Log: repair broken plugin translation Modified: trunk/platforms/unix/src/vm/intplugins/DropPlugin/DropPlugin.c =================================================================== --- trunk/platforms/unix/src/vm/intplugins/DropPlugin/DropPlugin.c 2009-08-27 09:18:25 UTC (rev 2110) +++ trunk/platforms/unix/src/vm/intplugins/DropPlugin/DropPlugin.c 2009-08-28 02:49:56 UTC (rev 2111) @@ -45,8 +45,8 @@ #pragma export off static sqInt msg(char * s); static sqInt primitiveDndOutAcceptedType(void); -static sqInt primitiveDndOutSend(sqInt bytes); -static sqInt primitiveDndOutStart(sqInt types); +static sqInt primitiveDndOutSend(void); +static sqInt primitiveDndOutStart(void); #pragma export on EXPORT(sqInt) primitiveDropRequestFileHandle(void); EXPORT(sqInt) primitiveDropRequestFileName(void); @@ -98,28 +98,54 @@ fprintf(stderr, "\n%s: %s", moduleName, s); } -static sqInt primitiveDndOutAcceptedType(void) { - primitiveparameters("primitiveDndOutAcceptedType", "XXX UNTRANSLATABLE CONSTANT XXX"); - return sqDndOutAcceptedType(); +EXPORT(sqInt) primitiveDndOutAcceptedType(void) { + sqInt _return_value; + + _return_value = sqDndOutAcceptedType(); + if (interpreterProxy->failed()) { + return null; + } + interpreterProxy->popthenPush(1, _return_value); + return null; } -static sqInt primitiveDndOutSend(sqInt bytes) { - sqInt nbytes; +EXPORT(sqInt) primitiveDndOutSend(void) { + sqInt nbytes; + char *bytes; - primitiveparameters("primitiveDndOutSend", "XXX UNTRANSLATABLE CONSTANT XXX"); - nbytes = interpreterProxy->slotSizeOf(cPtrAsOop(bytes)); + interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(0))); + bytes = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0)))); + if (interpreterProxy->failed()) { + return null; + } + nbytes = interpreterProxy->slotSizeOf((oopForPointer( bytes ) - 4)); sqDndOutSend(bytes, nbytes); + if (interpreterProxy->failed()) { + return null; + } + interpreterProxy->pop(1); + return null; } /* Start drag out session. Formats are types for the data separated with NULL. */ -static sqInt primitiveDndOutStart(sqInt types) { - sqInt ntypes; +EXPORT(sqInt) primitiveDndOutStart(void) { + sqInt ntypes; + char *types; - primitiveparameters("primitiveDndOutStart", "XXX UNTRANSLATABLE CONSTANT XXX"); - ntypes = interpreterProxy->slotSizeOf(cPtrAsOop(types)); + interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(0))); + types = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0)))); + if (interpreterProxy->failed()) { + return null; + } + ntypes = interpreterProxy->slotSizeOf((oopForPointer( types ) - 4)); sqDndOutStart(types, ntypes); + if (interpreterProxy->failed()) { + return null; + } + interpreterProxy->pop(1); + return null; }

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