Vm-dev August 2009

vm-dev@lists.squeakfoundation.org

27 participants
87 discussions

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

26 Aug '09

Andreas wrote on Vm-dev list >Okay, 3.11.4 is in place now. Thanks for the new windows VM - will try it this evening. >Oh, and I finally remembered to add the version info to the VM. Cool! We should now also know the VM version from right clicking the EXE file (Properties -> Version). If one uses squeak to develop a windows based webserver app (Seaside or pier) this version information (vendor) should now also be displayed by personal firewalls when asking if you give permission to the executable. Before that it just displayed "squeak.exe" is requesting permission on port ... telling you that it comes from an anonymous vendor. So these few lines make life a little bit easier. Thanks! Bye Torsten -- Neu: GMX Doppel-FLAT mit Internet-Flatrate + Telefon-Flatrate für nur 19,99 Euro/mtl.!* http://portal.gmx.net/de/go/dsl02

1 0

[commit] r2091 - Update VM version to 3.11.4.
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: andreas Date: 2009-08-25 22:24:14 -0700 (Tue, 25 Aug 2009) New Revision: 2091 Modified: trunk/platforms/win32/vm/sqWin32.h Log: Update VM version to 3.11.4. Modified: trunk/platforms/win32/vm/sqWin32.h =================================================================== --- trunk/platforms/win32/vm/sqWin32.h 2009-08-26 05:23:21 UTC (rev 2090) +++ trunk/platforms/win32/vm/sqWin32.h 2009-08-26 05:24:14 UTC (rev 2091) @@ -241,7 +241,7 @@ #define VERSION "" #endif -#define VM_VERSION TEXT("Squeak 3.11.3 (beta) from ") TEXT(__DATE__) \ +#define VM_VERSION TEXT("Squeak 3.11.4 (beta) from ") TEXT(__DATE__) \ TEXT("\n") TEXT("Compiler: ") TEXT(COMPILER) TEXT(VERSION) /********************************************************/

1 0

[commit] r2090 - Fix sqWin32SerialPort.c to compile again.
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: andreas Date: 2009-08-25 22:23:21 -0700 (Tue, 25 Aug 2009) New Revision: 2090 Modified: trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c Log: Fix sqWin32SerialPort.c to compile again. Modified: trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c =================================================================== --- trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c 2009-08-26 05:00:02 UTC (rev 2089) +++ trunk/platforms/win32/plugins/SerialPlugin/sqWin32SerialPort.c 2009-08-26 05:23:21 UTC (rev 2090) @@ -41,7 +41,7 @@ } /* port number derived from "COMn" name */ -int portNumberForName(char *portName) +int portNumberForName(const char *portName) { if ((strlen(portName) < 4) || (strncmp(portName, "COM", 3) @@ -49,7 +49,7 @@ { return -1; } else { - char *p = portName + 3; + const char *p = portName + 3; return atoi(p); } } @@ -186,24 +186,24 @@ return 0; } -int serialPortOpenByName(char *portName, int dataRate, int stopBitsType, +int serialPortOpenByName(char *portName, int baudRate, int stopBitsType, int parityType, int dataBits, int inFlowCtrl, int outFlowCtrl, int xOnChar, int xOffChar) { int portNum = portNumberForName(portName); - if (portNum < 0) - { success(false); + if (portNum < 0) { + success(false); return 0; } return serialPortOpen(portNum, baudRate, stopBitsType, parityType, - dataBits, inFlowCtrl, outFlowCtrl, xOnChar, xOffChar) + dataBits, inFlowCtrl, outFlowCtrl, xOnChar, xOffChar); } /* Read up to count bytes from the given serial port into the given byte array. Read only up to the number of bytes in the port's input buffer; if fewer bytes than count have been received, do not wait for additional data to arrive. Return zero if no data is available. */ -int serialPortReadInto(int portNum, int count, void *startPtr); +int serialPortReadInto(int portNum, int count, void *startPtr) { DWORD cbReallyRead; if(!isValidComm(portNum)) return 0; @@ -257,7 +257,7 @@ { success(false); return 0; } - return serialPortWriteFrom(portNum, count, startPtr) + return serialPortWriteFrom(portNum, count, startPtr); } int serialPortInit(void)

1 0

[commit] r2089 - Changes sqWin32Security.c to use the image directory as the default resource directory.
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: andreas Date: 2009-08-25 22:00:02 -0700 (Tue, 25 Aug 2009) New Revision: 2089 Modified: trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c Log: Changes sqWin32Security.c to use the image directory as the default resource directory. Modified: trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c =================================================================== --- trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c 2009-08-26 04:12:59 UTC (rev 2088) +++ trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c 2009-08-26 05:00:02 UTC (rev 2089) @@ -246,7 +246,10 @@ lstrcpy(untrustedUserDirectory, TEXT("C:\\My Squeak\\%USERNAME%")); /* establish untrusted user directory */ - lstrcpy(resourceDirectory, TEXT("C:\\My Squeak")); + lstrcpy(resourceDirectory, imagePath); + if (resourceDirectory[lstrlen(resourceDirectory)-1] == '\\') { + resourceDirectory[lstrlen(resourceDirectory)-1] = 0; + } /* Look up shGetFolderPathW */ shGetFolderPath = (void*)GetProcAddress(LoadLibrary("SHFolder.dll"),

1 0

[commit] r2088 - Updated sqWin32Security.c version from Yoshiki/Bert.
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: andreas Date: 2009-08-25 21:12:59 -0700 (Tue, 25 Aug 2009) New Revision: 2088 Modified: trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c Log: Updated sqWin32Security.c version from Yoshiki/Bert. Modified: trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c =================================================================== --- trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c 2009-08-26 02:51:28 UTC (rev 2087) +++ trunk/platforms/win32/plugins/SecurityPlugin/sqWin32Security.c 2009-08-26 04:12:59 UTC (rev 2088) @@ -17,7 +17,11 @@ static HRESULT __stdcall (*shGetFolderPath)(HWND, int, HANDLE, DWORD, WCHAR*); static TCHAR untrustedUserDirectory[MAX_PATH]; +static int untrustedUserDirectoryLen; static TCHAR secureUserDirectory[MAX_PATH]; +static int secureUserDirectoryLen; +static TCHAR resourceDirectory[MAX_PATH]; +static int resourceDirectoryLen; /* imported from sqWin32Prefs.c */ extern TCHAR squeakIniName[MAX_PATH]; @@ -33,65 +37,83 @@ /* file security */ static int allowFileAccess = 1; /* full access to files */ static const TCHAR U_DOT[] = TEXT("."); +static const TCHAR U_BACKSLASH[] = TEXT("\\"); -static int isAccessiblePathName(TCHAR *pathName) { - int i; - /* Check if the path/file name is subdirectory of the image path */ - for(i=0; i<lstrlen(untrustedUserDirectory)-1; i++) - if(untrustedUserDirectory[i] != pathName[i]) return 0; - /* special check for the trusted directory */ - if(pathName[i] == 0) return 1; /* allow access to trusted directory */ - /* check last character in image path (e.g., backslash) */ - if(untrustedUserDirectory[i] != pathName[i]) return 0; - /* check if somebody wants to trick us into using relative - paths ala c:\My Squeak\allowed\..\..\" */ - while(pathName[i]) { - if(pathName[i] == U_DOT[0]) { - if(pathName[i+1] == U_DOT[0]) - return 0; /* Gotcha! */ +static int testDotDot(TCHAR *pathName, int index) { + while(pathName[index]) { + if(pathName[index] == U_DOT[0]) { + if(pathName[index-1] == U_DOT[0]) { + if (pathName[index-2] == U_BACKSLASH[0]) { + return 0; /* Gotcha! */ + } + } } - i++; + index++; } return 1; } -static int isAccessibleFileName(TCHAR *fileName) { +static int lstrncmp(TCHAR *s1, TCHAR *s2, int len) { + int s1Len = lstrlen(s1); + int s2Len = lstrlen(s2); + int max = min(s1Len, (s2Len, len)); int i; - /* Check if the path/file name is subdirectory of the image path */ - for(i=0; i<lstrlen(untrustedUserDirectory); i++) - if(untrustedUserDirectory[i] != fileName[i]) return 0; - /* check if somebody wants to trick us into using relative - paths ala c:\My Squeak\allowed\..\..\" */ - while(fileName[i]) { - if(fileName[i] == U_DOT[0]) { - if(fileName[i+1] == U_DOT[0]) - return 0; /* Gotcha! */ + for (i = 0; i < max; i++) { + if (s1[i] > s2[i]) { + return 1; + } else if (s1[i] < s2[i]) { + return -1; } - i++; } - return 1; + return 0; } +static int isAccessiblePathName(TCHAR *pathName, int writeFlag) { + int pathLen = lstrlen(pathName); + if (pathLen > (MAX_PATH - 1)) return 0; + + if (pathLen >= untrustedUserDirectoryLen + && 0 == lstrncmp(pathName, untrustedUserDirectory, untrustedUserDirectoryLen)) { + if (pathLen > untrustedUserDirectoryLen + 2) + return testDotDot(pathName, untrustedUserDirectoryLen+2); + return 1; + } + if (writeFlag) + return 0; + + if (pathLen >= resourceDirectoryLen + && 0 == lstrncmp(pathName, resourceDirectory, resourceDirectoryLen)) { + if (pathLen > resourceDirectoryLen + 2) + return testDotDot(pathName, resourceDirectoryLen+2); + return 1; + } + return 0; +} + +static int isAccessibleFileName(TCHAR *fileName, int writeFlag) { + return isAccessiblePathName(fileName, writeFlag); +} + /* directory access */ int ioCanCreatePathOfSize(char* pathString, int pathStringLength) { if(allowFileAccess) return 1; - return isAccessiblePathName(fromSqueak(pathString, pathStringLength)); + return isAccessiblePathName(fromSqueak(pathString, pathStringLength), 1); } int ioCanListPathOfSize(char* pathString, int pathStringLength) { if(allowFileAccess) return 1; - return isAccessiblePathName(fromSqueak(pathString, pathStringLength)); + return isAccessiblePathName(fromSqueak(pathString, pathStringLength), 0); } int ioCanDeletePathOfSize(char* pathString, int pathStringLength) { if(allowFileAccess) return 1; - return isAccessiblePathName(fromSqueak(pathString, pathStringLength)); + return isAccessiblePathName(fromSqueak(pathString, pathStringLength), 1); } /* file access */ int ioCanOpenFileOfSizeWritable(char* pathString, int pathStringLength, int writeFlag) { if(allowFileAccess) return 1; - return isAccessibleFileName(fromSqueak(pathString, pathStringLength)); + return isAccessibleFileName(fromSqueak(pathString, pathStringLength), writeFlag); } int ioCanOpenAsyncFileOfSizeWritable(char* pathString, int pathStringLength, int writeFlag) { @@ -99,12 +121,12 @@ } int ioCanDeleteFileOfSize(char* pathString, int pathStringLength) { if(allowFileAccess) return 1; - return isAccessibleFileName(fromSqueak(pathString, pathStringLength)); + return isAccessibleFileName(fromSqueak(pathString, pathStringLength), 1); } int ioCanRenameFileOfSize(char* pathString, int pathStringLength) { if(allowFileAccess) return 1; - return isAccessibleFileName(fromSqueak(pathString, pathStringLength)); + return isAccessibleFileName(fromSqueak(pathString, pathStringLength), 1); } @@ -186,7 +208,7 @@ /* helper function to expand %MYDOCUMENTSFOLDER% */ -char *expandMyDocuments(char *pathname, char *replacement, char *result) +int expandMyDocuments(char *pathname, char *replacement, char *result) { TCHAR search4[MAX_PATH+1]; TCHAR *start; @@ -199,8 +221,6 @@ result[start-pathname] = '\0'; sprintf(result+(start-pathname),"%s%s", replacement, start+strlen(search4)); - - return strlen(result); } @@ -224,8 +244,10 @@ /* establish untrusted user directory */ lstrcpy(untrustedUserDirectory, TEXT("C:\\My Squeak\\%USERNAME%")); - dirLen = lstrlen(untrustedUserDirectory); + /* establish untrusted user directory */ + lstrcpy(resourceDirectory, TEXT("C:\\My Squeak")); + /* Look up shGetFolderPathW */ shGetFolderPath = (void*)GetProcAddress(LoadLibrary("SHFolder.dll"), "SHGetFolderPathW"); @@ -261,6 +283,10 @@ MAX_PATH, squeakIniName); } + GetPrivateProfileString(TEXT("Security"), TEXT("ResourceDirectory"), + resourceDirectory, resourceDirectory, + MAX_PATH, squeakIniName); + /* Attempt to read local user settings from registry */ ok = RegOpenKey(HKEY_CURRENT_USER, HKEY_SQUEAK_ROOT, &hk); @@ -287,9 +313,21 @@ } strcpy(untrustedUserDirectory, tmp); } + + /* Read the resource directory from the subkey. */ + dwSize = MAX_PATH; + ok = RegQueryValueEx(hk,"ResourceDirectory",NULL, &dwType, + (LPBYTE) tmp, &dwSize); + if(ok == ERROR_SUCCESS) { + if(tmp[dwSize-2] != '\\') { + tmp[dwSize-1] = '\\'; + tmp[dwSize] = 0; + } + strcpy(resourceDirectory, tmp); + } + RegCloseKey(hk); - if(shGetFolderPath) { dwSize = expandMyDocuments(untrustedUserDirectory, myDocumentsFolder, tmp); if(dwSize > 0 && dwSize < MAX_PATH) @@ -298,6 +336,10 @@ dwSize = expandMyDocuments(secureUserDirectory, myDocumentsFolder, tmp); if(dwSize > 0 && dwSize < MAX_PATH) strcpy(secureUserDirectory, tmp); + + dwSize = expandMyDocuments(resourceDirectory, myDocumentsFolder, tmp); + if(dwSize > 0 && dwSize < MAX_PATH) + strcpy(resourceDirectory, tmp); } /* Expand any environment variables in user directory. */ @@ -313,6 +355,18 @@ /* Expand relative paths to absolute paths */ GetFullPathNameW(wTmp, MAX_PATH, wDir, NULL); WideCharToMultiByte(CP_UTF8,0,wDir,-1,secureUserDirectory,MAX_PATH,NULL,NULL); + + /* and for the resource directory*/ + MultiByteToWideChar(CP_ACP, 0, resourceDirectory, -1, wDir, MAX_PATH); + ExpandEnvironmentStringsW(wDir, wTmp, MAX_PATH-1); + /* Expand relative paths to absolute paths */ + GetFullPathNameW(wTmp, MAX_PATH, wDir, NULL); + WideCharToMultiByte(CP_UTF8,0,wDir,-1,resourceDirectory,MAX_PATH,NULL,NULL); + + secureUserDirectoryLen = lstrlen(secureUserDirectory); + untrustedUserDirectoryLen = lstrlen(untrustedUserDirectory); + resourceDirectoryLen = lstrlen(resourceDirectory); + return 1; }

1 0

[commit] r2087 - check for libffi via pkg-config before explicit search
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-25 19:51:28 -0700 (Tue, 25 Aug 2009) New Revision: 2087 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake Log: check for libffi via pkg-config before explicit search Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 02:49:49 UTC (rev 2086) +++ trunk/platforms/unix/ChangeLog 2009-08-26 02:51:28 UTC (rev 2087) @@ -1,5 +1,8 @@ 2009-08-25 <piumarta(a)netbsd.piumarta.com> + * plugins/SqueakFFIPrims/config.cmake: Check for libffi via + pkf-config before eplicit search. + * vm/config.cmake: Add includes and libraries from /usr/pkg if present. * cmake/PluginInternal.cmake, cmake/PluginExternal.cmake: Add Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-26 02:49:49 UTC (rev 2086) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-26 02:51:28 UTC (rev 2087) @@ -25,15 +25,25 @@ SET (cpu any) SET (abi libffi) PLUGIN_MESSAGE ("${cpu}-${abi}") - 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) + 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) + 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 () + ELSE () PLUGIN_LINK_LIBRARIES (ffi) + ENDIF () ENDIF () ENDIF () - PLUGIN_SOURCES ("${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") ENDIF ()

1 0

[commit] r2086 - add includes and libraries from /usr/pkg if present
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-25 19:49:49 -0700 (Tue, 25 Aug 2009) New Revision: 2086 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/vm/config.cmake Log: add includes and libraries from /usr/pkg if present Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-26 02:47:42 UTC (rev 2085) +++ trunk/platforms/unix/ChangeLog 2009-08-26 02:49:49 UTC (rev 2086) @@ -1,5 +1,7 @@ 2009-08-25 <piumarta(a)netbsd.piumarta.com> + * vm/config.cmake: Add includes and libraries from /usr/pkg if present. + * cmake/PluginInternal.cmake, cmake/PluginExternal.cmake: Add CMAKE_REQUIRED_INCLUDES to plugin INCLUDE_DIRECTORIES. Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-08-26 02:47:42 UTC (rev 2085) +++ trunk/platforms/unix/vm/config.cmake 2009-08-26 02:49:49 UTC (rev 2086) @@ -15,6 +15,14 @@ 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] r2085 - add required includes to plugin include dirs
by commits＠squeakvm.org 26 Aug '09

26 Aug '09

Author: piumarta Date: 2009-08-25 19:47:42 -0700 (Tue, 25 Aug 2009) New Revision: 2085 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/PluginExternal.cmake trunk/platforms/unix/cmake/PluginInternal.cmake Log: add required includes to plugin include dirs Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-25 20:54:12 UTC (rev 2084) +++ trunk/platforms/unix/ChangeLog 2009-08-26 02:47:42 UTC (rev 2085) @@ -1,5 +1,8 @@ -2009-08-25 <piumarta(a)ubuntu.piumarta.com> +2009-08-25 <piumarta(a)netbsd.piumarta.com> + * cmake/PluginInternal.cmake, cmake/PluginExternal.cmake: Add + CMAKE_REQUIRED_INCLUDES to plugin INCLUDE_DIRECTORIES. + * cmake/Plugins.cmake: Add macros PLUGIN_DISABLE, PLUGIN_SOURCES, PLUGIN_DEFINITIONS, PLUGIN_INCLUDE_DIRECTORIES, PLUGIN_LINK_DIRECTORIES, PLUGIN_LINK_LIBRARIES. Modified: trunk/platforms/unix/cmake/PluginExternal.cmake =================================================================== --- trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-25 20:54:12 UTC (rev 2084) +++ trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-26 02:47:42 UTC (rev 2085) @@ -10,6 +10,7 @@ ${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-25 20:54:12 UTC (rev 2084) +++ trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-26 02:47:42 UTC (rev 2085) @@ -10,6 +10,7 @@ ${unix}/plugins/@plugin@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ + ${CMAKE_REQUIRED_INCLUDES} ) ADD_LIBRARY (@plugin@ STATIC @plugin_sources@)

1 0

[commit] r2084 - configure build variables via macros in config scripts
by commits＠squeakvm.org 25 Aug '09

25 Aug '09

Author: piumarta Date: 2009-08-25 13:54:12 -0700 (Tue, 25 Aug 2009) New Revision: 2084 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/PluginExternal.cmake trunk/platforms/unix/cmake/PluginInternal.cmake trunk/platforms/unix/cmake/Plugins.cmake trunk/platforms/unix/plugins/AioPlugin/build.cmake trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake trunk/platforms/unix/plugins/DBusPlugin/config.cmake trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake trunk/platforms/unix/plugins/OggPlugin/config.cmake trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake trunk/platforms/unix/plugins/RomePlugin/config.cmake trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake trunk/platforms/unix/plugins/UUIDPlugin/config.cmake trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake trunk/platforms/unix/vm-display-Quartz/build.cmake trunk/platforms/unix/vm-display-Quartz/config.cmake trunk/platforms/unix/vm-display-X11/build.cmake trunk/platforms/unix/vm-display-X11/config.cmake trunk/platforms/unix/vm-display-fbdev/config.cmake trunk/platforms/unix/vm-sound-ALSA/config.cmake trunk/platforms/unix/vm-sound-MacOSX/config.cmake trunk/platforms/unix/vm-sound-NAS/config.cmake trunk/platforms/unix/vm-sound-OSS/config.cmake trunk/platforms/unix/vm-sound-Sun/config.cmake Log: configure build variables via macros in config scripts Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/ChangeLog 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1,45 @@ +2009-08-25 <piumarta(a)ubuntu.piumarta.com> + + * cmake/Plugins.cmake: Add macros PLUGIN_DISABLE, PLUGIN_SOURCES, + PLUGIN_DEFINITIONS, PLUGIN_INCLUDE_DIRECTORIES, + PLUGIN_LINK_DIRECTORIES, PLUGIN_LINK_LIBRARIES. + + * cmake/PluginExternal.cmake, cmake/PluginInternal.cmake: Set + definitions, include dirs and link dirs from configured values. + Add link directories before defining target. + + * cmake/PluginExternal.cmake, cmake/Plugins.cmake, + cmake/PluginInternal.cmake, plugins/PseudoTTYPlugin/config.cmake, + plugins/PseudoTTYPlugin/build.cmake, + plugins/RomePlugin/config.cmake, + plugins/HostWindowPlugin/config.cmake, + plugins/UUIDPlugin/config.cmake, plugins/AioPlugin/build.cmake, + plugins/SqueakFFIPrims/config.cmake, + plugins/SqueakFFIPrims/build.cmake, + plugins/ImmX11Plugin/config.cmake, plugins/OggPlugin/config.cmake, + plugins/B3DAcceleratorPlugin/config.cmake, + plugins/B3DAcceleratorPlugin/build.cmake, + plugins/UnixOSProcessPlugin/config.cmake, + plugins/UnixOSProcessPlugin/build.cmake, + plugins/GStreamerPlugin/config.cmake, + plugins/DBusPlugin/config.cmake, + plugins/XDisplayControlPlugin/config.cmake, + plugins/XDisplayControlPlugin/build.cmake, + vm-sound-ALSA/config.cmake, vm-sound-NAS/config.cmake, + vm-display-X11/config.cmake, vm-display-X11/build.cmake, + vm-sound-MacOSX/config.cmake, vm-display-fbdev/config.cmake, + vm-display-Quartz/config.cmake, vm-display-Quartz/build.cmake, + vm-sound-OSS/config.cmake, vm-sound-Sun/config.cmake: Configure + build variables using new macros. + + * plugins/DropPlugin/config.cmake, plugins/AioPlugin/config.cmake, + plugins/FloatMathPlugin/config.cmake: Configure build variables. + + * plugins/RomePlugin/build.cmake, plugins/DropPlugin/build.cmake, + plugins/UUIDPlugin/build.cmake, + plugins/FloatMathPlugin/build.cmake, vm-display-fbdev/build.cmake: + Remove redundant build scripts. + 2009-08-24 <piumarta(a)netbsd.piumarta.com> * CMakeLists.txt: Set RPATH options appropriately for build and install. Modified: trunk/platforms/unix/cmake/PluginExternal.cmake =================================================================== --- trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/cmake/PluginExternal.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,5 +1,6 @@ -ADD_LIBRARY (@plugin@ MODULE @plugin_sources@) -INCLUDE_DIRECTORIES ( +ADD_DEFINITIONS (${@plugin@_definitions}) +LINK_DIRECTORIES (${@plugin@_link_directories}) +INCLUDE_DIRECTORIES (${@plugin@_include_directories} ${bld} ${src}/vm ${cross}/vm @@ -10,4 +11,9 @@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ ) + +ADD_LIBRARY (@plugin@ MODULE @plugin_sources@) + +TARGET_LINK_LIBRARIES (@plugin@ ${@plugin@_link_libraries}) + INSTALL (TARGETS @plugin@ LIBRARY DESTINATION @plgdir@) Modified: trunk/platforms/unix/cmake/PluginInternal.cmake =================================================================== --- trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/cmake/PluginInternal.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,6 +1,6 @@ -ADD_LIBRARY (@plugin@ STATIC @plugin_sources@) -ADD_DEFINITIONS (-DSQUEAK_BUILTIN_PLUGIN=1) -INCLUDE_DIRECTORIES ( +ADD_DEFINITIONS (-DSQUEAK_BUILTIN_PLUGIN=1 ${@plugin@_definitions}) +LINK_DIRECTORIES (${@plugin@_link_directories}) +INCLUDE_DIRECTORIES (${@plugin@_include_directories} ${bld} ${src}/vm ${cross}/vm @@ -11,3 +11,5 @@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ ) + +ADD_LIBRARY (@plugin@ STATIC @plugin_sources@) Modified: trunk/platforms/unix/cmake/Plugins.cmake =================================================================== --- trunk/platforms/unix/cmake/Plugins.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/cmake/Plugins.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,6 +1,6 @@ # Figure out which plugins to build and create a configuration for each. # -# Last edited: 2009-08-21 10:35:56 by piumarta on ubuntu.piumarta.com +# Last edited: 2009-08-25 13:46:02 by piumarta on ubuntu.piumarta.com FILE (STRINGS ${src}/plugins.int plugins_int) STRING (REGEX REPLACE ".*= (.*)" "\\1" plugins_int ${plugins_int}) @@ -29,10 +29,11 @@ STRING_APPEND (plugin_sources "${tmp}") ENDFOREACH (dir) ENDIF (DEFINED ${plugin}_sources) - FILE_COPY (${bld}/${plugin}/CMakeLists.in ${config}/PluginInternal.cmake) + FILE (WRITE ${bld}/${plugin}/CMakeLists.in "") FOREACH (dir ${unix}/plugins ${unix}) FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${dir}/${plugin}/build.cmake) ENDFOREACH (dir) + FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${config}/PluginInternal.cmake) CONFIGURE_FILE (${bld}/${plugin}/CMakeLists.in ${bld}/${plugin}/CMakeLists.txt @ONLY) ADD_SUBDIRECTORY (${bld}/${plugin} ${bld}/${plugin}) ENDMACRO (INTERNAL_PLUGIN) @@ -48,18 +49,39 @@ STRING_APPEND (plugin_sources "${tmp}") ENDFOREACH (dir) ENDIF (DEFINED ${plugin}_sources) - FILE_COPY (${bld}/${plugin}/CMakeLists.in ${config}/PluginExternal.cmake) + FILE (WRITE ${bld}/${plugin}/CMakeLists.in "") FOREACH (dir ${unix}/plugins ${unix}) FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${dir}/${plugin}/build.cmake) ENDFOREACH (dir) + FILE_APPEND (${bld}/${plugin}/CMakeLists.in ${config}/PluginExternal.cmake) CONFIGURE_FILE (${bld}/${plugin}/CMakeLists.in ${bld}/${plugin}/CMakeLists.txt @ONLY) ADD_SUBDIRECTORY (${bld}/${plugin} ${bld}/${plugin}) ENDMACRO (EXTERNAL_PLUGIN) -MACRO (DISABLE_PLUGIN) +MACRO (PLUGIN_DISABLE) SET (plugin_disabled 1) -ENDMACRO (DISABLE_PLUGIN) +ENDMACRO (PLUGIN_DISABLE) +MACRO (PLUGIN_SOURCES) + SET (${plugin}_sources ${ARGV}) +ENDMACRO (PLUGIN_SOURCES) + +MACRO (PLUGIN_DEFINITIONS) + SET (${plugin}_definitions ${${plugin}_definitions} ${ARGV}) +ENDMACRO (PLUGIN_DEFINITIONS) + +MACRO (PLUGIN_INCLUDE_DIRECTORIES) + SET (${plugin}_include_directories ${${plugin}_include_directories} ${ARGV}) +ENDMACRO (PLUGIN_INCLUDE_DIRECTORIES) + +MACRO (PLUGIN_LINK_DIRECTORIES) + SET (${plugin}_link_directories ${${plugin}_link_directories} ${ARGV}) +ENDMACRO (PLUGIN_LINK_DIRECTORIES) + +MACRO (PLUGIN_LINK_LIBRARIES) + SET (${plugin}_link_libraries ${${plugin}_link_libraries} ${ARGV}) +ENDMACRO (PLUGIN_LINK_LIBRARIES) + MACRO (CONFIGURE_PLUGIN_LIST plugins_list) SET (plugins ${${plugins_list}}) FOREACH (plugin ${plugins}) Modified: trunk/platforms/unix/plugins/AioPlugin/build.cmake =================================================================== --- trunk/platforms/unix/plugins/AioPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/AioPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1 @@ -INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) -ADD_DEFINITIONS (-DSQAIO_H=\"sqaio.h\") EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake =================================================================== --- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -2,5 +2,4 @@ # (vm-display-Quartz) as a dependency. This lets 3D work in both X11 and Quartz # on MacOS. -INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR}) EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/B3DAcceleratorPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,5 +1,6 @@ IF (OPENGL_FOUND OR AGL_FOUND) SET (USE_OPENGL 1) + PLUGIN_INCLUDE_DIRECTORIES (${OPENGL_INCLUDE_DIR}) ENDIF () IF (OPENGL_FOUND) Modified: trunk/platforms/unix/plugins/DBusPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/DBusPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/DBusPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,5 +1,5 @@ CHECK_INCLUDE_FILE (dbus/dbus.h HAVE_DBUS_DBUS_H) IF (NOT HAVE_DBUS_DBUS_H) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF (NOT HAVE_DBUS_DBUS_H) Modified: trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/GStreamerPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,5 +1,5 @@ CHECK_INCLUDE_FILE (gst/gst.h HAVE_GST_GST_H) IF (NOT HAVE_GST_GST_H) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF (NOT HAVE_GST_GST_H) Modified: trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/HostWindowPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1,3 @@ IF (NOT X11_FOUND) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF (NOT X11_FOUND) Modified: trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/ImmX11Plugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,5 +1,5 @@ IF (NOT X11_FOUND) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF (NOT X11_FOUND) CONFIG_DEFINE(USE_XICFONT_OPTION) Modified: trunk/platforms/unix/plugins/OggPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/OggPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/OggPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -7,5 +7,5 @@ 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) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF () Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake =================================================================== --- trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/PseudoTTYPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1 @@ -INCLUDE_DIRECTORIES (${unix}/plugins/AsynchFilePlugin) -TARGET_LINK_LIBRARIES(@plugin@ ${@plugin@_libs}) EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/PseudoTTYPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -12,17 +12,19 @@ IF (NOT HAVE_OPENPTY) CHECK_LIBRARY_EXISTS (util openpty "" HAVE_OPENPTY) IF (HAVE_OPENPTY) - SET (${plugin}_libs util) + PLUGIN_LINK_LIBRARIES (util) ELSE () IF (EXISTS /dev/ptmx) CHECK_FUNCTION_EXISTS (grantpt HAVE_UNIX98_PTYS) IF (NOT HAVE_UNIX98_PTYS) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF (NOT HAVE_UNIX98_PTYS) ENDIF (EXISTS /dev/ptmx) ENDIF (HAVE_OPENPTY) ENDIF (NOT HAVE_OPENPTY) +PLUGIN_INCLUDE_DIRECTORIES (${unix}/plugins/AsynchFilePlugin) + CONFIG_DEFINE (HAVE_UTIL_H) CONFIG_DEFINE (HAVE_LIBUTIL_H) CONFIG_DEFINE (HAVE_PTY_H) Modified: trunk/platforms/unix/plugins/RomePlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/RomePlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/RomePlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -8,9 +8,9 @@ ENDIF () IF (HAVE_CAIRO_FT_H) - SET (${plugin}_include_dirs ${PANGOCAIRO_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}) - SET (${plugin}_library_dirs ${PANGOCAIRO_LIBRARY_DIRS} ${FREETYPE_LIBRARY_DIRS}) - SET (${plugin}_libraries ${PANGOCAIRO_LIBRARIES} ${FREETYPE_LIBRARIES}) + 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 () - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF () Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,2 +1 @@ -TARGET_LINK_LIBRARIES (@plugin@ ${@plugin@_libs}) EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,7 +1,7 @@ SET (USE_LIBFFI) IF (OPT_without-ffi) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ELSE () IF (${VM_HOST_CPU} STREQUAL "powerpc" OR ${VM_HOST_CPU} STREQUAL "ppc") SET (cpu ppc) @@ -28,13 +28,13 @@ 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) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ELSE () - SET (${plugin}_libs "ffi") + PLUGIN_LINK_LIBRARIES (ffi) ENDIF () ENDIF () - SET (${plugin}_sources "${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") + PLUGIN_SOURCES ("${unix}/plugins/${plugin}/${cpu}-${abi}.c ${unix}/plugins/${plugin}/${cpu}-${abi}-asm.S") ENDIF () CONFIG_DEFINE (HAVE_FFI_H) Modified: trunk/platforms/unix/plugins/UUIDPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/UUIDPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -2,11 +2,11 @@ CHECK_INCLUDE_FILE (uuid/uuid.h HAVE_UUID_UUID_H) IF (NOT HAVE_UUID_H AND NOT HAVE_UUID_UUID_H) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ELSE () CHECK_LIBRARY_EXISTS (uuid uuid_generate "" HAVE_LIBUUID) IF (HAVE_LIBUUID) - SET (${plugin}_libs uuid) + PLUGIN_LINK_LIBRARIES (uuid) ENDIF () ENDIF () Modified: trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake =================================================================== --- trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/UnixOSProcessPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1 @@ -INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) -ADD_DEFINITIONS (-DSQAIO_H=\"sqaio.h\") EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/UnixOSProcessPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -2,7 +2,10 @@ CHECK_LIBRARY_EXISTS (pthread pthread_kill "" HAVE_LIB_PTHREAD) IF (NOT HAVE_LIB_PTHREAD) - DISABLE_PLUGIN () + 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/plugins/XDisplayControlPlugin/build.cmake =================================================================== --- trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/XDisplayControlPlugin/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,2 +1 @@ -INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/plugins/XDisplayControlPlugin/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1,5 @@ IF (NOT X11_FOUND) - DISABLE_PLUGIN () + PLUGIN_DISABLE () +ELSE () + PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) ENDIF () Modified: trunk/platforms/unix/vm-display-Quartz/build.cmake =================================================================== --- trunk/platforms/unix/vm-display-Quartz/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-display-Quartz/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1 @@ -INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${AGL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES (@plugin@ ${AGL_LIBRARIES} "-framework Cocoa") EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/vm-display-Quartz/config.cmake =================================================================== --- trunk/platforms/unix/vm-display-Quartz/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-display-Quartz/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1,6 @@ IF (NOT APPLE) - DISABLE_PLUGIN () + PLUGIN_DISABLE () +ELSE () + PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${AGL_INCLUDE_DIR}) + PLUGIN_LINK_LIBRARIES (${AGL_LIBRARIES} "-framework Cocoa") ENDIF (NOT APPLE) Modified: trunk/platforms/unix/vm-display-X11/build.cmake =================================================================== --- trunk/platforms/unix/vm-display-X11/build.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-display-X11/build.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1 @@ -INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${cross}/plugins/FilePlugin ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES (@plugin@ ${X11_LIBRARIES} ${OPENGL_LIBRARIES}) EXPECT_UNDEFINED_SYMBOLS () Modified: trunk/platforms/unix/vm-display-X11/config.cmake =================================================================== --- trunk/platforms/unix/vm-display-X11/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-display-X11/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,7 +1,7 @@ SET (${plugin}_sources ${unix}/${plugin}/sqUnixX11.c ${unix}/${plugin}/sqUnixMozilla.c) IF (NOT X11_FOUND) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ELSE () SET (USE_X11 1) IF (X11_Xext_FOUND) @@ -19,6 +19,9 @@ SET (USE_X11_GLX 1) ENDIF (HAVE_GL_GL_H AND HAVE_GL_GLX_H) ENDIF (OPENGL_FOUND) + PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/B3DAcceleratorPlugin ${cross}/plugins/FilePlugin) + PLUGIN_INCLUDE_DIRECTORIES (${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) + PLUGIN_LINK_LIBRARIES (${X11_LIBRARIES} ${OPENGL_LIBRARIES}) ENDIF () CONFIG_DEFINE (USE_X11) Modified: trunk/platforms/unix/vm-display-fbdev/config.cmake =================================================================== --- trunk/platforms/unix/vm-display-fbdev/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-display-fbdev/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,7 +1,7 @@ CHECK_INCLUDE_FILE (linux/fb.h HAVE_LINUX_FB_H) IF (NOT HAVE_LINUX_FB_H) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ELSE () - SET (${plugin}_sources ${unix}/${plugin}/sqUnixFBDev.c) + PLUGIN_SOURCES (${unix}/${plugin}/sqUnixFBDev.c) ENDIF () Modified: trunk/platforms/unix/vm-sound-ALSA/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-ALSA/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-sound-ALSA/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,4 +1,4 @@ CHECK_INCLUDE_FILE (alsa/asoundlib.h HAVE_ALSA_ASOUNDLIB_H) IF (NOT HAVE_ALSA_ASOUNDLIB_H) - DISABLE_PLUGIN() + PLUGIN_DISABLE() ENDIF () Modified: trunk/platforms/unix/vm-sound-MacOSX/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-MacOSX/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-sound-MacOSX/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,3 +1,3 @@ IF (NOT APPLE) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF () Modified: trunk/platforms/unix/vm-sound-NAS/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-NAS/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-sound-NAS/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,4 +1,4 @@ CHECK_INCLUDE_FILE (audio/audio.h HAVE_AUDIO_AUDIO_H) IF (NOT HAVE_AUDIO_AUDIO_H) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF () Modified: trunk/platforms/unix/vm-sound-OSS/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-OSS/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-sound-OSS/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -1,5 +1,5 @@ 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) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF () Modified: trunk/platforms/unix/vm-sound-Sun/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-Sun/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) +++ trunk/platforms/unix/vm-sound-Sun/config.cmake 2009-08-25 20:54:12 UTC (rev 2084) @@ -2,5 +2,5 @@ CHECK_INCLUDE_FILE (sun/audioio.h HAVE_SUN_AUDIOIO_H) IF (NOT HAVE_SYS_AUDIOIO_H OR NOT HAVE_SUN_AUDIOIO_H) - DISABLE_PLUGIN () + PLUGIN_DISABLE () ENDIF ()

1 0

[commit] r2083 - add new configure scripts
by commits＠squeakvm.org 25 Aug '09

25 Aug '09

Author: piumarta Date: 2009-08-25 13:53:01 -0700 (Tue, 25 Aug 2009) New Revision: 2083 Added: trunk/platforms/unix/plugins/AioPlugin/config.cmake trunk/platforms/unix/plugins/DropPlugin/config.cmake trunk/platforms/unix/plugins/FloatMathPlugin/config.cmake Log: add new configure scripts Added: trunk/platforms/unix/plugins/AioPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/AioPlugin/config.cmake (rev 0) +++ trunk/platforms/unix/plugins/AioPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) @@ -0,0 +1,2 @@ +PLUGIN_DEFINITIONS (-DSQAIO_H=\"sqaio.h\") +PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin ${cross}/plugins/SocketPlugin) Added: trunk/platforms/unix/plugins/DropPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/DropPlugin/config.cmake (rev 0) +++ trunk/platforms/unix/plugins/DropPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) @@ -0,0 +1 @@ +PLUGIN_INCLUDE_DIRECTORIES (${cross}/plugins/FilePlugin) Added: trunk/platforms/unix/plugins/FloatMathPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/FloatMathPlugin/config.cmake (rev 0) +++ trunk/platforms/unix/plugins/FloatMathPlugin/config.cmake 2009-08-25 20:53:01 UTC (rev 2083) @@ -0,0 +1 @@ +PLUGIN_DEFINITIONS (-DNO_ISNAN=1)

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