|
From: Andreas H. <ah...@us...> - 2004-12-29 23:34:39
|
Update of /cvsroot/jvcl/dev/JVCL3/packages/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28042/packages/bin Modified Files: build.dpr build.exe Log Message: Make.exe fix. Now uses ExtractShortPathName for the PATH environment Index: build.exe =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/build.exe,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 Binary files /tmp/cvs0lCRNC and /tmp/cvsZ7h9xl differ Index: build.dpr =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/packages/bin/build.dpr,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** build.dpr 29 Dec 2004 21:10:44 -0000 1.24 --- build.dpr 29 Dec 2004 23:34:16 -0000 1.25 *************** *** 1038,1041 **** --- 1038,1047 ---- end; {******************************************************************************} + function ExtractShortPathName(const Path: string): string; + begin + SetLength(Result, MAX_PATH); + SetLength(Result, GetShortPathName(PChar(Path), PChar(Result), Length(Result))); + end; + {******************************************************************************} var *************** *** 1114,1124 **** Path := GetWindowsDir + ';' + GetSystemDir + ';' + GetWindowsDir + '\Command'; if UserLibDir <> UserBplDir then ! Path := Edition.RootDir + '\bin;' + UserBplDir + ';' + UserLibDir + ';' + Path else ! Path := Edition.RootDir + '\bin;' + UserBplDir + ';' + Path; SetEnvironmentVariable('PATH', Pointer(Path)); ! //SetEnvironmentVariable('MAINBPLDIR', Pointer(Edition.BplDir)); ! //SetEnvironmentVariable('MAINDCPDIR', Pointer(Edition.DcpDir)); SetEnvironmentVariable('BPLDIR', Pointer(UserBplDir)); SetEnvironmentVariable('DCPDIR', Pointer(UserDcpDir)); --- 1120,1130 ---- Path := GetWindowsDir + ';' + GetSystemDir + ';' + GetWindowsDir + '\Command'; if UserLibDir <> UserBplDir then ! Path := ExtractShortPathName(Edition.RootDir) + '\bin;' + ExtractShortPathName(UserBplDir) + ';' + ExtractShortPathName(UserLibDir) + ';' + Path else ! Path := ExtractShortPathName(Edition.RootDir) + '\bin;' + ExtractShortPathName(UserBplDir) + ';' + Path; SetEnvironmentVariable('PATH', Pointer(Path)); ! SetEnvironmentVariable('MAINBPLDIR', Pointer(Edition.BplDir)); ! SetEnvironmentVariable('MAINDCPDIR', Pointer(Edition.DcpDir)); SetEnvironmentVariable('BPLDIR', Pointer(UserBplDir)); SetEnvironmentVariable('DCPDIR', Pointer(UserDcpDir)); |