Author: faridz Date: Fri Nov 10 06:33:27 2006 New Revision: 473351 URL: http://svn.apache.org/viewvc?view=rev&rev=473351 Log: 2006-11-10 Farid Zaripov <[EMAIL PROTECTED]>
* EXPORT.cpp: Added "./" in LDOPTS. * configure.wsf (runExeTests): Added replacing ".o" with ".obj" in LDOPTS (compileFiles): Reused srcsArr instead of srcs * projects.wsf (CreateProjectsDefs): Removed extra '\' in command line Modified: incubator/stdcxx/trunk/etc/config/src/EXPORT.cpp incubator/stdcxx/trunk/etc/config/windows/configure.wsf incubator/stdcxx/trunk/etc/config/windows/projects.js Modified: incubator/stdcxx/trunk/etc/config/src/EXPORT.cpp URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/src/EXPORT.cpp?view=diff&rev=473351&r1=473350&r2=473351 ============================================================================== --- incubator/stdcxx/trunk/etc/config/src/EXPORT.cpp (original) +++ incubator/stdcxx/trunk/etc/config/src/EXPORT.cpp Fri Nov 10 06:33:27 2006 @@ -9,7 +9,7 @@ // establish a dependency on EXPORT_KEYWORD.cpp which must be // compiled first since it defines the exported function template -// LDOPTS = EXPORT_KEYWORD.o +// LDOPTS = ./EXPORT_KEYWORD.o #endif // _RWSTD_NO_EXPORT_KEYWORD Modified: incubator/stdcxx/trunk/etc/config/windows/configure.wsf URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/configure.wsf?view=diff&rev=473351&r1=473350&r2=473351 ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/configure.wsf (original) +++ incubator/stdcxx/trunk/etc/config/windows/configure.wsf Fri Nov 10 06:33:27 2006 @@ -823,12 +823,13 @@ var fileBase = stageDir + "\\" + base; var modules = fileBase + ".obj"; var ldopts = - (/^[^A-Z_a-z0-9]*LDOPTS\s*=\s*(.*)$/m).exec(srcText); + (/^[^A-Z_a-z0-9]*LDOPTS\s*=\s*(\S*)\s*$/m).exec(srcText); if (ldopts != null) { // remove first "./" and replace $(LIBSUFFIX) with .lib - modules += " " + ldopts[1].replace(/^\.\//, - stageDir + "\\").replace(/\$\(LIBSUFFIX\)/, ".lib"); + // and replace .o with .obj + modules += " " + ldopts[1].replace(/^\.\//, stageDir + "\\"). + replace(/\$\(LIBSUFFIX\)/, ".lib").replace(/\.o/, ".obj"); } var exeFile = base + ".exe"; var fullExeName = fileBase + ".exe"; @@ -998,7 +999,7 @@ if (defines instanceof Array) command += joinArray(defines, "/D") - command += joinArray(srcs.split(" "), ""); + command += joinArray(srcsArr, ""); var message = "Compiling with command \"" + command + "\""; logLine(message); Modified: incubator/stdcxx/trunk/etc/config/windows/projects.js URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projects.js?view=diff&rev=473351&r1=473350&r2=473351 ============================================================================== --- incubator/stdcxx/trunk/etc/config/windows/projects.js (original) +++ incubator/stdcxx/trunk/etc/config/windows/projects.js Fri Nov 10 06:33:27 2006 @@ -66,7 +66,7 @@ configureDef.CustomBuildCmd = "cscript /nologo \"%CUSTOMFILE%\"" + " /SolutionName:\"%SOLUTION%\"" + " /ConfigurationName:\"%CFGNAME%\"" + - " /SrcDir:\"%SRCDIR%\\etc\\config\\src\\\"" + + " /SrcDir:\"%SRCDIR%\\etc\\config\\src\"" + " /IncludeDir:\"%SRCDIR%\\include\"" + " /OutDir:\"$(OutDir)\"" + " /OutFile:\"$(OutDir)\\config.h\"" +